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

Merge pull request #1126 from amber-smalltalk/move-things-to-attic

move IDE, Example, Benchfib and conf into amber-attic
Herbert Vojčík 9 лет назад
Родитель
Сommit
8b9eac0580

+ 9 - 4
Gruntfile.js

@@ -10,7 +10,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-execute');
 
   grunt.registerTask('default', ['peg', 'amberc:all']);
-  grunt.registerTask('amberc:all', ['amberc:amber', 'amberc:cli']);
+  grunt.registerTask('amberc:all', ['amberc:amber', 'amberc:attic', 'amberc:cli']);
   grunt.registerTask('test', ['amberc:test_runner', 'execute:test_runner', 'clean:test_runner']);
   grunt.registerTask('devel', ['amdconfig:amber']);
 
@@ -45,12 +45,17 @@ module.exports = function(grunt) {
               '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/Compiler-IR.st', 'src/Compiler-Inlining.st', 'src/Compiler-Semantic.st', 'src/Compiler-Interpreter.st',
-              'src/Web.st', 'src/SUnit.st', 'src/IDE.st',
-              'src/Kernel-Tests.st', 'src/Compiler-Tests.st', 'src/SUnit-Tests.st',
-              'src/Benchfib.st', 'src/Examples.st'
+              'src/Web.st', 'src/SUnit.st',
+              'src/Kernel-Tests.st', 'src/Compiler-Tests.st', 'src/SUnit-Tests.st'
               ],
         jsGlobals: ['navigator']
       },
+      attic: {
+        output_dir : 'support/attic/src',
+        src: ['support/attic/src/Benchfib.st', 'support/attic/src/Examples.st', 'support/attic/src/IDE.st'],
+        libraries: ['Web'],
+        amd_namespace: 'amber-attic'
+      },
       cli: {
         output_dir: 'external/amber-cli/src',
         src: ['external/amber-cli/src/AmberCli.st'],

+ 0 - 0
codemirror.amd.json → support/attic/codemirror.amd.json


+ 0 - 0
jquery-ui.amd.json → support/attic/jquery-ui.amd.json


+ 18 - 0
support/attic/local.amd.json

@@ -0,0 +1,18 @@
+{
+    "paths": {
+        "amber-attic": "src",
+        "amber-attic/resources": "resources"
+    },
+    "shim": {
+        "amber-attic/IDE": [
+            "codemirror/lib/codemirror",
+            "codemirror/mode/smalltalk/smalltalk",
+            "codemirror/addon/hint/show-hint",
+            "css!codemirror/theme/ambiance",
+            "css!codemirror/lib/codemirror",
+            "css!codemirror/addon/hint/show-hint",
+            "jquery-ui",
+            "css!amber-attic/resources/amber"
+        ]
+    }
+}

+ 0 - 0
support/resources/amber.css → support/attic/resources/amber.css


+ 0 - 0
support/resources/off.amber.png → support/attic/resources/off.amber.png


+ 0 - 0
support/resources/offHover.amber.png → support/attic/resources/offHover.amber.png


+ 0 - 0
support/resources/sprite.amber.png → support/attic/resources/sprite.amber.png


+ 0 - 0
support/resources/tinylogo.amber.png → support/attic/resources/tinylogo.amber.png


+ 2 - 2
src/Benchfib.js → support/attic/src/Benchfib.js

@@ -1,7 +1,7 @@
-define("amber_core/Benchfib", ["amber/boot", "amber_core/Kernel-Objects"], function($boot){
+define("amber-attic/Benchfib", ["amber/boot", "amber_core/Kernel-Objects"], function($boot){
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('Benchfib');
-$core.packages["Benchfib"].transport = {"type":"amd","amdNamespace":"amber_core"};
+$core.packages["Benchfib"].transport = {"type":"amd","amdNamespace":"amber-attic"};
 
 $core.addClass('Benchfib', $globals.Object, [], 'Benchfib');
 

+ 0 - 0
src/Benchfib.st → support/attic/src/Benchfib.st


+ 2 - 2
src/Examples.js → support/attic/src/Examples.js

@@ -1,7 +1,7 @@
-define("amber_core/Examples", ["amber/boot", "amber_core/Web"], function($boot){
+define("amber-attic/Examples", ["amber/boot", "amber_core/Web"], function($boot){
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('Examples');
-$core.packages["Examples"].transport = {"type":"amd","amdNamespace":"amber_core"};
+$core.packages["Examples"].transport = {"type":"amd","amdNamespace":"amber-attic"};
 
 $core.addClass('Counter', $globals.Widget, ['count', 'header'], 'Examples');
 //>>excludeStart("ide", pragmas.excludeIdeData);

+ 0 - 0
src/Examples.st → support/attic/src/Examples.st


+ 2 - 2
src/IDE.js → support/attic/src/IDE.js

@@ -1,7 +1,7 @@
-define("amber_core/IDE", ["amber/boot", "amber_core/Web", "amber_core/Kernel-Objects", "amber_core/Kernel-Collections", "amber_core/Kernel-Methods"], function($boot){
+define("amber-attic/IDE", ["amber/boot", "amber_core/Web", "amber_core/Kernel-Objects", "amber_core/Kernel-Collections", "amber_core/Kernel-Methods"], function($boot){
 var $core=$boot.api,nil=$boot.nil,$recv=$boot.asReceiver,$globals=$boot.globals;
 $core.addPackage('IDE');
-$core.packages["IDE"].transport = {"type":"amd","amdNamespace":"amber_core"};
+$core.packages["IDE"].transport = {"type":"amd","amdNamespace":"amber-attic"};
 
 $core.addClass('ClassesList', $globals.Widget, ['browser', 'ul', 'nodes'], 'IDE');
 $core.addMethod(

+ 0 - 0
src/IDE.st → support/attic/src/IDE.st


+ 3 - 11
support/devel.js

@@ -2,19 +2,11 @@ define([
 	'./helpers', // pre-fetch, dep of ./deploy
 	'./deploy', // pre-fetch, dep of ./lang
 	'./lang',
-    'codemirror/lib/codemirror',
-    'codemirror/mode/smalltalk/smalltalk',
-    'codemirror/addon/hint/show-hint',
-    'css!codemirror/theme/ambiance',
-    'css!codemirror/lib/codemirror',
-    'css!codemirror/addon/hint/show-hint',
-    'jquery-ui',
     'amber_core/SUnit',
     'amber_core/Compiler-Tests',
     'amber_core/Kernel-Tests',
     'amber_core/SUnit-Tests',
-    'amber_core/IDE',
-    'amber_core/Examples',
-    'amber_core/Benchfib',
-	'css!amber/resources/amber'
+	'amber-attic/IDE',
+	'amber-attic/Examples',
+	'amber-attic/Benchfib'
 ], function (amber) { return amber; });