Merge pull request #2 from Minres/develop

Merge for patch release

Author: eyck

com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: RDL Editor
 Bundle-SymbolicName: com.minres.rdl.product;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-Vendor: MINRES
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0"

com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="RDL" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
-
+<product name="RDL" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.1.1.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -14,14 +13,13 @@
 
    <windowImages/>
 
-   <launcher>
+   <launcher name="rdl-editor">
       <solaris/>
       <win useIco="false">
          <bmp/>
       </win>
    </launcher>
 
-
    <vm>
    </vm>
 

com.minres.rdl.parent/com.minres.rdl.product/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.rdl.product</artifactId>
 	<packaging>eclipse-application</packaging>
@@ -18,4 +18,5 @@
 		</plugins>
 	</build>
 
+	<version>1.1.1-SNAPSHOT</version>
 </project>

com.minres.rdl.parent/com.minres.rdl.standalone/pom.xml

@@ -168,6 +168,7 @@
 	<parent>
 		<artifactId>com.minres.rdl.parent</artifactId>
 		<groupId>com.minres.rdl</groupId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
+	<version>1.1.1-SNAPSHOT</version>
 </project>

com.minres.rdl.parent/com.minres.rdl.target/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.rdl.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>

com.minres.rdl.parent/com.minres.rdl.ui/.gitignore

@@ -0,0 +1 @@
+/plugin.xml_gen

com.minres.rdl.parent/com.minres.rdl.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: com.minres.rdl.ui
 Bundle-Vendor: My Company
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.1.qualifier
 Bundle-SymbolicName: com.minres.rdl.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.minres.rdl,

com.minres.rdl.parent/com.minres.rdl.ui/build.properties

@@ -3,5 +3,6 @@ source.. = src/,\
            xtend-gen/
 bin.includes = .,\
                META-INF/,\
-               plugin.xml
+               plugin.xml,\
+               icons/
 bin.excludes = **/*.xtend

com.minres.rdl.parent/com.minres.rdl.ui/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.minres.rdl</groupId>
 		<artifactId>com.minres.rdl.parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.minres.rdl.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
@@ -18,4 +18,5 @@
 		</plugins>
 	</build>
 
+	<version>1.1.1-SNAPSHOT</version>
 </project>

com.minres.rdl.parent/com.minres.rdl/.gitignore

@@ -0,0 +1,4 @@
+/Run RDL Generator DBT-RISCV (test).launch
+/Run RDL Generator DBT-RISCV.launch
+/Run RDL Generator SC-Components-Test.launch
+/plugin.xml_gen