Some more {js,st}=>src fixes.

.gitignore

@@ -4,9 +4,6 @@ server/FileServer*.js
 # Ignoring Mac Finder files
 .DS_Store
 
-# Ignoring compiled files in st
-st/*.js
-
 # Ignoring run.js in test/
 test/amber_test_runner.js
 test/run.js

Gruntfile.js

@@ -77,7 +77,7 @@ module.exports = function(grunt) {
         output_name: 'test/amber_test_runner'
       },
       amber_cli: {
-        output_dir: 'cli/js',
+        output_dir: 'cli/src',
         src: ['cli/src/AmberCli.st'],
         libraries: [
             'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',

cli/support/amberc-cli.js

@@ -112,11 +112,11 @@ function print_usage() {
 		'',
 		'   *.js',
 		'     Files are linked (concatenated) in listed order.',
-		'     If not found we look in $AMBER/js/',
+		'     If not found we look in $AMBER/src/',
 		'',
 		'   *.st',
 		'     Files are compiled into .js files before concatenation.',
-		'     If not found we look in $AMBER/st/.',
+		'     If not found we look in $AMBER/src/',
 		'',
 		'     NOTE: Each .st file is currently considered to be a fileout of a single class',
 		'     category of the same name as the file!',

cli/support/amberc.js

@@ -178,7 +178,7 @@ function check_configuration(configuration) {
  * Check if the file given as parameter exists in any of the following directories:
  *  1. current local directory
  *  2. configuration.jsLibraryDirs
- *  3. $AMBER/js/
+ *  3. $AMBER/src/
  *  3. $AMBER/support/
  *
  * @param filename name of a file without '.js' prefix

cli/support/release-worker.sh

@@ -16,8 +16,7 @@ if [ "$VER" = "0" ]; then :; else
 	sed -e 's@/amber.git.*"@/amber.git#'"$VER"'"@' package.json.bak >package.json
 	rm package.json.bak
 	git add package.json
-	bin/amberc -m AmberCli -n amber_cli -l Compiler-Exceptions,Compiler-Core,Compiler-AST,Compiler-IR,Compiler-Inlining,Compiler-Semantic,Compiler-Interpreter,parser cli/st/AmberCli.st cli/support/amber-cli
-	rm cli/st/*.js
+	bin/amberc -m AmberCli -n amber_cli -l Compiler-Exceptions,Compiler-Core,Compiler-AST,Compiler-IR,Compiler-Inlining,Compiler-Semantic,Compiler-Interpreter,parser cli/src/AmberCli.st cli/support/amber-cli
 	git add cli/support/amber-cli.js
 	git commit -a -m "Release version $VER"
 	git tag -a "$VER" -m "Release version $VER"
@@ -33,8 +32,7 @@ cp package.json package.json.bak
 sed -e 's@/amber.git.*"@/amber.git"@' package.json.bak >package.json
 rm package.json.bak
 git add package.json
-bin/amberc -m AmberCli -n amber_cli -l Compiler-Exceptions,Compiler-Core,Compiler-AST,Compiler-IR,Compiler-Inlining,Compiler-Semantic,Compiler-Interpreter,parser cli/st/AmberCli.st cli/support/amber-cli
-rm cli/st/*.js
+bin/amberc -m AmberCli -n amber_cli -l Compiler-Exceptions,Compiler-Core,Compiler-AST,Compiler-IR,Compiler-Inlining,Compiler-Semantic,Compiler-Interpreter,parser cli/src/AmberCli.st cli/support/amber-cli
 git add cli/support/amber-cli.js
 git commit -a -m "Working on $VERF"
 git push --tags

cli/support/setversion.sh

@@ -12,7 +12,7 @@ rm Kernel-Infrastructure.st.bak
 
 # compile Kernel-Infrastructure
 cd $AMBER_BASE
-bin/amberc -D js -l Kernel-Objects,Kernel-Collections src/Kernel-Infrastructure.st
+bin/amberc -D src -l Kernel-Objects,Kernel-Collections src/Kernel-Infrastructure.st
 # set version in all json files (bower, npm)
 for F in *.json; do
   cp $F $F.bak

grunt/tasks/grunt-amberc.js

@@ -26,8 +26,8 @@ module.exports = function(grunt) {
            library_dirs: ['dir1', '/usr/local/js'], // optional
            verbose: true
          },
-         src: ['projects/HelloWorld/st/HelloWorld.st'], // REQUIRED
-         output_dir: 'projects/HelloWorld/js',  // optional
+         src: ['projects/HelloWorld/src/HelloWorld.st'], // REQUIRED
+         output_dir: 'projects/HelloWorld/src',  // optional
          libraries: 'Canvas',                   // optional
          jsGlobals: ['global1', 'global2'],     // optional
          main_class: 'HelloWorld',              // optional