Skip to content

Commit

Permalink
feat: migrate to using brighterscript, via maestro project's compiler
Browse files Browse the repository at this point in the history
  • Loading branch information
George Cook authored and georgejecook committed Sep 22, 2019
1 parent 0a11e3d commit 391b902
Show file tree
Hide file tree
Showing 18 changed files with 1,620 additions and 3,697 deletions.
2,237 changes: 0 additions & 2,237 deletions dist/rooibosDist.brs

This file was deleted.

2 changes: 1 addition & 1 deletion docs/Rooibos_TestRunner.brs.html
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ <h1 class="page-title">Rooibos_TestRunner.brs</h1>
end if

for each itGroup in metaTestSuite.itGroups
testSuite = RBS_ItG_GetRunnableTestSuite(itGroup)
testSuite = RBS_ItG.GetRunnableTestSuite(itGroup)
if (nodeContext &lt;> invalid)
testSuite.node = nodeContext
testSuite.global = nodeContext.global
Expand Down
26 changes: 21 additions & 5 deletions gulpfile.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { series } from "gulp";
import { RooibosProcessor, createProcessorConfig, ProcessorConfig } from "rooibos-preprocessor";
import { RooibosProcessor, createProcessorConfig, ProcessorConfig } from "rooibos-cli";
import { MaestroProjectProcessor, createMaestroConfig } from 'maestro-cli-roku';

const concat = require('gulp-concat');
const gulp = require('gulp');
Expand All @@ -9,6 +10,7 @@ const header = require('gulp-header');
const pkg = require('./package.json');
const distDir = 'dist';
const outDir = 'out';
const buildDir = 'build';
const distFile = `rooibosDist.brs`;
const fullDistPath = path.join(distDir, distFile);
const fs = require('fs');
Expand All @@ -26,7 +28,6 @@ const args = {
retainStagingFolder: true
};


export function clean() {
const distPath = path.join(distDir, '**');
console.log('Doing a clean at ' + distPath);
Expand All @@ -39,6 +40,20 @@ function createDirectories() {
.pipe(gulp.dest(outDir));
}

export async function compile(cb) {
let config = createMaestroConfig({
filePattern: ['**/*.bs', '**/*.brs', '**/*.xml'],
sourcePath: `src`,
outputPath: buildDir,
logLevel: 4,
nonCheckedImports: [
]
});
let processor = new MaestroProjectProcessor(config);
await processor.processFiles();
}


function squash() {
var banner = [`'/**`,
`' * ${pkg.name} - ${pkg.description}`,
Expand All @@ -48,7 +63,7 @@ function squash() {
`' */`,
``].join(`\n`);

return gulp.src('./src/*.brs')
return gulp.src('./build/*.brs')
.pipe(concat(distFile))
.pipe(rmLines({
'filters': [/^\s*'/i, /((\r\n|\n|\r)$)|(^(\r\n|\n|\r))|^\s*$/i]
Expand Down Expand Up @@ -78,7 +93,8 @@ function copyToTests(cb) {
/**
* This target is used for CI
*/
export async function prepareFrameworkTests(cb) {

export async function prepareFrameworkTests(cb) {
await rokuDeploy.prepublishToStaging(args);

let config = createProcessorConfig({
Expand Down Expand Up @@ -144,7 +160,7 @@ export function updateVersion(cb) {
cb();
}

exports.build = series(clean, createDirectories, squash, copyToSamples, copyToTests);
exports.build = series(clean, createDirectories, compile, squash, copyToSamples, copyToTests);
exports.runFrameworkTests = series(exports.build, prepareFrameworkTests, zipFrameworkTests, deployFrameworkTests)
exports.prePublishFrameworkTests = series(exports.build, prepareFrameworkTests)
exports.prePublishFrameworkCodeCoverage = series(exports.build, prepareCodeCoverageTests)
Expand Down
146 changes: 105 additions & 41 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 391b902

Please sign in to comment.