From 174666b4c50cbec5165ee6b8270676f174b83238 Mon Sep 17 00:00:00 2001
From: michael <michael@michael>
Date: Mon, 2 Dec 2019 15:41:45 +0100
Subject: [PATCH] =?UTF-8?q?Build-Korrektur:=20Jetzt=20plattformunabh=C3=A4?=
 =?UTF-8?q?ngiger=20Build.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../META-INF/MANIFEST.MF                      |  6 +-
 JavaCompilerPlugin/pom.xml                    | 34 +++++++++
 .../JavaCompilerPlugin.Configuration/pom.xml  | 71 +++++++++++++++++--
 .../JavaCompilerPlugin.Target.target          | 44 ++++++++++--
 JavaCompilerPlugin/releng/pom.xml             |  1 +
 5 files changed, 145 insertions(+), 11 deletions(-)

diff --git a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
index 1a4cddd..15a35b4 100644
--- a/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
+++ b/JavaCompilerPlugin/bundles/JavaCompilerPlugin.Plugin/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: TypinferenzPlugin;singleton:=true
 Bundle-Version: 0.1.0.qualifier
 Bundle-Vendor: de.dhbwstuttgart
 Bundle-Activator: typinferenzplugin.Activator
-Require-Bundle: org.eclipse.ui,
+Require-Bundle: org.eclipse.swt,
  javax.inject,
  org.eclipse.core.runtime,
  org.eclipse.jface.text,
@@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.editors,
  org.eclipse.ui.workbench,
  org.eclipse.core.resources,
- org.eclipse.swt,
  org.eclipse.osgi,
  org.eclipse.jface,
  org.eclipse.e4.ui.services,
@@ -28,7 +27,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.equinox.p2.repository;bundle-version="2.3.200",
  org.eclipse.equinox.p2.metadata;bundle-version="2.3.100",
  org.eclipse.ui.ide,
- org.eclipse.ui.views
+ org.eclipse.ui.views,
+ org.eclipse.ui;bundle-version="3.114.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .,
diff --git a/JavaCompilerPlugin/pom.xml b/JavaCompilerPlugin/pom.xml
index b93044b..54dd661 100644
--- a/JavaCompilerPlugin/pom.xml
+++ b/JavaCompilerPlugin/pom.xml
@@ -15,4 +15,38 @@
         <module>features</module>
         <module>releng</module>
     </modules>
+    
+    <build>
+    	<plugins>
+       		<plugin>
+    			<groupId>org.eclipse.tycho</groupId>
+    			<artifactId>target-platform-configuration</artifactId>
+    			<version>${tycho.version}</version>
+    			<configuration>
+     			<environments>
+      					<environment>
+       						<os>linux</os>
+       						<ws>gtk</ws>
+       						<arch>x86_64</arch>
+      					</environment>
+      					<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>							
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>	
+     				</environments>
+    			</configuration>
+   			</plugin>
+   		</plugins>
+   	</build>
 </project>
\ No newline at end of file
diff --git a/JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml b/JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml
index 55c6c58..f690d8b 100644
--- a/JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml
+++ b/JavaCompilerPlugin/releng/JavaCompilerPlugin.Configuration/pom.xml
@@ -7,7 +7,7 @@
 
 	<properties>
 		<tycho.version>1.5.1</tycho.version>
-		<eclipse-repo.url>http://download.eclipse.org/eclipse/updates/4.14milestones</eclipse-repo.url>
+		<eclipse-repo.url>http://download.eclipse.org/eclipse/updates/4.11</eclipse-repo.url>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<downloadSources>true</downloadSources>
 		<downloadJavadocs>true</downloadJavadocs>
@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>de.dhbwstuttgart</groupId>
 			<artifactId>JavaTXcompiler</artifactId>
-			<version>0.2</version>
+			<version>0.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.antlr</groupId>
@@ -66,11 +66,12 @@
 				<artifactId>tycho-compiler-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<configuration>
+					<useProjectSettings>false</useProjectSettings>
 					<extraClasspathElements>
 						<dependency>
 							<groupId>de.dhbwstuttgart</groupId>
 							<artifactId>JavaTXcompiler</artifactId>
-							<version>0.2.0</version>
+							<version>0.1.0</version>
 						</dependency>
 						<dependency>
 							<groupId>org.antlr</groupId>
@@ -111,6 +112,33 @@
 				<artifactId>tycho-maven-plugin</artifactId>
 				<version>${tycho.version}</version>
 				<extensions>true</extensions>
+				<configuration>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>							
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>	
+				</configuration>					
 			</plugin>
 
 			<plugin>
@@ -122,6 +150,41 @@
 				</configuration>
 			</plugin>
 
+
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<target>
+						<artifact>
+							<groupId>de.dhbwstuttgart</groupId>
+							<artifactId>JavaCompilerPlugin.Target</artifactId>
+							<version>0.1.0-SNAPSHOT</version>
+						</artifact>
+					</target>
+					<environments>
+						<environments>
+							<environment>
+								<os>linux</os>
+								<ws>gtk</ws>
+								<arch>x86_64</arch>
+							</environment>
+							<environment>
+								<os>win32</os>
+								<ws>win32</ws>
+								<arch>x86_64</arch>
+							</environment>
+							<environment>
+								<os>macosx</os>
+								<ws>cocoa</ws>
+								<arch>x86_64</arch>
+							</environment>
+						</environments>
+					</environments>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-packaging-plugin</artifactId>
@@ -138,4 +201,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/JavaCompilerPlugin/releng/JavaCompilerPlugin.Target/JavaCompilerPlugin.Target.target b/JavaCompilerPlugin/releng/JavaCompilerPlugin.Target/JavaCompilerPlugin.Target.target
index 15fa70e..9c300fb 100644
--- a/JavaCompilerPlugin/releng/JavaCompilerPlugin.Target/JavaCompilerPlugin.Target.target
+++ b/JavaCompilerPlugin/releng/JavaCompilerPlugin.Target/JavaCompilerPlugin.Target.target
@@ -1,7 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="JavaCompilerPlugin.Target" sequenceNumber="2">
+<?pde version="3.8"?>
+<target name="JavaCompilerPlugin.Target" sequenceNumber="2">
     <locations>
-        <location path="/Users/michaeluhl/git/JavaCompilerPlugin/JavaCompilerPlugin/releng/JavaCompilerPlugin.Update/target/repository" type="Directory"/>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <unit id="ch.qos.logback.slf4j" version="1.0.7.v201505121915"/>
+            <unit id="ch.qos.logback.slf4j.source" version="1.0.7.v201505121915"/>
+            <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
+            <unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
+            <unit id="org.mockito" version="1.9.5.v201605172210"/>
+            <unit id="org.mockito.source" version="1.9.5.v201605172210"/>
+            <unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
+            <unit id="org.slf4j.api.source" version="1.7.2.v20121108-1250"/>
+            <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
+        </location>
+	    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		    <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+		    <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
+		    <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
+		    <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
+		    <unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="2.8.0.201906121535"/>
+		    <unit id="org.eclipse.swtbot.feature.group" version="2.8.0.201906121535"/>
+		    <unit id="org.eclipse.swtbot.forms.feature.group" version="2.8.0.201906121535"/>
+		    <unit id="org.eclipse.swtbot.ide.feature.group" version="2.8.0.201906121535"/>
+		    <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
+		    <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
+		    <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+		    <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
+	    </location>
+	    <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+		    <repository location="http://download.eclipse.org/releases/latest"/>
+		    <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+		    <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+		    <unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
+	    </location>
     </locations>
-    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 9.0.4 [9.0.4]"/>
-</target>
+    <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-11-openjdk-amd64"/>
+	<environment>
+		<os>linux</os>
+		<ws>gtk</ws>
+		<arch>x86_64</arch>
+	</environment>
+</target> 	
\ No newline at end of file
diff --git a/JavaCompilerPlugin/releng/pom.xml b/JavaCompilerPlugin/releng/pom.xml
index bfee510..eb64deb 100644
--- a/JavaCompilerPlugin/releng/pom.xml
+++ b/JavaCompilerPlugin/releng/pom.xml
@@ -12,6 +12,7 @@
     </parent>
 
     <modules>
+        <module>JavaCompilerPlugin.Target</module>
         <module>JavaCompilerPlugin.Update</module>
     </modules>
     <build>