Merge pull request #7 from MetaBorgCube/release/0.5.0

Release/0.5.0
MetaBorgCube · Aug 30, 2016 · 72f579e · 72f579e
2 parents f03aff1 + fb310e6
commit 72f579e
Show file tree

Hide file tree

Showing 212 changed files with 10,026 additions and 5,622 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,4 +44,4 @@ lib-refactoring/*.generated.str
 syntax/*.sdf
 /include
 update/target
-relations-eclipse-plugin/target
+relations-eclipse-plugin/target
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.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
   </extension>
 </extensions>
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
@@ -47,7 +47,7 @@
         </repository>
 		<repository>
 			<id>spoofax-eclipse-repo</id>
-			<url>http://download.spoofax.org/update/nightly/</url>
+			<url>http://download.spoofax.org/update/release/2.0.0/eclipse/site/</url>
 			<layout>p2</layout>
 			<releases>
 				<enabled>false</enabled>

diff --git a/change_to_spoofax_nightly.sh b/change_to_spoofax_nightly.sh
@@ -0,0 +1,2 @@
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "http://download.spoofax.org/update/release/2.0.0/eclipse/site/" search . | xargs sed -i "" "s/http:\/\/download.spoofax.org\/update\/release\/2.0.0\/eclipse\/site\//http:\/\/download.spoofax.org\/update\/nightly\//g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.0.0" search . | xargs sed -i "" "s/2.0.0/2.1.0-SNAPSHOT/g"
diff --git a/change_to_spoofax_stable.sh b/change_to_spoofax_stable.sh
@@ -0,0 +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:\/\/download.spoofax.org\/update\/release\/2.0.0\/eclipse\/site\//g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml} "2.1.0-SNAPSHOT" search . | xargs sed -i "" "s/2.1.0-SNAPSHOT/2.0.0/g"
diff --git a/change_version.sh b/change_version.sh
@@ -1 +1 @@
-grep -rEl --exclude=*/target/* --exclude=*/src-gen/* "0.4.2(.qualifier|-SNAPSHOT)" * | xargs sed -i "" "s/0.4.2/0.4.3/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.4.3(.qualifier|-SNAPSHOT)" * | xargs sed -i "" "s/0.4.3/0.5.0/g"
diff --git a/change_version_to_stable.sh b/change_version_to_stable.sh
@@ -0,0 +1,2 @@
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.5.0.qualifier" * | xargs sed -i "" "s/0.5.0.qualifier/0.5.0/g"
+grep -rEl --exclude=*/target/* --exclude=*/src-gen/* --include=*.{yaml,xml,MF} "0.5.0-SNAPSHOT" * | xargs sed -i "" "s/0.5.0-SNAPSHOT/0.5.0/g"
diff --git a/icedust.eclipse.feature/.project b/icedust.eclipse.feature/.project
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>icedust.eclipse.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
+  <name>icedust.eclipse.feature</name>
+  <comment></comment>
+  <projects>
+  </projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.pde.FeatureBuilder</name>
+      <arguments>
+      </arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.m2e.core.maven2Builder</name>
+      <arguments>
+      </arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.m2e.core.maven2Nature</nature>
+    <nature>org.eclipse.pde.FeatureNature</nature>
+  </natures>
 </projectDescription>
diff --git a/icedust.eclipse.feature/feature.xml b/icedust.eclipse.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="icedust.eclipse.feature"
       label="IceDust Language Editor"
-      version="0.4.3.qualifier">
+      version="0.5.0">
 
    <description url="https://github.com/metaborg/icedust">
       The IceDust Language Editor
@@ -35,6 +35,6 @@ Most Spoofax/IMP code is licensed under the GNU Lesser General Public License (L
          id="icedust.eclipse"
          download-size="0"
          install-size="0"
-         version="0.4.3.qualifier"/>
+         version="0.5.0"/>
 
 </feature>
diff --git a/icedust.eclipse.feature/pom.xml b/icedust.eclipse.feature/pom.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>icedust.eclipse.feature</artifactId>
-	<version>0.4.3-SNAPSHOT</version>
-	<packaging>eclipse-feature</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>icedust.eclipse.feature</artifactId>
+  <version>0.5.0</version>
+  <packaging>eclipse-feature</packaging>
 
-	<parent>
-		<groupId>org.metaborg</groupId>
-		<artifactId>parent.eclipse.plugin</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
-		<relativePath />
-	</parent>
+  <parent>
+    <groupId>org.metaborg</groupId>
+    <artifactId>parent.eclipse.plugin</artifactId>
+    <version>2.0.0</version>
+    <relativePath />
+  </parent>
 
   <repositories>
     <repository>
@@ -38,7 +38,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://download.spoofax.org/update/nightly/</url>
+      <url>http://download.spoofax.org/update/release/2.0.0/eclipse/site/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

diff --git a/icedust.eclipse.updatesite/.project b/icedust.eclipse.updatesite/.project
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>icedust.eclipse.updatesite</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
+  <name>icedust.eclipse.updatesite</name>
+  <comment></comment>
+  <projects>
+  </projects>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.pde.UpdateSiteBuilder</name>
+      <arguments>
+      </arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.m2e.core.maven2Builder</name>
+      <arguments>
+      </arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.m2e.core.maven2Nature</nature>
+    <nature>org.eclipse.pde.UpdateSiteNature</nature>
+  </natures>
 </projectDescription>
diff --git a/icedust.eclipse.updatesite/pom.xml b/icedust.eclipse.updatesite/pom.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>icedust.eclipse.updatesite</artifactId>
-	<version>0.4.3-SNAPSHOT</version>
-	<packaging>eclipse-update-site</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>icedust.eclipse.updatesite</artifactId>
+  <version>0.5.0</version>
+  <packaging>eclipse-update-site</packaging>
 
-	<parent>
-		<groupId>org.metaborg</groupId>
-		<artifactId>parent.eclipse.plugin</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
-		<relativePath />
-	</parent>
+  <parent>
+    <groupId>org.metaborg</groupId>
+    <artifactId>parent.eclipse.plugin</artifactId>
+    <version>2.0.0</version>
+    <relativePath />
+  </parent>
 
   <repositories>
     <repository>
@@ -38,7 +38,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://download.spoofax.org/update/nightly/</url>
+      <url>http://download.spoofax.org/update/release/2.0.0/eclipse/site/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

diff --git a/icedust.eclipse.updatesite/site.xml b/icedust.eclipse.updatesite/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/icedust.eclipse.feature_0.4.3.qualifier.jar" id="icedust.eclipse.feature" version="0.4.3.qualifier">
+   <feature url="features/icedust.eclipse.feature_0.5.0.jar" id="icedust.eclipse.feature" version="0.5.0">
       <category name="IceDust_Language_Editor"/>
    </feature>
    <category-def name="IceDust_Language_Editor" label="IceDust Language Editor">

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.4.3.qualifier
+Bundle-Version: 0.5.0
 Bundle-Vendor: metaborg.org
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.metaborg.spoofax.eclipse

diff --git a/icedust.eclipse/pom.xml b/icedust.eclipse/pom.xml
@@ -1,43 +1,43 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>icedust.eclipse</artifactId>
-	<version>0.4.3-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>icedust.eclipse</artifactId>
+  <version>0.5.0</version>
+  <packaging>eclipse-plugin</packaging>
 
-	<parent>
-		<groupId>org.metaborg</groupId>
-		<artifactId>parent.eclipse.language</artifactId>
-		<version>2.0.0-SNAPSHOT</version>
-		<relativePath />
-	</parent>
+  <parent>
+    <groupId>org.metaborg</groupId>
+    <artifactId>parent.eclipse.language</artifactId>
+    <version>2.0.0</version>
+    <relativePath />
+  </parent>
 
-	<properties>
-		<lang.unpack.artifactId>icedust</lang.unpack.artifactId>
-		<lang.baseline.unpack.skip>true</lang.baseline.unpack.skip>
-	</properties>
+  <properties>
+    <lang.unpack.artifactId>icedust</lang.unpack.artifactId>
+    <lang.baseline.unpack.skip>true</lang.baseline.unpack.skip>
+  </properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>icedust</artifactId>
-			<version>${project.version}</version>
-			<type>spoofax-language</type>
-		</dependency>
-	</dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>icedust</artifactId>
+      <version>${project.version}</version>
+      <type>spoofax-language</type>
+    </dependency>
+  </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.metaborg</groupId>
-				<artifactId>spoofax-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.metaborg</groupId>
+        <artifactId>spoofax-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 
   <repositories>
     <repository>
@@ -62,7 +62,7 @@
     </repository>
     <repository>
       <id>spoofax-eclipse-repo</id>
-      <url>http://download.spoofax.org/update/nightly/</url>
+      <url>http://download.spoofax.org/update/release/2.0.0/eclipse/site/</url>
       <layout>p2</layout>
       <releases>
         <enabled>false</enabled>

diff --git a/icedust.examples.webdsl/.gitignore b/icedust.examples.webdsl/.gitignore
@@ -15,3 +15,6 @@ icedustWebDSL clean-project.xml.launch
 .classpath
 application.ini
 .saved-but-not-built
+javascript/*
+javascript
+.webdsl-fragment-cache
diff --git a/icedust.examples.webdsl/.project b/icedust.examples.webdsl/.project
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>icedustWebDSL</name>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments><dictionary>
-				<key>LaunchConfigHandle</key>
-				<value>&lt;project&gt;/icedustWebDSL build.xml.launch</value>
-			</dictionary></arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-		</buildCommand>
-		<buildCommand><name>webdsl.editor.builder</name></buildCommand>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>clean,</triggers>
-			<arguments><dictionary>
-				<key>LaunchConfigHandle</key>
-				<value>&lt;project&gt;/.settings/icedustWebDSL clean-project.xml.launch</value>
-			</dictionary></arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
-		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
-		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
-	</natures>
+  <name>icedustWebDSL</name>
+  <buildSpec>
+    <buildCommand>
+      <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+      <triggers>full,incremental,</triggers>
+      <arguments><dictionary>
+        <key>LaunchConfigHandle</key>
+        <value>&lt;project&gt;/icedustWebDSL build.xml.launch</value>
+      </dictionary></arguments>
+    </buildCommand>
+    <buildCommand>
+      <name>org.eclipse.jdt.core.javabuilder</name>
+    </buildCommand>
+    <buildCommand><name>webdsl.editor.builder</name></buildCommand>
+    <buildCommand>
+      <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+      <triggers>clean,</triggers>
+      <arguments><dictionary>
+        <key>LaunchConfigHandle</key>
+        <value>&lt;project&gt;/.settings/icedustWebDSL clean-project.xml.launch</value>
+      </dictionary></arguments>
+    </buildCommand>
+  </buildSpec>
+  <natures>
+    <nature>org.eclipse.jdt.core.javanature</nature>
+    <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+    <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+    <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+  </natures>
 </projectDescription>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		grep -rEl --exclude=/target/ --exclude=/src-gen/ --include=*.{yaml,xml} "http://download.spoofax.org/update/release/2.0.0/eclipse/site/" search . \| xargs sed -i "" "s/http:\/\/download.spoofax.org\/update\/release\/2.0.0\/eclipse\/site\//http:\/\/download.spoofax.org\/update\/nightly\//g"
		grep -rEl --exclude=/target/ --exclude=/src-gen/ --include=*.{yaml,xml} "2.0.0" search . \| xargs sed -i "" "s/2.0.0/2.1.0-SNAPSHOT/g"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		grep -rEl --exclude=/target/ --exclude=/src-gen/ "0.4.2(.qualifier\|-SNAPSHOT)" * \| xargs sed -i "" "s/0.4.2/0.4.3/g"
		grep -rEl --exclude=/target/ --exclude=/src-gen/ --include=.{yaml,xml,MF} "0.4.3(.qualifier\|-SNAPSHOT)" \| xargs sed -i "" "s/0.4.3/0.5.0/g"