Making nodejs examples build and run.

nodejs/Gruntfile.js

@@ -1,5 +1,5 @@
 module.exports = function(grunt) {
-  grunt.loadTasks('../vendor/amber/grunt/tasks');
+  grunt.loadNpmTasks('../../node_modules/amber-dev');
 
   grunt.registerTask('default', ['amberc:hello']);
 
@@ -8,36 +8,41 @@ module.exports = function(grunt) {
 
     amberc: {
       options: {
-        amber_dir: '../vendor/amber',
+        amber_dir: '../bower_components/amber',
         closure_jar: ''
       },
       hello: {
         src: ['hello/Hello.st'],
         main_class: 'Hello',
+        amd_namespace: 'amber_examples_hello',
         output_name: 'hello/Program'
       },
       benchfib: {
         src: ['benchfib/Benchfib.st'],
         main_class: 'Benchfib',
+        amd_namespace: 'amber_examples_benchfib',
         output_name: 'benchfib/Program'
       },
       meta: {
         src: ['meta/MyScript.st'],
         main_class: 'MyScript',
         libraries: [
-            'Importer-Exporter', 'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',
+            'Kernel-ImportExport', 'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',
             'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', 'parser'
         ],
+        amd_namespace: 'amber_examples_meta',
         output_name: 'meta/Program'
       },
       pystone: {
         src: ['pystone/Pystone.st'],
         main_class: 'Pystone',
+        amd_namespace: 'amber_examples_pystone',
         output_name: 'pystone/Program'
       },
       trivialserver: {
         src: ['trivialserver/TrivialServer.st'],
         main_class: 'TrivialServer',
+        amd_namespace: 'amber_examples_trivialserver',
         output_name: 'trivialserver/Program'
       }
     }

nodejs/benchfib/Makefile

@@ -1,8 +0,0 @@
-Program.js: Benchfib.st
-	../../../bin/amberc -m Benchfib Benchfib.st Program
-
-run: Program.js
-	./benchfib
-
-clean:
-	rm -f Program.js* Benchfib.js

nodejs/benchfib/benchfib

@@ -1,2 +1,2 @@
-#!/bin/bash
-time node Program.js $@
+#!/bin/sh
+time node Program.js $@ || echo "Run 'grunt amberc:benchfib' from parent directory to build."

nodejs/benchfib/benchfib.bat

@@ -0,0 +1 @@
+node Program.js %* || echo "Run 'grunt amberc:benchfib' from parent directory to build."

nodejs/hello/README

@@ -1,13 +0,0 @@
-Trivial Node.js example in Amber. To compile execute:
-	grunt amberc:hello
-
-Hello.st - source code.
-hello    - trivial bash script to run resulting program.
-
-Hello.js - compiled from Hello.st.
-Program.js - compile from Hello.st and includes Amber, can run from node.
-
-To compile and run.
-	grunt amberc:hello
-	./hello
-

nodejs/hello/hello

@@ -1,2 +1,2 @@
-#!/bin/bash
-node Program.js $@
+#!/bin/sh
+node Program.js $@ || echo "Run 'grunt amberc:hello' from parent directory to build."

nodejs/hello/hello.bat

@@ -0,0 +1 @@
+node Program.js %* || echo "Run 'grunt amberc:hello' from parent directory to build."

nodejs/meta/meta

@@ -1,2 +1,2 @@
-#!/bin/bash
-node Program.js $@
+#!/bin/sh
+node Program.js $@ || echo "Run 'grunt amberc:meta' from parent directory to build."

nodejs/meta/meta.bat

@@ -0,0 +1 @@
+node Program.js $@ || echo "Run 'grunt amberc:meta' from parent directory to build."

nodejs/pystone/pystone

@@ -1,2 +1,2 @@
-#!/bin/bash
-node Program.js $@
+#!/bin/sh
+node Program.js $@ || echo "Run 'grunt amberc:pystone' from parent directory to build."

nodejs/pystone/pystone.bat

@@ -0,0 +1 @@
+node Program.js %* || echo "Run 'grunt amberc:pystone' from parent directory to build."

nodejs/trivialserver/trivial

@@ -1,2 +1,2 @@
-#!/bin/bash
-node Program.js $@
+#!/bin/sh
+node Program.js $@ || echo "Run 'grunt amberc:trivialserver' from parent directory to build."

nodejs/trivialserver/trivial.bat

@@ -0,0 +1 @@
+node Program.js %* || echo "Run 'grunt amberc:trivialserver' from parent directory to build."