Merge pull request #997 from herby/flatter-cli-hierarchy

Moving amber-cli/cli/ contents to amber-cli/ itself.

external/amber-cli/Gruntfile.js

@@ -24,8 +24,8 @@ module.exports = function(grunt) {
         libraries: ['SUnit']
       },
       cli: {
-        output_dir: 'cli/src',
-        src: ['cli/src/AmberCli.st'],
+        output_dir: 'src',
+        src: ['src/AmberCli.st'],
         libraries: [
             'Compiler-Exceptions', 'Compiler-Core', 'Compiler-AST',
             'Compiler-IR', 'Compiler-Inlining', 'Compiler-Semantic', 'Compiler-Interpreter', 'parser',
@@ -39,7 +39,7 @@ module.exports = function(grunt) {
     },
 
     jshint: {
-      cli: ['cli/src/*.js', 'cli/support/*.js']
+      cli: ['src/*.js', 'support/*.js']
     }
   });
 };

external/amber-cli/package.json

@@ -29,11 +29,11 @@
     "url": "https://github.com/amber-smalltalk/amber/issues?labels=cli"
   },
   "bin": {
-    "amber": "./cli/support/amber-cli.js",
-    "amberc": "./cli/support/amberc-cli.js"
+    "amber": "./support/amber-cli.js",
+    "amberc": "./support/amberc-cli.js"
   },
   "scripts": {
-    "test": "grunt amberc:cli && node ./cli/support/amber-cli.js tests"
+    "test": "grunt amberc:cli && node ./support/amber-cli.js tests"
   },
   "dependencies": {
     "amber": "~0.12.4",

external/amber-cli/cli/src/AmberCli.js → external/amber-cli/src/AmberCli.js

@@ -1485,12 +1485,12 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st(self["@path"])._join_with_with_(self._dirname(),"..","..");
+$1=_st(self["@path"])._join_with_(self._dirname(),"..");
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"rootDirname",{},globals.Initer)})},
 args: [],
-source: "rootDirname\x0a\x09^ path join: self dirname with: '..' with: '..'",
-messageSends: ["join:with:with:", "dirname"],
+source: "rootDirname\x0a\x09^ path join: self dirname with: '..'",
+messageSends: ["join:with:", "dirname"],
 referencedClasses: []
 }),
 globals.Initer);

external/amber-cli/cli/src/AmberCli.st → external/amber-cli/src/AmberCli.st

@@ -986,7 +986,7 @@ dirname
 !
 
 rootDirname
-	^ path join: self dirname with: '..' with: '..'
+	^ path join: self dirname with: '..'
 ! !
 
 Object subclass: #NodeTestRunner

external/amber-cli/cli/support/amber-cli.js → external/amber-cli/support/amber-cli.js

@@ -57586,12 +57586,12 @@ fn: function (){
 var self=this;
 return smalltalk.withContext(function($ctx1) { 
 var $1;
-$1=_st(self["@path"])._join_with_with_(self._dirname(),"..","..");
+$1=_st(self["@path"])._join_with_(self._dirname(),"..");
 return $1;
 }, function($ctx1) {$ctx1.fill(self,"rootDirname",{},globals.Initer)})},
 args: [],
-source: "rootDirname\x0a\x09^ path join: self dirname with: '..' with: '..'",
-messageSends: ["join:with:with:", "dirname"],
+source: "rootDirname\x0a\x09^ path join: self dirname with: '..'",
+messageSends: ["join:with:", "dirname"],
 referencedClasses: []
 }),
 globals.Initer);