Browse Source

Merge branch 'master' into deprecations-off

Conflicts:
	bower.json
	config.js
	package.json
	src/Kernel-Infrastructure.js
	src/Kernel-Infrastructure.st
Herbert Vojčík 9 years ago
parent
commit
92d2baeb56
6 changed files with 13 additions and 60 deletions
  1. 3 0
      .gitignore
  2. 3 0
      .npmignore
  3. 1 0
      bower.json
  4. 0 59
      config.js
  5. 1 1
      package.json
  6. 5 0
      src/Kernel-Infrastructure.st

+ 3 - 0
.gitignore

@@ -15,3 +15,6 @@ bower_components/
 
 # Ignoring place dedicated to hand-cloned user modules
 /my/
+
+# Other generated or transient files
+config.js

+ 3 - 0
.npmignore

@@ -19,3 +19,6 @@ bower_components/
 
 # Ignoring place dedicated to hand-cloned user modules
 /my/
+
+# Other generated or transient files
+config.js

+ 1 - 0
bower.json

@@ -9,6 +9,7 @@
     "/external",
     "/internal",
     "/my",
+    "config.js",
     "/test_runner.js",
     "test",
     "tests"

+ 0 - 59
config.js

@@ -1,59 +0,0 @@
-/* DO NOT EDIT! This file is generated. */
-
-var require;
-if (!require) require = {config: function (x) {require = x;}};
-require.config({
-  "paths": {
-    "jquery-ui": "bower_components/jquery-ui/jquery-ui",
-    "jquery": "bower_components/jquery/jquery",
-    "require-css": "bower_components/require-css",
-    "codemirror": "bower_components/codemirror",
-    "amber_lib/es5-shim": "bower_components/es5-shim",
-    "helios/showdown": "my/helios/bower_components/showdown/src/showdown",
-    "requireJS": "node_modules/requirejs/require",
-    "bootstrap2.3.2": "my/helios/bower_components/bootstrap2.3.2/bootstrap",
-    "amber": "support",
-    "amber_css": "support/resources",
-    "amber_core": "src",
-    "helios": "my/helios/src",
-    "helios/resources": "my/helios/resources",
-    "helios/index": "my/helios/index",
-    "amber_cli": "external/amber-cli/src"
-  },
-  "shim": {
-    "jquery-ui": {
-      "deps": [
-        "jquery",
-        "jquery",
-        "jquery",
-        "jquery"
-      ]
-    },
-    "codemirror/lib/codemirror": {
-      "deps": [
-        "css!codemirror/lib/codemirror",
-        "css!codemirror/lib/codemirror",
-        "css!codemirror/lib/codemirror",
-        "css!codemirror/lib/codemirror"
-      ]
-    },
-    "bootstrap2.3.2/js/bootstrap": {
-      "deps": [
-        "jquery",
-        "css!bootstrap2.3.2/css/bootstrap"
-      ]
-    },
-    "ensure-console": {
-      "exports": "console"
-    }
-  },
-  "map": {
-    "*": {
-      "css": "require-css/css"
-    }
-  },
-  "rjs_comment1": "require.min should be removed",
-  "rjs_comment2": "it's backward compatibility hack if config finds",
-  "rjs_comment3": "support/requirejs before node_modules/requirejs;",
-  "rjs_comment4": "the former will go away in 0.14.0"
-});

+ 1 - 1
package.json

@@ -20,7 +20,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/amber-smalltalk/amber.git"
+    "url": "git://github.com/amber-smalltalk/amber.git#0.13.3"
   },
   "engines": {
     "node": ">=0.8.0"

+ 5 - 0
src/Kernel-Infrastructure.st

@@ -1170,6 +1170,11 @@ version
 	"Answer the version string of Amber"
 	
 	^ '0.14.0-0'
+!
+
+vm
+	self deprecatedAPI: 'Use #core'.
+	^self core
 ! !
 
 !SmalltalkImage methodsFor: 'accessing amd'!