Merge remote-tracking branch 'golo-lang/master'

Author: flemouel

.gitignore

@@ -8,3 +8,4 @@ dependency-reduced-pom.xml
 .benchmarks.h2.db
 benchmarks/*.json
 benchmarks/*.html
+doc/output/

.mailmap

@@ -0,0 +1,7 @@
+Daniel Petisme <[email protected]> Daniel PETISME <[email protected]> 
+Daniel Petisme <[email protected]> Daniel PETISME <[email protected]>
+Daniel Petisme <[email protected]> danielpetisme <[email protected]> 
+Philippe Charrière <[email protected]> Philippe CHARRIERE <[email protected]> 
+Philippe Charrière <[email protected]> k33g <[email protected]>
+Jeff Maury <[email protected]> Jeff MAURY <[email protected]>
+

.travis.yml

@@ -1,12 +1,13 @@
 language: java
 
 jdk:
-  - oraclejdk7
   - openjdk7
+  - oraclejdk7
+  - oraclejdk8
+
+matrix:
+  fast_finish: true
 
 install: "rake special:bootstrap"
 
 script: "mvn clean install"
-
-notifications:
-  irc: "irc.freenode.org#golo-lang"

CONTRIBUTORS

@@ -8,3 +8,12 @@ David Festal (SERLI) <[email protected]>
 Dan Allen (Red Hat) <[email protected]>
 Daniel Petisme <[email protected]>
 Philippe Charrière <[email protected]>
+Franck Verrot <[email protected]>
+Thierry Chantier <[email protected]>
+Guillaume Grossetie <[email protected]>
+Jeff Maury <[email protected]>
+Kel Cecil <[email protected]>
+Yannick Loiseau <[email protected]>
+Sylvain Desgrais <[email protected]>
+Alexis Thomas <[email protected]>
+Romain Lespinasse <[email protected]>

Dockerfile

@@ -0,0 +1,21 @@
+FROM ubuntu:14.04
+MAINTAINER Julien Ponge <[email protected]>
+
+RUN apt-get update
+RUN apt-get -y upgrade
+RUN apt-get -y install software-properties-common
+RUN add-apt-repository ppa:webupd8team/java -y
+RUN apt-get update
+
+RUN (echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections)
+RUN apt-get install -y oracle-java8-installer oracle-java8-set-default
+
+ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
+ENV PATH $JAVA_HOME/bin:$PATH
+RUN apt-get install -y maven rake
+RUN apt-get autoclean
+
+ADD . /src
+RUN cd /src && rake special:bootstrap
+RUN mkdir -p /opt/golo && cp -R /src/target/golo-*-distribution/golo-*/* /opt/golo && ln -s /opt/golo/bin/golo /usr/bin/golo
+RUN rm -rf /src ~/.m2

LICENSE-header

@@ -1,4 +1,4 @@
-Copyright 2012-2013 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
+Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
+limitations under the License.

NOTICE

@@ -1,5 +1,5 @@
 The Golo Programming Language
-Copyright 2012-2013 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
+Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
 
 This product includes software developed at
 INSA-Lyon (http://www.insa-lyon.fr/).

README.md

@@ -1,11 +1,13 @@
+[![DOI](https://zenodo.org/badge/3726/golo-lang/golo-lang.png)](http://dx.doi.org/10.5281/zenodo.11819)
+
 # Golo, a lightweight dynamic language for the JVM.
 
 > The world didn't need another JVM language.
 > So we built yet another one.  A simple one.
 
 Golo is a simple dynamic, weakly-typed language for the JVM.
 
-Built from day 1 with `invokedynamic`, Golo takes advantage of the latest advances of 
+Built from day 1 with `invokedynamic`, Golo takes advantage of the latest advances of
 the JVM. It is also a showcase on how to build a language runtime with `invokedynamic`.
 
 Golo is being developed as part of the research activities of the
@@ -16,10 +18,19 @@ Golo is being developed as part of the research activities of the
 * Website: [http://golo-lang.org/](http://golo-lang.org/)
 * Twitter: [@golo_lang](https://twitter.com/golo_lang)
 * GitHub: [https://github.com/golo-lang/golo-lang](https://github.com/golo-lang/golo-lang)
-* Sourceforge: [http://sourceforge.net/projects/golo-lang/](http://sourceforge.net/projects/golo-lang/)
+* Mailing-list: [http://groups.google.com/group/golo-lang](http://groups.google.com/group/golo-lang)
 * StackOverflow: [questions with the `golo-lang` tag](http://stackoverflow.com/questions/tagged/golo-lang)
-* Forums: [at Sourceforge, (email subscriptions are possible)](https://sourceforge.net/p/golo-lang/discussion/)
-* IRC: [`#golo-lang` on Freenode](https://webchat.freenode.net/)
+
+Starting from version 1.0.0, Golo adopts the [semantic versioning scheme](http://semver.org).
+
+## Getting Golo
+
+Go to the [Golo downloads page](http://golo-lang.org/download/) for general download instructions.
+
+You can fetch Golo from Maven central under the `org.golo-lang` group.
+
+We also provide [Docker](http://docker.com/) images based on Ubuntu 14.04 and Java SE 8:
+`docker pull jponge/golo-lang` ([https://registry.hub.docker.com/u/jponge/golo-lang/](https://registry.hub.docker.com/u/jponge/golo-lang/))
 
 ## Building Golo
 
@@ -54,18 +65,34 @@ Of course you can just call Maven directly if you like.
 
 The documentation is located in `doc/` and is built using [AsciiDoc](http://asciidoc.org).
 
-The current configuration depends on MacOSX + Homebrew specific paths. We know this is very bad,
-and we promise to solve this *at some point*. Or maybe we'll just switch to
-[AsciiDoctor](http://asciidoctor.org) *at some point*.
-
 The documentation can be built using the provided `Rakefile`. For instance one may build a HTML
 output using:
 
     rake html
 
+#### Building documentation on Ubuntu Linux
+
+You'll need to perform the following steps before building the golo-lang docs on Ubuntu:
+
+1.  Perform *sudo apt-get install asciidoc python-pygments fop* to get the required dependencies.
+2.  Uncomment a line in /etc/asciidoc/asciidoc.conf to allow use of pygments highligher:
+
+```
+#Uncomment to use the Pygments source highlighter instead of GNU highlighter.
+#pygments=
+```
+
+#### Building documentation on Fedora Linux
+
+You'll need to install the following packages before building the golo-lang docs on Fedora:
+
+*  asciidoc
+*  python-pygments
+*  fop
+
 ## License
 
-    Copyright 2012-2013 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
+    Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -93,11 +120,10 @@ Big thanks to our early testers before Golo was made public! *(in random order)*
 
 Pierre Colomb, Olivier Coupelon, Cédric Exbrayat, Frédéric Le Mouel, Nicolas Stouls,
 Henri Gomez, Julien Viet, Philippe Charrière, Ludovic Champenois, Thierry Chantier,
-Daniel Petisme, David Gageot, David Festal, Gildas Cuisinier, Thomas Maurel, 
+Daniel Petisme, David Gageot, David Festal, Gildas Cuisinier, Thomas Maurel,
 Yannick Loiseau, Alexis Plantin, Sylvain Desgrais, William Guyot, Agnès Crépet, Cyril Lacote.
 
 ### Companies
 
-[Serli](http://www.serli.com/), 
+[Serli](http://www.serli.com/),
 [Ninja Squad](http://ninja-squad.com/).
-

Rakefile

@@ -1,11 +1,11 @@
-# Copyright 2012-2013 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
-# 
+# Copyright 2012-2014 Institut National des Sciences Appliquées de Lyon (INSA-Lyon)
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,10 +40,11 @@ task :doc do
   Dir.chdir("doc") do
     sh "rake clean all"
   end
+  sh "mvn org.golo-lang:golo-maven-plugin:golodoc -DoutputDirectory=doc/output/golodoc"
 end
 
 desc "Deploy snapshots"
-task :deploy => [:clean, :build] do
+task :deploy => [:clean, :build, :doc] do
   MAGIC = "mvn deploy"
   sh MAGIC
   Dir.chdir("golo-maven-plugin") do
@@ -52,7 +53,7 @@ task :deploy => [:clean, :build] do
 end
 
 desc "Release"
-task :release => [:clean, :all] do
+task :release => [:clean, 'special:bootstrap', :all] do
   MAGIC = "mvn deploy -P sonatype-oss-release"
   sh MAGIC
   Dir.chdir("golo-maven-plugin") do
@@ -100,7 +101,7 @@ namespace :test do
 end
 
 namespace :special do
-  
+
   desc "Bootstrap Golo and the Maven plug-in for a clean-room environment"
   task :bootstrap do
     sh "mvn clean install -P !bootstrapped"
@@ -117,7 +118,7 @@ namespace :special do
     Dir.chdir("golo-maven-plugin") do
       sh CMD
     end
-    Dir.chdir("benchmarks") do
+    Dir.chdir("jmh-benchmarks") do
       sh CMD
     end
   end
@@ -129,7 +130,19 @@ namespace :special do
     Dir.chdir("golo-maven-plugin") do
       sh CMD
     end
-    Dir.chdir("benchmarks") do
+    Dir.chdir("jmh-benchmarks") do
+      sh CMD
+    end
+  end
+
+  desc "Check for property updates (dependencies + plugins)"
+  task :check_property_updates do
+    CMD = "mvn versions:display-property-updates"
+    sh CMD
+    Dir.chdir("golo-maven-plugin") do
+      sh CMD
+    end
+    Dir.chdir("jmh-benchmarks") do
       sh CMD
     end
   end

THIRD-PARTY

@@ -54,3 +54,39 @@ Copyright 2010 Cedric Beust <[email protected]>
     See the License for the specific language governing permissions and
     limitations under the License.
 
+# Txtmark
+
+See https://github.com/rjeschke/txtmark
+
+Copyright (c) 2011 René Jeschke
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+# json-simple
+
+See https://code.google.com/p/json-simple/
+
+By Yidong Fang and others.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
+        http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+