Merge pull request #34 from MetaBorgCube/release/0.7.1

Release/0.7.1
MetaBorgCube · Aug 28, 2017 · f998385 · f998385
2 parents f260bb8 + 522f52e
commit f998385
Show file tree

Hide file tree

Showing 221 changed files with 79,206 additions and 2,435 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -21,7 +21,8 @@ node{
     stage('Build and Test') {
       withMaven(
         //mavenLocalRepo: "${env.JENKINS_HOME}/m2repos/${env.EXECUTOR_NUMBER}", //http://yellowgrass.org/issue/SpoofaxWithCore/173
-		mavenLocalRepo: ".repository",
+        mavenLocalRepo: ".repository",
+        globalMavenSettingsFilePath: ".mvn/settings.xml",
         mavenOpts: '-Xmx2G -Xms2G -Xss16m'
       ){
         sh 'mvn -B -U clean verify -DforceContextQualifier=\$(date +%Y%m%d%H%M)'

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Build status](http://buildfarm.metaborg.org/job/metaborgcube/job/IceDust/job/master/badge/icon)](http://buildfarm.metaborg.org/job/metaborgcube/job/IceDust/job/master/)
 
-# IceDust
+# IceDust ![](icedust/icons/icedust-32x32.png "IceDust logo")
 
 IceDust is an information system modeling language; a declarative specification language with first class relations and derived values.
 
@@ -103,9 +103,16 @@ There are three backends:
 
 ### Java backend
 
-To use the Java backend use the menu `Spoofax > Generation > to Java > Calculate on Read > Generate, Compile and Execute`.
+To execute the Java backend use the menu `Spoofax > Generation > Build`.
 
-Or use `Spoofax > Generation > to Java > Calculate on Read > Generate` to generate Java code (make sure the generated Java files are on the classpath and that your eclipse project has the Java nature and Java builder).
+For only generating Java code (and not compiling and executing it) add the following config:
+
+```
+config
+  backend : Java
+    phase : generate
+```
+Note: make sure the generated Java files are on the classpath and that your eclipse project has the Java nature and Java builder.
 
 ### WebDSL backend - Standalone Application (CRUD-interface)
 
@@ -122,26 +129,23 @@ And `Demo.rel`:
 ```
 module Demo
 
+config
+
+  backend : WebDSL
+    ui : Model Explorer // remove this line if no UI is desired
+
 model
 
   //...
 ```
 
-1. Use `Spoofax > Generation > to WebDSL > Calculate on Read > Generate, Standalone Application` to generate the `.app` file.
+1. Use `Spoofax > Generation > Build` to generate the `.app` file.
 2. Import the project in the [WebDSL editor](http://buildfarm.metaborg.org/job/webdsl-eclipsegen/).
 3. Convert the project to a WebDSL project by right-clicking the project in the WebDSL editor.
 4. Press `Cmd + Alt + B` in the `.app` file to trigger the WebDSL compiler, the compiler will build the project and automatically launch a webserver and open the main web page of the application.
 
-Known issue: the CRUD interface does not work properly for optional values (all values are required), and also not for default values (as those are optional as well).
-
-### WebDSL backend - Embedded Model
-
-Use `Spoofax > Generation > to WebDSL > Calculate on Read > Generate, Embedded Model` to generate the `.app` file.
-
-You need to create a main `.app` file that includes the generated `.app` file.
-The generated `.app` file has `extend` entities, so the main `.app` file needs to define the entities to the generated code can extend these.
-
 ## Contributing
 
 We welcome contributions of any sort. Whether you are a student, someone from industry, or an enthousiast, you are welcome to contribute. See [Contributing](CONTRIBUTING.md) for more details.
 
+Some contributions are language extensions instead of IceDust contributions itself. The process for language extensions is described in [language-extension](language-extension.md).
diff --git a/change_spoofax_version.sh b/change_spoofax_version.sh
@@ -0,0 +1,4 @@
+FROMVERSION=2.2.0
+TOVERSION=2.2.1
+
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "${FROMVERSION}" * | xargs sed -i "" "s/${FROMVERSION}/${TOVERSION}/g"
diff --git a/change_version.sh b/change_version.sh
@@ -1 +1,4 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.6.2(.qualifier|-SNAPSHOT)" * | xargs sed -i "" "s/0.6.2/0.6.3/g"
+FROMVERSION=0.6.3
+TOVERSION=0.7.1
+
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "${FROMVERSION}(.qualifier|-SNAPSHOT)" * | xargs sed -i "" "s/${FROMVERSION}/${TOVERSION}/g"
diff --git a/change_version_to_stable.sh b/change_version_to_stable.sh
@@ -1,5 +1,5 @@
-FROMVERSION=0.6.3
-TOVERSION=0.7.0
+FROMVERSION=0.7.1
+TOVERSION=0.7.1
 
 grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "${FROMVERSION}.qualifier" * | xargs sed -i "" "s/${FROMVERSION}.qualifier/${TOVERSION}/g"
 grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "${FROMVERSION}-SNAPSHOT" * | xargs sed -i "" "s/${FROMVERSION}-SNAPSHOT/${TOVERSION}/g"
diff --git a/icedust.eclipse.feature/feature.xml b/icedust.eclipse.feature/feature.xml
@@ -2,8 +2,8 @@
 <feature
   id="icedust.eclipse.feature"
   label="icedust language Eclipse plugin"
-  version="0.7.0"
+  version="0.7.1"
 >
-  <plugin id="icedust.eclipse" version="0.7.0" unpack="true" />
+  <plugin id="icedust.eclipse" version="0.7.1" unpack="true" />
   <includes id="org.metaborg.spoofax.eclipse.feature" version="0" />
 </feature>
diff --git a/icedust.eclipse.feature/pom.xml b/icedust.eclipse.feature/pom.xml
@@ -6,13 +6,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.metaborg.lang</groupId>
   <artifactId>icedust.eclipse.feature</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
   <packaging>eclipse-feature</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.plugin</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <relativePath />
   </parent>
 
@@ -39,7 +39,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.0/org.metaborg.spoofax.eclipse.updatesite-2.2.0-assembly.zip-unzip/</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.1/org.metaborg.spoofax.eclipse.updatesite-2.2.1-assembly.zip-unzip/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

diff --git a/icedust.eclipse.site/pom.xml b/icedust.eclipse.site/pom.xml
@@ -6,13 +6,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.metaborg.lang</groupId>
   <artifactId>icedust.eclipse.site</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
   <packaging>eclipse-update-site</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.plugin</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <relativePath />
   </parent>
 
@@ -39,7 +39,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.0/org.metaborg.spoofax.eclipse.updatesite-2.2.0-assembly.zip-unzip/</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.1/org.metaborg.spoofax.eclipse.updatesite-2.2.1-assembly.zip-unzip/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

diff --git a/icedust.eclipse.site/site.xml b/icedust.eclipse.site/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/icedust.eclipse.feature_0.7.0.jar" id="icedust.eclipse.feature" version="0.7.0">
+   <feature url="features/icedust.eclipse.feature_0.7.1.jar" id="icedust.eclipse.feature" version="0.7.1">
       <category name="icedust"/>
    </feature>
    <category-def name="icedust" label="icedust language Eclipse plugin">

diff --git a/icedust.eclipse/META-INF/MANIFEST.MF b/icedust.eclipse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: icedust language Eclipse plugin
 Bundle-SymbolicName: icedust.eclipse;singleton:=true
-Bundle-Version: 0.7.0
+Bundle-Version: 0.7.1
 Bundle-Vendor: org.metaborg.lang
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.metaborg.spoofax.eclipse

diff --git a/icedust.eclipse/pom.xml b/icedust.eclipse/pom.xml
@@ -6,13 +6,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.metaborg.lang</groupId>
   <artifactId>icedust.eclipse</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.language</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
     <relativePath />
   </parent>
 
@@ -66,7 +66,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.0/org.metaborg.spoofax.eclipse.updatesite-2.2.0-assembly.zip-unzip/</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.2.1/org.metaborg.spoofax.eclipse.updatesite-2.2.1-assembly.zip-unzip/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

diff --git a/icedust.example.webdsl/icedustWebDSL2.ice b/icedust.example.webdsl/icedustWebDSL2.ice
@@ -9,6 +9,11 @@ module icedustWebDSL2 (incremental)
 //  - personal deadlines and deadline extensions, teachers can assign students a personal deadline
 //  - assignment and course statistics
 
+config
+
+  backend : WebDSL
+    ui : Model Explorer
+
 model
 
   entity Student {

diff --git a/icedust.example/.gitignore b/icedust.example/.gitignore
@@ -3,4 +3,10 @@
 /.settings
 *.analysis.txt
 *.java
-*.class
+*.class
+*.flowsto.txt
+*.dependson.txt
+*.class
+*.js
+*.java
+scratchpad.ice2
diff --git a/icedust.example/metaborg.yaml b/icedust.example/metaborg.yaml
@@ -1,4 +1,4 @@
 ---
 dependencies:
   compile:
-  - org.metaborg.lang:icedust:0.7.0
+  - org.metaborg.lang:icedust:0.7.1
diff --git a/icedust.example/pom.xml b/icedust.example/pom.xml
@@ -7,20 +7,20 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.metaborg.lang</groupId>
   <artifactId>icedust.example</artifactId>
-  <version>0.7.0</version>
+  <version>0.7.1</version>
   <packaging>spoofax-project</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.language</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>org.metaborg.lang</groupId>
       <artifactId>icedust</artifactId>
-      <version>0.7.0</version>
+      <version>0.7.1</version>
       <type>spoofax-language</type>
     </dependency>
   </dependencies>