Merge pull request #38 from MetaBorgCube/release/0.8.0

Release/0.8.0
MetaBorgCube · Nov 13, 2017 · e2e3c9b · e2e3c9b
2 parents f998385 + 5c55154
commit e2e3c9b
Show file tree

Hide file tree

Showing 121 changed files with 3,452 additions and 458 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
   <extension>
     <groupId>org.metaborg</groupId>
     <artifactId>spoofax-maven-plugin-pomless</artifactId>
-    <version>2.2.0</version>
+    <version>2.3.0</version>
   </extension>
 </extensions>
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -1 +1 @@
--Xmx512m
+-Xmx2G -Xss16m
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -47,7 +47,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.3.0/org.metaborg.spoofax.eclipse.updatesite-2.3.0-assembly.zip-unzip/</url>
 			<layout>p2</layout>
 			<releases>
 				<enabled>false</enabled>

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,10 +1,10 @@
 properties([
-  //pipelineTriggers([
-  //  upstream(
-  //    threshold: hudson.model.Result.SUCCESS,
-  //    upstreamProjects: '/metaborg/spoofax-releng/master'
-  //  )
-  //]),
+//  pipelineTriggers([
+//    upstream(
+//      threshold: hudson.model.Result.SUCCESS,
+//      upstreamProjects: '/metaborg/spoofax-releng/master'
+//    )
+//  ]),
   buildDiscarder(logRotator(artifactNumToKeepStr: '3')),
   disableConcurrentBuilds()
 ])

diff --git a/change_to_spoofax_nightly.sh b/change_to_spoofax_nightly.sh
@@ -1,2 +1,2 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://tinyurl.com/spoofax-eclipse-2-1-0" search . | xargs sed -i "" "s/http:\/\/tinyurl.com\/spoofax-eclipse-2-1-0/http:\/\/download.spoofax.org\/update\/nightly\//g"
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.1.0" search . | xargs sed -i "" "s/2.1.0/2.2.0-SNAPSHOT/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "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/" search . | xargs sed -i "" "s_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/_http://buildfarm.metaborg.org/job/metaborg/job/spoofax-releng/job/master/lastSuccessfulBuild/artifact/dist/spoofax/eclipse/site/_g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.2.0" search . | xargs sed -i "" "s/2.2.0/2.3.0-SNAPSHOT/g"
diff --git a/change_to_spoofax_stable.sh b/change_to_spoofax_stable.sh
@@ -1,2 +1,2 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://download.spoofax.org/update/nightly/" search . | xargs sed -i "" "s_http://download.spoofax.org/update/nightly/_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/_g"
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.2.0-SNAPSHOT" search . | xargs sed -i "" "s_2.2.0-SNAPSHOT_2.2.0_g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://buildfarm.metaborg.org/job/metaborg/job/spoofax-releng/job/master/lastSuccessfulBuild/artifact/dist/spoofax/eclipse/site/" search . | xargs sed -i "" "s_http://buildfarm.metaborg.org/job/metaborg/job/spoofax-releng/job/master/lastSuccessfulBuild/artifact/dist/spoofax/eclipse/site/_http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.3.0/org.metaborg.spoofax.eclipse.updatesite-2.3.0-assembly.zip-unzip/_g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.3.0-SNAPSHOT" search . | xargs sed -i "" "s_2.3.0-SNAPSHOT_2.3.0_g"
diff --git a/change_version.sh b/change_version.sh
@@ -1,4 +1,4 @@
-FROMVERSION=0.6.3
-TOVERSION=0.7.1
+FROMVERSION=0.7.1
+TOVERSION=0.7.2
 
 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.7.1
-TOVERSION=0.7.1
+FROMVERSION=0.7.2
+TOVERSION=0.8.0
 
 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.1"
+  version="0.8.0"
 >
-  <plugin id="icedust.eclipse" version="0.7.1" unpack="true" />
+  <plugin id="icedust.eclipse" version="0.8.0" 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.1</version>
+  <version>0.8.0</version>
   <packaging>eclipse-feature</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.plugin</artifactId>
-    <version>2.2.1</version>
+    <version>2.3.0</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.1/org.metaborg.spoofax.eclipse.updatesite-2.2.1-assembly.zip-unzip/</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.3.0/org.metaborg.spoofax.eclipse.updatesite-2.3.0-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.1</version>
+  <version>0.8.0</version>
   <packaging>eclipse-update-site</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.plugin</artifactId>
-    <version>2.2.1</version>
+    <version>2.3.0</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.1/org.metaborg.spoofax.eclipse.updatesite-2.2.1-assembly.zip-unzip/</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.3.0/org.metaborg.spoofax.eclipse.updatesite-2.3.0-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.1.jar" id="icedust.eclipse.feature" version="0.7.1">
+   <feature url="features/icedust.eclipse.feature_0.8.0.jar" id="icedust.eclipse.feature" version="0.8.0">
       <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.1
+Bundle-Version: 0.8.0
 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.1</version>
+  <version>0.8.0</version>
   <packaging>eclipse-plugin</packaging>
 
   <parent>
     <groupId>org.metaborg</groupId>
     <artifactId>parent.eclipse.language</artifactId>
-    <version>2.2.1</version>
+    <version>2.3.0</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.1/org.metaborg.spoofax.eclipse.updatesite-2.2.1-assembly.zip-unzip/</url>
+      <url>http://artifacts.metaborg.org/content/unzip/releases-unzipped/org/metaborg/org.metaborg.spoofax.eclipse.updatesite/2.3.0/org.metaborg.spoofax.eclipse.updatesite-2.3.0-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
@@ -14,12 +14,16 @@ config
   backend : WebDSL
     ui : Model Explorer
 
+functions
+
+  countTrue(bs : Boolean *) : Int 1 = bs.filter(b=>b).count()
+
 model
 
   entity Student {
     name       : String
 
-    passedCourses : Int = sum(enrollments.pass2)
+    passedCourses : Int = countTrue(enrollments.pass)
   }
 
   entity Course (eventual) {
@@ -39,7 +43,6 @@ model
 
     grade      : Float?  = submission.grade
     pass       : Boolean = submission.pass <+ false
-    pass2      : Int     = pass ? 1 : 0
   }
 
   relation Course.enrollments *  <-> 1 Enrollment.course