|
@@ -131,7 +131,7 @@ AmberCompiler.prototype.main = function(configuration, finished_callback) {
|
|
|
}
|
|
|
|
|
|
|
|
|
- configuration.vm = {};
|
|
|
+ configuration.core = {};
|
|
|
configuration.globals = {};
|
|
|
configuration.kernel_libraries = this.kernel_libraries;
|
|
|
configuration.compiler_libraries = this.compiler_libraries;
|
|
@@ -283,7 +283,7 @@ function resolve_kernel(configuration) {
|
|
|
)
|
|
|
.then(function(data) {
|
|
|
|
|
|
-
|
|
|
+
|
|
|
configuration.libraries = data.concat(configuration.libraries);
|
|
|
return configuration;
|
|
|
});
|
|
@@ -292,7 +292,7 @@ function resolve_kernel(configuration) {
|
|
|
|
|
|
|
|
|
* Resolve .js files needed by compiler, read and eval() them.
|
|
|
- * The finished Compiler gets stored in configuration.{vm,globals}.
|
|
|
+ * The finished Compiler gets stored in configuration.{core,globals}.
|
|
|
* Returns a Promise object which resolves into the configuration object.
|
|
|
*/
|
|
|
function create_compiler(configuration) {
|
|
@@ -368,8 +368,8 @@ function create_compiler(configuration) {
|
|
|
|
|
|
if (builder.ids.indexOf("amber_vm/boot") === -1) { console.log(builder.ids); console.log("defining amber_vm/boot"); builder.add('define("amber_vm/boot", ["amber/boot"], function (boot) { return boot; });'); }
|
|
|
|
|
|
-
|
|
|
- builder.finish('configuration.vm = boot.vm; configuration.globals = boot.globals;');
|
|
|
+
|
|
|
+ builder.finish('configuration.core = boot.vm; configuration.globals = boot.globals;');
|
|
|
loadIds.forEach(function (id) {
|
|
|
builder.add('requirejs("' + id + '");');
|
|
|
});
|
|
@@ -382,7 +382,7 @@ function create_compiler(configuration) {
|
|
|
configuration.globals.ErrorHandler._register_(configuration.globals.RethrowErrorHandler._new());
|
|
|
|
|
|
if(0 !== configuration.jsGlobals.length) {
|
|
|
- var jsGlobalVariables = configuration.vm.globalJsVariables;
|
|
|
+ var jsGlobalVariables = configuration.core.globalJsVariables;
|
|
|
jsGlobalVariables.push.apply(jsGlobalVariables, configuration.jsGlobals);
|
|
|
}
|
|
|
|