1
0
Просмотр исходного кода

changing amber to amber_core in other files

Herbert Vojčík 11 лет назад
Родитель
Сommit
2a499d5a76

+ 1 - 1
bin/amberc

@@ -154,7 +154,7 @@ function print_usage() {
 	console.log('');
 	console.log('  -n amd_namespace');
 	console.log('     Export packages with <amd_namespace> as the require.js namespace.');
-	console.log('     Default value is "amber".');
+	console.log('     Default value is "amber_core".');
 	console.log('');
 	console.log('  -o');
 	console.log('     Optimize each .js file using the Google closure compiler.');

+ 1 - 1
helios.html

@@ -16,7 +16,7 @@
           require.config({
               config: {
                   'amber_vm/smalltalk': {
-                      defaultNamespace: 'amber'
+                      defaultNamespace: 'amber_core'
                   }
               }
           });

+ 1 - 1
index.html

@@ -14,7 +14,7 @@
     require.config({
         config: {
             'amber_vm/smalltalk': {
-                defaultNamespace: 'amber'
+                defaultNamespace: 'amber_core'
             }
         }
     });

+ 1 - 1
js/Importer-Exporter.deploy.js

@@ -724,7 +724,7 @@ _st($1)._nextPutAll_("define(\x22");
 $2=$1;
 $4=_st(aPackage)._amdNamespace();
 if(($receiver = $4) == nil || $receiver == undefined){
-$3="amber";
+$3="amber_core";
 } else {
 $3=$4;
 };

+ 2 - 2
js/Importer-Exporter.js

@@ -889,7 +889,7 @@ _st($1)._nextPutAll_("define(\x22");
 $2=$1;
 $4=_st(aPackage)._amdNamespace();
 if(($receiver = $4) == nil || $receiver == undefined){
-$3="amber";
+$3="amber_core";
 } else {
 $3=$4;
 };
@@ -902,7 +902,7 @@ _st($1)._nextPutAll_(", function(smalltalk,nil,_st){");
 $5=_st($1)._lf();
 return self}, function($ctx1) {$ctx1.fill(self,"exportPackagePrologueOf:on:",{aPackage:aPackage,aStream:aStream},smalltalk.AmdExporter.klass)})},
 args: ["aPackage", "aStream"],
-source: "exportPackagePrologueOf: aPackage on: aStream\x0a\x09aStream\x0a\x09\x09nextPutAll: 'define(\x22';\x0a\x09\x09nextPutAll: (aPackage amdNamespace ifNil: [ 'amber' ]); \x22ifNil: only for LegacyPH, it should not happen with AmdPH\x22\x0a\x09\x09nextPutAll: '/';\x0a\x09\x09nextPutAll: aPackage name;\x0a\x09\x09nextPutAll: '\x22, ';\x0a\x09\x09nextPutAll: (#('amber_vm/smalltalk' 'amber_vm/nil' 'amber_vm/_st'), (self amdNamesOfPackages: aPackage loadDependencies)) asJavascript;\x0a\x09\x09nextPutAll: ', function(smalltalk,nil,_st){';\x0a\x09\x09lf",
+source: "exportPackagePrologueOf: aPackage on: aStream\x0a\x09aStream\x0a\x09\x09nextPutAll: 'define(\x22';\x0a\x09\x09nextPutAll: (aPackage amdNamespace ifNil: [ 'amber_core' ]); \x22ifNil: only for LegacyPH, it should not happen with AmdPH\x22\x0a\x09\x09nextPutAll: '/';\x0a\x09\x09nextPutAll: aPackage name;\x0a\x09\x09nextPutAll: '\x22, ';\x0a\x09\x09nextPutAll: (#('amber_vm/smalltalk' 'amber_vm/nil' 'amber_vm/_st'), (self amdNamesOfPackages: aPackage loadDependencies)) asJavascript;\x0a\x09\x09nextPutAll: ', function(smalltalk,nil,_st){';\x0a\x09\x09lf",
 messageSends: ["nextPutAll:", "ifNil:", "amdNamespace", "name", "asJavascript", ",", "amdNamesOfPackages:", "loadDependencies", "lf"],
 referencedClasses: []
 }),

+ 1 - 1
st/Importer-Exporter.st

@@ -408,7 +408,7 @@ exportPackageEpilogueOf: aPackage on: aStream
 exportPackagePrologueOf: aPackage on: aStream
 	aStream
 		nextPutAll: 'define("';
-		nextPutAll: (aPackage amdNamespace ifNil: [ 'amber' ]); "ifNil: only for LegacyPH, it should not happen with AmdPH"
+		nextPutAll: (aPackage amdNamespace ifNil: [ 'amber_core' ]); "ifNil: only for LegacyPH, it should not happen with AmdPH"
 		nextPutAll: '/';
 		nextPutAll: aPackage name;
 		nextPutAll: '", ';

+ 2 - 2
support/amber.js

@@ -22,8 +22,8 @@ require = function (require) {
             'amber_set': '.',
             'amber_vm': '.',
             'amber_css': '../css',
-            'amber': '../js',
-            'amber/_source': '../st',
+            'amber_core': '../js',
+            'amber_core/_source': '../st',
             'jquery': 'jQuery/jquery-1.8.2.min',
             'jquery-ui': 'jQuery/jquery-ui-1.8.16.custom.min'
         },

+ 1 - 1
support/boot.js

@@ -1056,7 +1056,7 @@ function SelectorConversionBrik(brikz, st) {
 function AMDBrik(brikz, st) {
 	st.amdRequire = null;
 	st.defaultTransportType = "amd";
-	st.defaultAMDNamespace = "amber";
+	st.defaultAMDNamespace = "amber_core";
 }
 
 

+ 40 - 40
support/full-devel-helios.js

@@ -11,45 +11,45 @@ define([
     'css!CodeMirror/addon/hint/show-hint',
     'css!CodeMirror/amber',
     'css!amber_css/helios',
-    'amber/Kernel-Objects',
-    'amber/Kernel-Classes',
-    'amber/Kernel-Methods',
-    'amber/Kernel-Collections',
-    'amber/Kernel-Infrastructure',
-    'amber/Kernel-Exceptions',
-    'amber/Kernel-Transcript',
-    'amber/Kernel-Announcements',
-    'amber/Canvas',
-    'amber/SUnit',
-    'amber/Importer-Exporter',
-    'amber/Compiler-Exceptions',
-    'amber/Compiler-Core',
-    'amber/Compiler-AST',
-    'amber/Compiler-Semantic',
-    'amber/Compiler-IR',
-    'amber/Compiler-Inlining',
-    'amber/Compiler-Interpreter',
-    'amber/Compiler-Tests',
+    'amber_core/Kernel-Objects',
+    'amber_core/Kernel-Classes',
+    'amber_core/Kernel-Methods',
+    'amber_core/Kernel-Collections',
+    'amber_core/Kernel-Infrastructure',
+    'amber_core/Kernel-Exceptions',
+    'amber_core/Kernel-Transcript',
+    'amber_core/Kernel-Announcements',
+    'amber_core/Canvas',
+    'amber_core/SUnit',
+    'amber_core/Importer-Exporter',
+    'amber_core/Compiler-Exceptions',
+    'amber_core/Compiler-Core',
+    'amber_core/Compiler-AST',
+    'amber_core/Compiler-Semantic',
+    'amber_core/Compiler-IR',
+    'amber_core/Compiler-Inlining',
+    'amber_core/Compiler-Interpreter',
+    'amber_core/Compiler-Tests',
     'amber_vm/parser',
-    'amber/IDE',
-    'amber/Examples',
-    'amber/Benchfib',
-    'amber/Kernel-Tests',
-    'amber/SUnit-Tests',
-    'amber/Spaces',
-    'amber/Helios-Core',
-    'amber/Helios-Exceptions',
-    'amber/Helios-Commands-Core',
-    'amber/Helios-Commands-Tools',
-    'amber/Helios-Commands-Browser',
-    'amber/Helios-Layout',
-    'amber/Helios-KeyBindings',
-    'amber/Helios-Browser',
-    'amber/Helios-Workspace',
-    'amber/Helios-Transcript',
-    'amber/Helios-Debugger',
-    'amber/Helios-Inspector',
-    'amber/Helios-References',
-    'amber/Helios-Announcements',
-    'amber/Helios-Workspace-Tests'
+    'amber_core/IDE',
+    'amber_core/Examples',
+    'amber_core/Benchfib',
+    'amber_core/Kernel-Tests',
+    'amber_core/SUnit-Tests',
+    'amber_core/Spaces',
+    'amber_core/Helios-Core',
+    'amber_core/Helios-Exceptions',
+    'amber_core/Helios-Commands-Core',
+    'amber_core/Helios-Commands-Tools',
+    'amber_core/Helios-Commands-Browser',
+    'amber_core/Helios-Layout',
+    'amber_core/Helios-KeyBindings',
+    'amber_core/Helios-Browser',
+    'amber_core/Helios-Workspace',
+    'amber_core/Helios-Transcript',
+    'amber_core/Helios-Debugger',
+    'amber_core/Helios-Inspector',
+    'amber_core/Helios-References',
+    'amber_core/Helios-Announcements',
+    'amber_core/Helios-Workspace-Tests'
 ], {});

+ 24 - 24
support/full-devel.js

@@ -9,29 +9,29 @@ define([
     'css!CodeMirror/addon/hint/show-hint',
     'css!CodeMirror/amber',
     'css!amber_css/amber',
-    'amber/Kernel-Objects',
-    'amber/Kernel-Classes',
-    'amber/Kernel-Methods',
-    'amber/Kernel-Collections',
-    'amber/Kernel-Infrastructure',
-    'amber/Kernel-Exceptions',
-    'amber/Kernel-Transcript',
-    'amber/Kernel-Announcements',
-    'amber/Canvas',
-    'amber/SUnit',
-    'amber/Importer-Exporter',
-    'amber/Compiler-Exceptions',
-    'amber/Compiler-Core',
-    'amber/Compiler-AST',
-    'amber/Compiler-Semantic',
-    'amber/Compiler-IR',
-    'amber/Compiler-Inlining',
-    'amber/Compiler-Interpreter',
-    'amber/Compiler-Tests',
+    'amber_core/Kernel-Objects',
+    'amber_core/Kernel-Classes',
+    'amber_core/Kernel-Methods',
+    'amber_core/Kernel-Collections',
+    'amber_core/Kernel-Infrastructure',
+    'amber_core/Kernel-Exceptions',
+    'amber_core/Kernel-Transcript',
+    'amber_core/Kernel-Announcements',
+    'amber_core/Canvas',
+    'amber_core/SUnit',
+    'amber_core/Importer-Exporter',
+    'amber_core/Compiler-Exceptions',
+    'amber_core/Compiler-Core',
+    'amber_core/Compiler-AST',
+    'amber_core/Compiler-Semantic',
+    'amber_core/Compiler-IR',
+    'amber_core/Compiler-Inlining',
+    'amber_core/Compiler-Interpreter',
+    'amber_core/Compiler-Tests',
     'amber_vm/parser',
-    'amber/IDE',
-    'amber/Examples',
-    'amber/Benchfib',
-    'amber/Kernel-Tests',
-    'amber/SUnit-Tests'
+    'amber_core/IDE',
+    'amber_core/Examples',
+    'amber_core/Benchfib',
+    'amber_core/Kernel-Tests',
+    'amber_core/SUnit-Tests'
 ], {});

+ 2 - 2
test/Test.js

@@ -1,6 +1,6 @@
-define("amber/Test", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber/Kernel-Objects"], function(smalltalk,nil,_st){
+define("amber_core/Test", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber/Kernel-Objects"], function(smalltalk,nil,_st){
 smalltalk.addPackage('Test');
-smalltalk.packages["Test"].transport = {"type":"amd","amdNamespace":"amber"};
+smalltalk.packages["Test"].transport = {"type":"amd","amdNamespace":"amber_core"};
 
 smalltalk.addClass('NodeTestRunner', smalltalk.Object, [], 'Test');