Browse Source

Use correct names after recent renames / moves.

Herbert Vojčík 9 years ago
parent
commit
3b5110bc25
5 changed files with 12 additions and 10 deletions
  1. 6 5
      Gruntfile.js
  2. 1 1
      contrib/src/Web.js
  3. 3 3
      external/amber-dev/lib/amberc.js
  4. 1 0
      local.amd.json
  5. 1 1
      src/Compiler-Core.js

+ 6 - 5
Gruntfile.js

@@ -42,10 +42,11 @@ module.exports = function(grunt) {
       amber: {
         output_dir : 'src',
         src: ['src/Kernel-Objects.st', 'src/Kernel-Classes.st', 'src/Kernel-Methods.st', 'src/Kernel-Collections.st',
-              'src/Kernel-Infrastructure.st', 'src/Kernel-Exceptions.st', 'src/Kernel-Transcript.st', 'src/Kernel-Announcements.st',
-              'src/Kernel-ImportExport.st', 'src/Compiler-Exceptions.st', 'src/Compiler-Core.st', 'src/Compiler-AST.st',
+              'src/Kernel-Infrastructure.st', 'src/Kernel-Exceptions.st', 'src/Kernel-Announcements.st',
+              'src/Platform-Services.st', 'src/Platform-ImportExport.st', 'src/Platform-Browser.st',
+              'src/Compiler-Exceptions.st', 'src/Compiler-Core.st', 'src/Compiler-AST.st',
               'src/Compiler-IR.st', 'src/Compiler-Inlining.st', 'src/Compiler-Semantic.st', 'src/Compiler-Interpreter.st',
-              'src/Web.st', 'src/SUnit.st',
+              'src/SUnit.st',
               'src/Kernel-Tests.st', 'src/Compiler-Tests.st', 'src/SUnit-Tests.st'
               ],
         jsGlobals: ['navigator']
@@ -56,7 +57,7 @@ module.exports = function(grunt) {
         libraries: [
           'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',
           'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', 'parser',
-          'SUnit', 'Kernel-ImportExport',
+          'SUnit', 'Platform-ImportExport',
           'Kernel-Tests', 'Compiler-Tests', 'SUnit-Tests'
         ],
         main_class: 'AmberCli',
@@ -72,7 +73,7 @@ module.exports = function(grunt) {
         libraries: [
         'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',
         'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', 'parser',
-        'SUnit', 'Kernel-ImportExport',
+        'SUnit', 'Platform-ImportExport',
         'Kernel-Tests', 'Compiler-Tests', 'SUnit-Tests'],
         main_class: 'NodeTestRunner',
         output_name: 'test_runner'

+ 1 - 1
contrib/src/Web.js

@@ -2,7 +2,7 @@ define("amber-contrib-web/Web", ["amber/boot"
 //>>excludeStart("imports", pragmas.excludeImports);
 , "amber-contrib-jquery/Wrappers-JQuery"
 //>>excludeEnd("imports");
-, "amber_core/Kernel-Objects", "amber_core/Kernel-Infrastructure", "amber_core/Kernel-Methods", "amber_core/Kernel-Collections"], function($boot
+, "amber_core/Kernel-Objects", "amber_core/Platform-Services", "amber_core/Kernel-Methods", "amber_core/Kernel-Collections"], function($boot
 //>>excludeStart("imports", pragmas.excludeImports);
 
 //>>excludeEnd("imports");

+ 3 - 3
external/amber-dev/lib/amberc.js

@@ -73,9 +73,9 @@ function AmberCompiler(amber_dir) {
 	this.amber_dir = amber_dir;
 	// Important: in next list, boot MUST be first
 	this.kernel_libraries = ['boot', 'Kernel-Objects', 'Kernel-Classes', 'Kernel-Methods',
-							'Kernel-Collections', 'Kernel-Infrastructure', 'Kernel-Exceptions', 'Kernel-Transcript',
-							'Kernel-Announcements'];
-	this.compiler_libraries = this.kernel_libraries.concat(['parser', 'Kernel-ImportExport', 'Compiler-Exceptions',
+							'Kernel-Collections', 'Kernel-Infrastructure', 'Kernel-Exceptions', 'Kernel-Announcements',
+							'Platform-Services'];
+	this.compiler_libraries = this.kernel_libraries.concat(['parser', 'Platform-ImportExport', 'Compiler-Exceptions',
 							'Compiler-Core', 'Compiler-AST', 'Compiler-Exceptions', 'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic']);
 }
 

+ 1 - 0
local.amd.json

@@ -11,6 +11,7 @@
     "map": {
         "*": {
             "00comment": "These are backward compatibility pointers.",
+            "amber_core/Kernel-ImportExport": "amber_core/Platform-ImportExport",
             "amber_core/Web": "amber-contrib-web/Web",
             "amber_core/Canvas": "amber-contrib-web/Web"
         }

+ 1 - 1
src/Compiler-Core.js

@@ -1,4 +1,4 @@
-define("amber_core/Compiler-Core", ["amber/boot", "amber_core/Kernel-Objects", "amber_core/Kernel-Infrastructure", "amber_core/Kernel-Collections"], function($boot){
+define("amber_core/Compiler-Core", ["amber/boot", "amber_core/Kernel-Objects", "amber_core/Platform-Services", "amber_core/Kernel-Collections"], function($boot){
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('Compiler-Core');
 $core.packages["Compiler-Core"].innerEval = function (expr) { return eval(expr); };