Sfoglia il codice sorgente

devkit: using namespace amber_devkit

Herbert Vojčík 9 anni fa
parent
commit
532f3e4ae4

+ 4 - 2
Gruntfile.js

@@ -66,16 +66,18 @@ module.exports = function(grunt) {
       },
       dev: {
         output_dir: 'external/amber-dev/lib',
-        src: ['external/amber-dev/lib/NodeTestRunner.st']
+        src: ['external/amber-dev/lib/NodeTestRunner.st'],
+        amd_namespace: 'amber_devkit'
       },
       test_runner: {
-        src: ['external/amber-dev/lib/Test.st'],
+        src: ['external/amber-dev/lib/NodeTestRunner.st'],
         libraries: [
         'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',
         'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', 'parser',
         'SUnit', 'Platform-ImportExport',
         'Kernel-Tests', 'Compiler-Tests', 'SUnit-Tests'],
         main_class: 'NodeTestRunner',
+        amd_namespace: 'amber_devkit',
         output_name: 'test_runner'
       }
     },

+ 2 - 2
external/amber-dev/lib/NodeTestRunner.js

@@ -1,8 +1,8 @@
-define("amber_core/NodeTestRunner", ["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict";
+define("amber_devkit/NodeTestRunner", ["amber/boot", "amber_core/Kernel-Objects"], function($boot){"use strict";
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('NodeTestRunner');
 $core.packages["NodeTestRunner"].innerEval = function (expr) { return eval(expr); };
-$core.packages["NodeTestRunner"].transport = {"type":"amd","amdNamespace":"amber_core"};
+$core.packages["NodeTestRunner"].transport = {"type":"amd","amdNamespace":"amber_devkit"};
 
 $core.addClass('NodeTestRunner', $globals.Object, [], 'NodeTestRunner');
 

+ 1 - 1
external/amber-dev/lib/helpers.js

@@ -1,4 +1,4 @@
-exports.testRunnerPath = require.resolve('./NodeTestRunner').replace(/\.js$/, "");
+exports.libPath = __dirname;
 
 exports.nodeWrap = function (id) {
     var wrapSource = JSON.stringify('_wrap_' + id),