s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2096 from OpenRefine/issue-2069-launch4j

Browse Source 
Use environment variables to detect Java location on Windows.
This commit is contained in:
Antonin Delpeuch 2019-07-24 17:36:59 +01:00 committed by GitHub
commit b3df40ffa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 134 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
packaging/lib-local/launch4j-3.13-SNAPSHOT-core.jar Normal file
View File

Binary file not shown.

BIN
packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux.jar Normal file
View File

Binary file not shown.

BIN
packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux64.jar Normal file
View File

Binary file not shown.

BIN
packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-mac.jar Normal file
View File

Binary file not shown.

BIN
packaging/lib-local/launch4j-3.13-SNAPSHOT-workdir-win32.jar Normal file
View File

Binary file not shown.

BIN
packaging/openrefine.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 64 KiB

136
packaging/pom.xml
View File

@ -23,6 +23,105 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
<executions>
<!-- This is a clean snapshot of launch4j's master branch,
which includes fixes to Java discovery that we need
to support recent versions of Java. When launch4j-3.13
is officially released, remove this and the locally stored
jars -->
<execution>
<id>install-launch4j-core</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-core.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>net.sf.launch4j</groupId>
<artifactId>launch4j</artifactId>
<classifier>core</classifier>
<version>3.13-SNAPSHOT</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-launch4j-linux64</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux64.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>net.sf.launch4j</groupId>
<artifactId>launch4j</artifactId>
<classifier>workdir-linux64</classifier>
<version>3.13-SNAPSHOT</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-launch4j-linux</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-workdir-linux.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>net.sf.launch4j</groupId>
<artifactId>launch4j</artifactId>
<classifier>workdir-linux</classifier>
<version>3.13-SNAPSHOT</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-launch4j-win32</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-workdir-win32.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>net.sf.launch4j</groupId>
<artifactId>launch4j</artifactId>
<classifier>workdir-win32</classifier>
<version>3.13-SNAPSHOT</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
<execution>
<id>install-launch4j-mac</id>
<phase>process-resources</phase>
<configuration>
<file>${basedir}/lib-local/launch4j-3.13-SNAPSHOT-workdir-mac.jar</file>
<repositoryLayout>default</repositoryLayout>
<groupId>net.sf.launch4j</groupId>
<artifactId>launch4j</artifactId>
<classifier>workdir-mac</classifier>
<version>3.13-SNAPSHOT</version>
<packaging>jar</packaging>
<generatePom>true</generatePom>
</configuration>
<goals>
<goal>install-file</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin> <!-- necessary for launch4j -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
@ -94,7 +193,26 @@
<plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId>
<version>1.7.23</version>
<version>1.7.25</version>
<!-- This is a clean snapshot of launch4j's master branch,
which includes fixes to Java discovery that we need
to support recent versions of Java.
When the maven plugin is updated to use launch4j-3.13,
this can be removed. -->
<dependencies>
<dependency>
<groupId>net.sf.launch4j</groupId>
<artifactId>launch4j</artifactId>
<classifier>core</classifier>
<version>3.13-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.9</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>l4j-clui</id>
@ -106,14 +224,16 @@
<jar>server/target/lib/openrefine-${project.version}-server.jar</jar>
<dontWrapJar>true</dontWrapJar>
<saveConfig>true</saveConfig>
<icon>openrefine.ico</icon>
<classPath>
<mainClass>com.google.refine.Refine</mainClass>
<jarLocation>server/target/lib/</jarLocation>
<postCp>server/target/lib/*.jar</postCp>
</classPath>
<jre>
<path>%JAVA_HOME%;%PATH%</path>
<minVersion>1.8.0</minVersion>
<jdkPreference>preferJre</jdkPreference>
<bundledJreAsFallback>true</bundledJreAsFallback>
<initialHeapSize>512</initialHeapSize>
<maxHeapSize>2048</maxHeapSize>
<opts>
@ -139,6 +259,18 @@
<groupId>sh.tak.appbundler</groupId>
<artifactId>appbundle-maven-plugin</artifactId>
<version>1.2.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-tools</artifactId>
<version>2.0</version>
</dependency>
</dependencies>
<configuration>
<mainClass>com.google.refine.Refine</mainClass>
<bundleName>OpenRefine</bundleName>