Quellcode durchsuchen

Merge pull request #415 from mkroehnert/cleanup

Changelog update, Grunt.js instructions, cleanup
Nicolas Petton vor 11 Jahren
Ursprung
Commit
da05724a61
7 geänderte Dateien mit 25 neuen und 66 gelöschten Zeilen
  1. 4 2
      CHANGELOG
  2. 10 0
      README.md
  3. 0 15
      js/Additional-Examples.deploy.js
  4. 0 21
      js/Additional-Examples.js
  5. 11 11
      js/boot.js
  6. 0 7
      js/lib/peg-0.7.0.min.js
  7. 0 10
      test/run_build.sh

+ 4 - 2
CHANGELOG

@@ -16,13 +16,15 @@ Here's a summary of change since the 0.9.1 release:
   - an AST interpreter
   - an AST interpreter
   - support for blocks contexts
   - support for blocks contexts
 
 
-- SUnit improvements and cleanup, with support for async assertions
 - New build system based on grunt.js, replacing the old makefiles
 - New build system based on grunt.js, replacing the old makefiles
-- Improved ClassBuilder with better class migration support
 - New bin/amberc compiler written in Amber/Node.js
 - New bin/amberc compiler written in Amber/Node.js
+- SUnit improvements and cleanup, with support for async assertions
+- Improved ClassBuilder with better class migration support
 - Improved loader for third party packages
 - Improved loader for third party packages
+- New: Announcements
 - Classes can be augmented by light-weight methods created from blocks
 - Classes can be augmented by light-weight methods created from blocks
 - Snippets of HTML can be marked to become virtual tags in HTMLCanvas
 - Snippets of HTML can be marked to become virtual tags in HTMLCanvas
+- Amber server supports Basic HTTP authentication (not recommended for production environments/unencrypted connections)
 - New IDE on it's way for Amber 1.0
 - New IDE on it's way for Amber 1.0
 
 
 
 

+ 10 - 0
README.md

@@ -24,6 +24,16 @@ License
 
 
 Amber is released under the MIT license. All contributions made for inclusion are considered to be under MIT.
 Amber is released under the MIT license. All contributions made for inclusion are considered to be under MIT.
 
 
+Building Amber
+--------------
+
+Since 0.10.0 Amber uses [Grunt.js](http://gruntjs.com/) as build system.
+To compile Amber on the commandline execute the following commands:
+
+#    cd ${Amber_DIR}
+#    npm install
+#    ./node_modules/grunt/bin/grunt
+
 More infos
 More infos
 ----------
 ----------
 
 

+ 0 - 15
js/Additional-Examples.deploy.js

@@ -1,15 +0,0 @@
-smalltalk.addPackage('Additional-Examples', {});
-smalltalk.addClass('ClassInitializationExample', smalltalk.Object, [], 'Additional-Examples');
-
-smalltalk.addMethod(
-'_initialize',
-smalltalk.method({
-selector: 'initialize',
-fn: function (){
-var self=this;
-smalltalk.send((typeof window == 'undefined' ? nil : window), "_alert_", [smalltalk.send(smalltalk.send("Hello from inside the ", "__comma", [smalltalk.send(self, "_printString", [])]), "__comma", [" initialize method."])]);
-return self;}
-}),
-smalltalk.ClassInitializationExample.klass);
-
-

+ 0 - 21
js/Additional-Examples.js

@@ -1,21 +0,0 @@
-smalltalk.addPackage('Additional-Examples', {});
-smalltalk.addClass('ClassInitializationExample', smalltalk.Object, [], 'Additional-Examples');
-smalltalk.ClassInitializationExample.comment=unescape('This%20class%20will%20pop%20up%20an%20alert%20when%20it%20is%20loaded%20into%20Amber.')
-
-smalltalk.addMethod(
-unescape('_initialize'),
-smalltalk.method({
-selector: unescape('initialize'),
-category: 'initialization',
-fn: function (){
-var self=this;
-smalltalk.send((typeof window == 'undefined' ? nil : window), "_alert_", [smalltalk.send(smalltalk.send("Hello from inside the ", "__comma", [smalltalk.send(self, "_printString", [])]), "__comma", [" initialize method."])]);
-return self;},
-args: [],
-source: unescape('initialize%0A%09window%20alert%3A%20%27Hello%20from%20inside%20the%20%27%2C%20self%20printString%20%2C%20%27%20initialize%20method.%27'),
-messageSends: ["alert:", unescape("%2C"), "printString"],
-referencedClasses: []
-}),
-smalltalk.ClassInitializationExample.klass);
-
-

+ 11 - 11
js/boot.js

@@ -823,23 +823,23 @@ smalltalk.wrapClassName("PackageOrganizer", "Kernel-Objects", SmalltalkPackageOr
 smalltalk.wrapClassName("ClassOrganizer", "Kernel-Objects", SmalltalkClassOrganizer, smalltalk.Organizer, false);
 smalltalk.wrapClassName("ClassOrganizer", "Kernel-Objects", SmalltalkClassOrganizer, smalltalk.Organizer, false);
 
 
 
 
-smalltalk.wrapClassName("Number", "Kernel", Number, smalltalk.Object);
-smalltalk.wrapClassName("BlockClosure", "Kernel", Function, smalltalk.Object);
-smalltalk.wrapClassName("Boolean", "Kernel", Boolean, smalltalk.Object);
-smalltalk.wrapClassName("Date", "Kernel", Date, smalltalk.Object);
-smalltalk.wrapClassName("UndefinedObject", "Kernel", SmalltalkNil, smalltalk.Object, false);
+smalltalk.wrapClassName("Number", "Kernel-Objects", Number, smalltalk.Object);
+smalltalk.wrapClassName("BlockClosure", "Kernel-Methods", Function, smalltalk.Object);
+smalltalk.wrapClassName("Boolean", "Kernel-Objects", Boolean, smalltalk.Object);
+smalltalk.wrapClassName("Date", "Kernel-Objects", Date, smalltalk.Object);
+smalltalk.wrapClassName("UndefinedObject", "Kernel-Objects", SmalltalkNil, smalltalk.Object, false);
 
 
 smalltalk.addClass("Collection", smalltalk.Object, null, "Kernel");
 smalltalk.addClass("Collection", smalltalk.Object, null, "Kernel");
 smalltalk.addClass("IndexableCollection", smalltalk.Collection, null, "Kernel");
 smalltalk.addClass("IndexableCollection", smalltalk.Collection, null, "Kernel");
 smalltalk.addClass("SequenceableCollection", smalltalk.IndexableCollection, null, "Kernel");
 smalltalk.addClass("SequenceableCollection", smalltalk.IndexableCollection, null, "Kernel");
 smalltalk.addClass("CharacterArray", smalltalk.SequenceableCollection, null, "Kernel");
 smalltalk.addClass("CharacterArray", smalltalk.SequenceableCollection, null, "Kernel");
-smalltalk.wrapClassName("String", "Kernel", String, smalltalk.CharacterArray);
-smalltalk.wrapClassName("Symbol", "Kernel", SmalltalkSymbol, smalltalk.CharacterArray, false);
-smalltalk.wrapClassName("Array", "Kernel", Array, smalltalk.SequenceableCollection);
-smalltalk.wrapClassName("RegularExpression", "Kernel", RegExp, smalltalk.Object);
+smalltalk.wrapClassName("String", "Kernel-Collections", String, smalltalk.CharacterArray);
+smalltalk.wrapClassName("Symbol", "Kernel-Collections", SmalltalkSymbol, smalltalk.CharacterArray, false);
+smalltalk.wrapClassName("Array", "Kernel-Collections", Array, smalltalk.SequenceableCollection);
+smalltalk.wrapClassName("RegularExpression", "Kernel-Collections", RegExp, smalltalk.Object);
 
 
-smalltalk.wrapClassName("Error", "Kernel", Error, smalltalk.Object);
-smalltalk.wrapClassName("MethodContext", "Kernel", SmalltalkMethodContext, smalltalk.Object, false);
+smalltalk.wrapClassName("Error", "Kernel-Exceptions", Error, smalltalk.Object);
+smalltalk.wrapClassName("MethodContext", "Kernel-Methods", SmalltalkMethodContext, smalltalk.Object, false);
 
 
 /* Alias definitions */
 /* Alias definitions */
 
 

Datei-Diff unterdrückt, da er zu groß ist
+ 0 - 7
js/lib/peg-0.7.0.min.js


+ 0 - 10
test/run_build.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-cd `dirname ${0}`/..
-
-
-# Create the build file
-cat js/boot.js js/Kernel-Announcements.js js/Kernel-Classes.js js/Kernel-Collections.js  js/Kernel-Exceptions.js js/Kernel-Methods.js js/Kernel-Objects.js js/Kernel-Transcript.js js/Compiler-AST.js js/Compiler-Core.js js/Compiler-Exceptions.js js/Compiler-IR.js js/Compiler-Inlining.js js/Compiler-Interpreter.js js/Compiler-Semantic.js js/SUnit.js js/Kernel-Tests.js js/Compiler-Tests.js js/SUnit-Tests.js test/Test.js js/parser.js js/init.js > test/run.js
-
-
-#run it!
-node test/run.js

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.