Build-Korrektur: Jetzt plattformunabhängiger Build.

This commit is contained in:
michael 2019-12-02 15:41:45 +01:00
parent a5e7703fe1
commit 174666b4c5
5 changed files with 145 additions and 11 deletions

View File

@ -5,7 +5,7 @@ Bundle-SymbolicName: TypinferenzPlugin;singleton:=true
Bundle-Version: 0.1.0.qualifier Bundle-Version: 0.1.0.qualifier
Bundle-Vendor: de.dhbwstuttgart Bundle-Vendor: de.dhbwstuttgart
Bundle-Activator: typinferenzplugin.Activator Bundle-Activator: typinferenzplugin.Activator
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.swt,
javax.inject, javax.inject,
org.eclipse.core.runtime, org.eclipse.core.runtime,
org.eclipse.jface.text, org.eclipse.jface.text,
@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.editors, org.eclipse.ui.editors,
org.eclipse.ui.workbench, org.eclipse.ui.workbench,
org.eclipse.core.resources, org.eclipse.core.resources,
org.eclipse.swt,
org.eclipse.osgi, org.eclipse.osgi,
org.eclipse.jface, org.eclipse.jface,
org.eclipse.e4.ui.services, 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.repository;bundle-version="2.3.200",
org.eclipse.equinox.p2.metadata;bundle-version="2.3.100", org.eclipse.equinox.p2.metadata;bundle-version="2.3.100",
org.eclipse.ui.ide, 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-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-ClassPath: ., Bundle-ClassPath: .,

View File

@ -15,4 +15,38 @@
<module>features</module> <module>features</module>
<module>releng</module> <module>releng</module>
</modules> </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> </project>

View File

@ -7,7 +7,7 @@
<properties> <properties>
<tycho.version>1.5.1</tycho.version> <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> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<downloadSources>true</downloadSources> <downloadSources>true</downloadSources>
<downloadJavadocs>true</downloadJavadocs> <downloadJavadocs>true</downloadJavadocs>
@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>de.dhbwstuttgart</groupId> <groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaTXcompiler</artifactId> <artifactId>JavaTXcompiler</artifactId>
<version>0.2</version> <version>0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
@ -66,11 +66,12 @@
<artifactId>tycho-compiler-plugin</artifactId> <artifactId>tycho-compiler-plugin</artifactId>
<version>${tycho.version}</version> <version>${tycho.version}</version>
<configuration> <configuration>
<useProjectSettings>false</useProjectSettings>
<extraClasspathElements> <extraClasspathElements>
<dependency> <dependency>
<groupId>de.dhbwstuttgart</groupId> <groupId>de.dhbwstuttgart</groupId>
<artifactId>JavaTXcompiler</artifactId> <artifactId>JavaTXcompiler</artifactId>
<version>0.2.0</version> <version>0.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
@ -111,6 +112,33 @@
<artifactId>tycho-maven-plugin</artifactId> <artifactId>tycho-maven-plugin</artifactId>
<version>${tycho.version}</version> <version>${tycho.version}</version>
<extensions>true</extensions> <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>
<plugin> <plugin>
@ -122,6 +150,41 @@
</configuration> </configuration>
</plugin> </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> <plugin>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId> <artifactId>tycho-packaging-plugin</artifactId>
@ -138,4 +201,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View File

@ -1,7 +1,43 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?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> <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> </locations>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 9.0.4 [9.0.4]"/> <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-11-openjdk-amd64"/>
</target> <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86_64</arch>
</environment>
</target>

View File

@ -12,6 +12,7 @@
</parent> </parent>
<modules> <modules>
<module>JavaCompilerPlugin.Target</module>
<module>JavaCompilerPlugin.Update</module> <module>JavaCompilerPlugin.Update</module>
</modules> </modules>
<build> <build>