Merge pull request #998 from herby/helios-isolation

Helios isolation

Gruntfile.js

@@ -8,6 +8,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-execute');
 
   grunt.registerTask('default', ['peg', 'amberc:all']);
+  grunt.registerTask('amberc:all', ['amberc:core', 'amberc:helios']);
   grunt.registerTask('test', ['amberc:test_runner', 'execute:test_runner', 'clean:test_runner']);
 
   grunt.initConfig({
@@ -33,7 +34,7 @@ module.exports = function(grunt) {
         amber_dir: process.cwd(),
         closure_jar: ''
       },
-      all: {
+      core: {
         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',
@@ -41,16 +42,23 @@ module.exports = function(grunt) {
               '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/Helios-Core.st', 'src/Helios-Exceptions.st', 'src/Helios-Announcements.st',
-              'src/Helios-KeyBindings.st', 'src/Helios-Layout.st',
-              'src/Helios-Commands-Core.st', 'src/Helios-Commands-Tools.st', 'src/Helios-Commands-Browser.st',
-              'src/Helios-References.st', 'src/Helios-Inspector.st', 'src/Helios-Browser.st',
-              'src/Helios-Transcript.st', 'src/Helios-Workspace.st', 'src/Helios-Debugger.st',
-              'src/Helios-Workspace-Tests.st',
               'src/Benchfib.st', 'src/Examples.st', 'src/Spaces.st'
               ],
         jsGlobals: ['navigator']
       },
+      helios: {
+        output_dir : 'support/helios/src',
+        src: ['support/helios/src/Helios-Core.st', 'support/helios/src/Helios-Exceptions.st', 'support/helios/src/Helios-Announcements.st',
+              'support/helios/src/Helios-KeyBindings.st', 'support/helios/src/Helios-Layout.st',
+              'support/helios/src/Helios-Commands-Core.st', 'support/helios/src/Helios-Commands-Tools.st', 'support/helios/src/Helios-Commands-Browser.st',
+              'support/helios/src/Helios-References.st', 'support/helios/src/Helios-Inspector.st', 'support/helios/src/Helios-Browser.st',
+              'support/helios/src/Helios-Transcript.st', 'support/helios/src/Helios-Workspace.st', 'support/helios/src/Helios-Debugger.st',
+              'support/helios/src/Helios-Workspace-Tests.st'
+              ],
+        libraries: ['Web', 'SUnit'],
+        amd_namespace: 'helios',
+        jsGlobals: ['navigator']
+      },
       amber_kernel: {
         output_dir : 'src',
         src: ['src/Kernel-Objects.st', 'src/Kernel-Classes.st', 'src/Kernel-Methods.st', 'src/Kernel-Collections.st',

support/amber.js

@@ -82,9 +82,9 @@ require = function (require) {
             'amber_css': amber_home + '/css',
             'amber_lib': library_home,
             'amber_core': amber_home + '/src',
-            'helios': amber_home + '/src',
+            'helios': amber_home + '/support/helios/src',
             'helios/all': amber_home + '/support/helios/all',
-            'helios/resources': amber_home + '/support/helios',
+            'helios/resources': amber_home + '/support/helios/resources',
             'helios/index': amber_home + '/support/helios/index',
             'jquery': library_home + '/jquery/jquery.min'
         },

support/helios/all.js

@@ -24,5 +24,5 @@ define([
 	'./resources/all-inner',
     'css!./resources/helios',
 	'css!./resources/helios-niflheim',
-    'css!amber_css/niflheim'
+    'css!./resources/niflheim'
 ], function (smalltalk) { return smalltalk; });

support/helios/helios-niflheim.css → support/helios/resources/helios-niflheim.css

@@ -4,7 +4,7 @@ body[id="helios"].niflheim {
 		  width: 100%;
 		}*/
   /*.tool_container .pane .nav-pills i.package {
-			background-image: url('package.png');
+			background-image: url('resources/package.png');
 		}*/
 }
 body[id="helios"].niflheim .btn-group > .dropdown-menu {
@@ -125,7 +125,7 @@ body[id="helios"].niflheim .welcome {
 body[id="helios"].niflheim [class^="icon-"],
 body[id="helios"].niflheim body[id="helios"][class*=" icon-"] {
   opacity: 0.68;
-  background-image: url("../../bower_components/bootstrap/img/glyphicons-halflings-white.png");
+  background-image: url("../../../bower_components/bootstrap/img/glyphicons-halflings-white.png");
 }
 body[id="helios"].niflheim .welcome h2 {
   text-align: center;

support/helios/helios-niflheim.less → support/helios/resources/helios-niflheim.less

@@ -152,7 +152,7 @@ body[id="helios"] {
 
 		[class^="icon-"], body[id="helios"][class*=" icon-"]{
 			opacity: 0.68;
-			background-image: url("../../bower_components/bootstrap/img/glyphicons-halflings-white.png");
+			background-image: url("../../../bower_components/bootstrap/img/glyphicons-halflings-white.png");
 		}
 
 		.welcome h2 {
@@ -186,7 +186,7 @@ body[id="helios"] {
 	
 		//todo: remove
 		/*.tool_container .pane .nav-pills i.package {
-			background-image: url('package.png');
+			background-image: url('resources/package.png');
 		}*/
 
 		.tool_container .list-label {

support/helios/helios.css → support/helios/resources/helios.css

@@ -443,7 +443,7 @@ body[id="helios"] .tool_container .pane .nav-pills i.package {
   background-image: url('package.png');
 }
 body[id="helios"] .tool_container .pane .nav-pills i.override {
-  background-image: url('override.png ');
+  background-image: url('resources/override.png ');
 }
 body[id="helios"] .tool_container .pane .nav-pills i.overridden {
   background-image: url('overridden.png');

support/helios/helios.less → support/helios/resources/helios.less

@@ -515,7 +515,7 @@ body[id="helios"] {
 		background-image: url('package.png');
 	}
 	.tool_container .pane .nav-pills i.override {
-		background-image: url('override.png ');
+		background-image: url('resources/override.png ');
 	}
 	.tool_container .pane .nav-pills i.overridden {
 		background-image: url('overridden.png');