Skip to content

Compatibility for better simulator reloads #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yofreke wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Compatibility for better simulator reloads #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
59ba626
added noCompile option
yofreke Jul 19, 2015
3aa8ff0
moved failed into env
yofreke Jul 20, 2015
346738b
initial preload
yofreke Jul 20, 2015
1b2a816
add functionality to preserve caches
yofreke Jul 20, 2015
c3a69a0
cleanup preload
yofreke Jul 21, 2015
ce91cf9
moved srcCache in to ENV
yofreke Jul 23, 2015
7124240
fix broken browser builds
yofreke Jul 28, 2015
37f5dbd
remove devkit dependency for namespacing
yofreke Aug 4, 2015
fef5544
Merge branch 'master' into feat-noCompile
yofreke Aug 4, 2015
4e37227
fix old suggestions leaking in to fresh loads
yofreke Aug 5, 2015
f98b060
fix fetch problem, fix clear suggestions problem
yofreke Aug 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 30 additions & 19 deletions compilers/jsio_compile/compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ var supportedEnvs = {
};

var _interface = null;
var compiler = null;

exports.start = function(/*optional*/ args, opts) {
if (opts && opts['interface']) {
Expand Down Expand Up @@ -38,6 +39,10 @@ exports.start = function(/*optional*/ args, opts) {
}
}

exports.getCompiler = function() {
return compiler;
}

function getPackage(fileName) {
try {
var pkg = eval('(' + J.__env.fetch(fileName) + ')');
Expand Down Expand Up @@ -209,7 +214,7 @@ exports.run = function(args, opts) {
}

// run the actual compiler
var compiler = J('import jsio.preprocessors.compiler');
compiler = J('import jsio.preprocessors.compiler');
compiler.setCompilerOpts({
debugLevel: debugLevel,
compressor: opts.compressor || ('compress' in _interface ? bind(_interface, 'compress') : null),
Expand All @@ -222,23 +227,7 @@ exports.run = function(args, opts) {
rawOpts: opts
});

compiler.compile('import jsio.base');

if (opts.additionalDeps) {
var deps = opts.additionalDeps;
var n = deps.length;

for (var i = 0; i < n; ++i) {
logger.info('compiling dependencies...', deps[i]);
compiler.compile(deps[i]);
}
}

logger.info('compiling main program', initial);

compiler.compile(initial);

compiler.generateSrc(opts, function(src) {
var onFinish = function(src) {
if (opts.appendImport) {
src = src + ';' + JSIO + '("' + initial + '")';
}
Expand All @@ -248,6 +237,28 @@ exports.run = function(args, opts) {
}

_interface.onFinish(opts, src);
});
};

if (!opts.noCompile) {
compiler.compile('import jsio.base');

if (opts.additionalDeps) {
var deps = opts.additionalDeps;
var n = deps.length;

for (var i = 0; i < n; ++i) {
logger.info('compiling dependencies...', deps[i]);
compiler.compile(deps[i]);
}
}

logger.info('compiling main program', initial);

compiler.compile(initial);

compiler.generateSrc(opts, onFinish);
} else {
onFinish(compiler.getJsioSrc(opts.includeJsio));
}
}

Loading