Browse Source

More renaming

Nicolas Petton 12 years ago
parent
commit
4880fd28ca

+ 22 - 16
README.md

@@ -1,32 +1,38 @@
-Jtalk
+Amber
 =====
 
 By Nicolas Petton <petton.nicolas@gmail.com>
 
-Jtalk is an implementation of the Smalltalk language that runs on top of the JavaScript runtime. It is designed to make client-side development faster and easier.
+Amber is an implementation of the Smalltalk language that runs on top of the JavaScript runtime. It is designed to make client-side development faster and easier.
 
 Overview
 --------
 
-Jtalk is written in itself, including the parser and compiler. Jtalk compiles into efficient JavaScript, mapping one-to-one with the equivalent JavaScript. There is no interpretation at runtime.
+Amber is written in itself, including the parser and compiler. Amber compiles into efficient JavaScript, mapping one-to-one with the equivalent JavaScript. There is no interpretation at runtime.
 
 Some highlights:
 
--    Jtalk features an IDE with a Class browser, Workspace, Transcript, a ReferencesBrowser supporting senders/implementors and class references, basic Inspector and even a beginning of a Debugger and a unit TestRunner.
+-    Amber features an IDE with a Class browser, Workspace, Transcript, a ReferencesBrowser supporting senders/implementors and class references, basic Inspector and even a beginning of a Debugger and a unit TestRunner.
 -    [Pharo Smalltalk](http://www.pharo-project.org) is considered as the reference implementation.
--    Jtalk includes a canvas to generate HTML, like [Seaside](http://www.seaside.st)
--    Jtalk can use Javascript libraries and the current IDE is built on [jQuery](http://www.jquery.com)
--    You can inline Javascript code and there are many ways to interact between Jtalk and Javascript
+-    Amber includes a canvas to generate HTML, like [Seaside](http://www.seaside.st)
+-    Amber can use Javascript libraries and the current IDE is built on [jQuery](http://www.jquery.com)
+-    You can inline Javascript code and there are many ways to interact between Amber and Javascript
 
 How to commit changes from the web-based IDE
 --------------------------------------------
 
-The Jtalk class browser is able to commit changes to disk.
+The Amber class browser is able to commit changes to disk.
 The "commit category" button will send a PUT request with the JS code of all classes in the selected class category in a file named js/CATEGORY.js and also send the corresponding .st files to the st directory.
 
-The easiest way to enable committing is probably to setup a webdav with Apache.
+The easiest way to enable committing is probably to use the nodejs server or to setup a webdav with Apache.
 
-The following steps explain how to setup a webdav for Jtalk with Debian, but the setup on OSX and other Linux distros should be similar.
+To start the local server:
+
+./bin/server
+
+then go to http://localhost:4000
+
+The following steps explain how to setup a webdav for Amber with Debian, but the setup on OSX and other Linux distros should be similar.
 
 ### Install Apache and enable the dav module
 
@@ -38,12 +44,12 @@ The following steps explain how to setup a webdav for Jtalk with Debian, but the
 
     htpasswd -c /etc/apache2/htpasswd-webdav USERNAME
 
-### Setup the webdav for Jtalk
+### Setup the webdav for Amber
 
 Add the following lines to the default vhost (in /etc/apache2/sites-available/default):
 
-    Alias /jtalk/ "/path/to/jtalk/"
-        <Directory "/path/to/jtalk/">
+    Alias /amber/ "/path/to/amber/"
+        <Directory "/path/to/amber/">
             Options Indexes MultiViews FollowSymLinks
 	    DirectoryIndex index.html
 	    AllowOverride None
@@ -53,7 +59,7 @@ Add the following lines to the default vhost (in /etc/apache2/sites-available/de
 	    Dav on
 
 	    AuthType Basic
-            AuthName "jtalk"
+            AuthName "amber"
             AuthUserFile /etc/apache2/htpasswd-webdav
 	    <LimitExcept GET OPTIONS>
                 Require valid-user
@@ -71,9 +77,9 @@ Make sure the group www-data has required rights to modify files in the webdav d
 License
 -------
 
-Jtalk 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.
 
 More infos
 ----------
 
-More on the [project page](http://nicolaspetton.github.com/jtalk)
+More on the [project page](http://nicolaspetton.github.com/amber)

+ 1 - 1
examples/nodejs/benchfib/Makefile

@@ -1,5 +1,5 @@
 Program.js: Benchfib.st
-	../../../bin/jtalkc -m Benchfib Benchfib.st Program
+	../../../bin/amberc -m Benchfib Benchfib.st Program
 
 run: Program.js
 	./benchfib

+ 1 - 1
examples/nodejs/hello/Makefile

@@ -1,5 +1,5 @@
 Program.js: Hello.st
-	../../../bin/jtalkc -m Hello Hello.st Program
+	../../../bin/amberc -m Hello Hello.st Program
 
 run: Program.js
 	./hello

+ 1 - 1
examples/nodejs/meta/Makefile

@@ -1,5 +1,5 @@
 Program.js: MyScript.st
-	../../../bin/jtalkc -L COMPILER -m MyScript MyScript.st Program
+	../../../bin/amberc -L COMPILER -m MyScript MyScript.st Program
 
 run: Program.js
 	node Program.js

+ 1 - 1
examples/nodejs/pystone/Makefile

@@ -1,5 +1,5 @@
 Program.js: Pystone.st
-	../../../bin/jtalkc -m Pystone Pystone.st Program
+	../../../bin/amberc -m Pystone Pystone.st Program
 
 run: Program.js
 	./pystone

+ 1 - 1
examples/nodejs/trivialserver/Makefile

@@ -1,5 +1,5 @@
 Program.js: TrivialServer.st
-	../../../bin/jtalkc -m TrivialServer TrivialServer.st Program
+	../../../bin/amberc -m TrivialServer TrivialServer.st Program
 
 run: Program.js
 	./trivial

+ 3 - 3
examples/webos/eris/Makefile

@@ -1,10 +1,10 @@
 #
-# If you copy this file for an Enyo/Jtalk project, just
+# If you copy this file for an Enyo/Amber project, just
 # modify these first three lines
 # and then add .st files as you please. This Makefile
 # should pick them all up and compile into Program.js.
 #
-PACKAGE  := jtalk.eris
+PACKAGE  := amber.eris
 VERSION  := 0.0.1
 FLAGS    := -L COMPILER
 
@@ -15,7 +15,7 @@ OBJECTS  := $(patsubst %.st,%.js,$(wildcard *.st))
 FILEJS   := $(FILE).js
 
 $(FILEJS): $(SOURCES)
-	../../../bin/jtalkc $(FLAGS) $(SOURCES) $(FILE)
+	../../../bin/amberc $(FLAGS) $(SOURCES) $(FILE)
 
 $(IPK): $(FILEJS)
 	palm-package .

+ 3 - 3
examples/webos/hellojtalk/Makefile

@@ -1,10 +1,10 @@
 #
-# If you copy this file for an Enyo/Jtalk project, just
+# If you copy this file for an Enyo/Amber project, just
 # modify these first two lines
 # and then add .st files as you please. This Makefile
 # should pick them all up and compile into Program.js.
 #
-PACKAGE  := jtalk.hellojtalk
+PACKAGE  := amber.helloamber
 VERSION  := 1.0.0
 
 # -O for Closure optimization of js code.
@@ -16,7 +16,7 @@ OBJECTS  := $(patsubst %.st,%.js,$(wildcard *.st))
 FILEJS   := $(FILE).js
 
 $(FILEJS): $(SOURCES)
-	../../../bin/jtalkc $(FLAGS) $(SOURCES) $(FILE)
+	../../../bin/amberc $(FLAGS) $(SOURCES) $(FILE)
 
 $(IPK): $(FILEJS)
 	palm-package .

+ 5 - 5
js/boot.js

@@ -1,7 +1,7 @@
 /* ====================================================================
    |
-   |   Jtalk Smalltalk
-   |   http://jtalk-project.org
+   |   Amber Smalltalk
+   |   http://amber-lang.net
    |
    ======================================================================
 
@@ -10,7 +10,7 @@
    | Copyright (c) 2010-2011
    | Nicolas Petton <petton.nicolas@gmail.com>
    |
-   | Jtalk is released under the MIT license
+   | Amber is released under the MIT license
    |
    | Permission is hereby granted, free of charge, to any person obtaining
    | a copy of this software and associated documentation files (the 
@@ -317,7 +317,7 @@ function Smalltalk(){
 
     /* Handles #dnu: *and* JavaScript method calls.
        if the receiver has no klass, we consider it a JS object (outside of the
-       Jtalk system). Else assume that the receiver understands #doesNotUnderstand: */
+       Amber system). Else assume that the receiver understands #doesNotUnderstand: */
 
     function messageNotUnderstood(receiver, selector, args) {
 	/* Handles JS method calls. */
@@ -325,7 +325,7 @@ function Smalltalk(){
 	    return callJavaScriptMethod(receiver, selector, args);
 	}
 
-	/* Handles not understood messages. Also see the Jtalk counter-part 
+	/* Handles not understood messages. Also see the Amber counter-part 
 	   Object>>doesNotUnderstand: */
 	
 	return receiver._doesNotUnderstand_(

+ 12 - 12
st/Makefile

@@ -1,14 +1,14 @@
 #
-# This Makefile takes .st files in the jtalk/st directory and produces compiled
+# This Makefile takes .st files in the amber/st directory and produces compiled
 # javascript files from them, for both debug and deployment.
 #
 # Where we find the current runnable code and where we put our js files on install
 JS	:= ../js/
 
 # The compiler script
-JTALKC	:= ../bin/jtalkc
+AMBERC	:= ../bin/amberc
 
-# Generic flags to JTALKC
+# Generic flags to AMBERC
 FLAGS   := -d
 
 # All corresponding js filenames for every st file available
@@ -29,19 +29,19 @@ boot.js init.js parser.js:
 # Then we compile Kernel.st depending on having boot.js, init.js and parser.js
 # $< means the first dependency - in other words Kernel.st
 Kernel.js: Kernel.st boot.js init.js parser.js
-	$(JTALKC) $(FLAGS) $<
+	$(AMBERC) $(FLAGS) $<
 
 # ...and Compiler, but using the new Kernel from above.
 # We only need to depend on Kernel.js since it in turn depends on boot.js etc
 Compiler.js: Compiler.st Kernel.js
-	$(JTALKC) $(FLAGS) $<
+	$(AMBERC) $(FLAGS) $<
 
 # ...now that we have a new Kernel and Compiler we use them
 # to compile the rest of st files presuming that they only depend on Kernel, like
 # for example Canvas.js and Benchfib.js.
 %.js: %.st Compiler.js
 	echo $(OBJECTS)
-	$(JTALKC) $(FLAGS) $<
+	$(AMBERC) $(FLAGS) $<
 
 # But for some libraries there are more dependencies to care for. Then
 # we need to use -l so that the compiler first loads that library
@@ -51,26 +51,26 @@ Compiler.js: Compiler.st Kernel.js
 #
 # JQuery uses Canvas
 JQuery.js: JQuery.st Canvas.js
-	$(JTALKC) $(FLAGS) -l Canvas $<
+	$(AMBERC) $(FLAGS) -l Canvas $<
 
 # IDE uses JQuery
 IDE.js: IDE.st JQuery.js
-	$(JTALKC) $(FLAGS) -l Canvas,JQuery $<
+	$(AMBERC) $(FLAGS) -l Canvas,JQuery $<
 
 TrySmalltalk.js: TrySmalltalk.st IDE.js
-	$(JTALKC) $(FLAGS) -l Canvas,JQuery,IDE $<
+	$(AMBERC) $(FLAGS) -l Canvas,JQuery,IDE $<
 
 # Some Examples use SUnit and also IDE
 Examples.js: Examples.st SUnit.js IDE.js
-	$(JTALKC) $(FLAGS) -l SUnit,Canvas,JQuery,IDE $<;
+	$(AMBERC) $(FLAGS) -l SUnit,Canvas,JQuery,IDE $<;
 
 # Tests typically also use SUnit
 Kernel-Tests.js: Kernel-Tests.st SUnit.js
-	$(JTALKC) $(FLAGS) -l SUnit $<;
+	$(AMBERC) $(FLAGS) -l SUnit $<;
 
 # Tests typically also use SUnit
 JQuery-Tests.js: JQuery-Tests.st JQuery.js SUnit.js
-	$(JTALKC) $(FLAGS) -l Canvas,JQuery,SUnit $<;
+	$(AMBERC) $(FLAGS) -l Canvas,JQuery,SUnit $<;
 
 
 # Installing is simply copying all js files to js directory.