1
0
mirror of https://github.com/ACINQ/eclair.git synced 2024-11-19 09:54:02 +01:00

Renamed javafx module to eclair-node-gui and updated binaries name (#137)

* Renamed eclair-node-javafx module to eclair-node-gui

* (build) javafx installer uses project version

* (build) Streamlined capsule names

* (build) mvn generates installer only with `installer` profile. The windows installer does not need to be created in common cases. Decreases `eclair-node-gui` module building time by ~ 1 min

* (readme) updated the `run eclair` commands with the new capsule names
This commit is contained in:
dpad85 2017-08-23 19:28:18 +02:00 committed by GitHub
parent 012d804474
commit 305420bd37
53 changed files with 63 additions and 44 deletions

View File

@ -10,7 +10,12 @@ To build the project, simply run:
```shell
$ mvn package
```
or
To skip the tests, run:
```shell
$ mvn package -DskipTests
```
To generate the windows installer along with the build, run the following command:
```shell
$ mvn package -DskipTests -Pinstaller
```
The generated installer will be located in `eclair-node-gui/target/jfx/installer`

View File

@ -61,11 +61,11 @@ You need to first install java, more precisely a [JRE 1.8](http://www.oracle.com
Then download the latest fat jar and depending on whether or not you want a GUI run the following command:
* with GUI:
```shell
java -jar eclair-node-javafx_xxxxxx-fat.jar
java -jar eclair-node-gui-<version>-<commit_id>.jar
```
* without GUI:
```shell
java -jar eclair-node_xxxxxx-fat.jar
java -jar eclair-node-<version>-<commit_id>.jar
```
### Configuring Eclair

View File

@ -8,10 +8,10 @@
<version>0.2-SNAPSHOT</version>
</parent>
<artifactId>eclair-node-javafx_2.11</artifactId>
<artifactId>eclair-node-gui_2.11</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<name>eclair-node-gui</name>
<build>
<plugins>
@ -44,7 +44,7 @@
</configuration>
</plugin>
<plugin>
<groupId>sg.enixsoft</groupId>
<groupId>com.github.chrisdchristo</groupId>
<artifactId>capsule-maven-plugin</artifactId>
<executions>
<execution>
@ -54,45 +54,58 @@
<configuration>
<appClass>fr.acinq.eclair.JavafxBoot</appClass>
<type>fat</type>
<customDescriptor>-${git.commit.id.abbrev}-capsule-fat</customDescriptor>
<fileName>${project.name}-${project.version}</fileName>
<fileDesc>-${git.commit.id.abbrev}</fileDesc>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.zenjava</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>8.8.3</version>
<executions>
<execution>
<!-- required before build-native -->
<id>create-jfxjar</id>
<phase>package</phase>
<goals>
<goal>build-jar</goal>
</goals>
</execution>
<execution>
<phase>package</phase>
<goals>
<goal>build-native</goal>
</goals>
</execution>
</executions>
<configuration>
<vendor>ACINQ</vendor>
<needShortcut>true</needShortcut>
<appName>Eclair (Alpha 3)</appName>
<nativeReleaseVersion>0.2.0</nativeReleaseVersion>
<mainClass>fr.acinq.eclair.JavafxBoot</mainClass>
<verbose>false</verbose>
<bundler>EXE</bundler>
<updateExistingJar>true</updateExistingJar>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>installer</id>
<build>
<plugins>
<plugin>
<groupId>com.zenjava</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>8.8.3</version>
<executions>
<execution>
<!-- required before build-native -->
<id>create-jfxjar</id>
<phase>package</phase>
<goals>
<goal>build-jar</goal>
</goals>
</execution>
<execution>
<phase>package</phase>
<goals>
<goal>build-native</goal>
</goals>
</execution>
</executions>
<configuration>
<vendor>ACINQ</vendor>
<needShortcut>true</needShortcut>
<appName>Eclair</appName>
<nativeReleaseVersion>${project.version}</nativeReleaseVersion>
<skipNativeVersionNumberSanitizing>true</skipNativeVersionNumberSanitizing>
<nativeOutputDir>${project.build.directory}/jfx/installer</nativeOutputDir>
<mainClass>fr.acinq.eclair.JavafxBoot</mainClass>
<verbose>false</verbose>
<bundler>EXE</bundler>
<updateExistingJar>true</updateExistingJar>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>fr.acinq.eclair</groupId>

View File

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

View File

@ -11,7 +11,7 @@
<artifactId>eclair-node_2.11</artifactId>
<packaging>jar</packaging>
<name>${project.artifactId}</name>
<name>eclair-node</name>
<build>
<plugins>
@ -44,7 +44,7 @@
</configuration>
</plugin>
<plugin>
<groupId>sg.enixsoft</groupId>
<groupId>com.github.chrisdchristo</groupId>
<artifactId>capsule-maven-plugin</artifactId>
<executions>
<execution>
@ -54,7 +54,8 @@
<configuration>
<appClass>fr.acinq.eclair.Boot</appClass>
<type>fat</type>
<customDescriptor>-${git.commit.id.abbrev}-capsule-fat</customDescriptor>
<fileName>${project.name}-${project.version}</fileName>
<fileDesc>-${git.commit.id.abbrev}</fileDesc>
</configuration>
</execution>
</executions>

View File

@ -10,7 +10,7 @@
<modules>
<module>eclair-core</module>
<module>eclair-node</module>
<module>eclair-node-javafx</module>
<module>eclair-node-gui</module>
</modules>
<description>A scala implementation of the Lightning Network</description>
@ -64,9 +64,9 @@
<version>2.2.2</version>
</plugin>
<plugin>
<groupId>sg.enixsoft</groupId>
<groupId>com.github.chrisdchristo</groupId>
<artifactId>capsule-maven-plugin</artifactId>
<version>1.3.0</version>
<version>1.5.1</version>
</plugin>
</plugins>
</pluginManagement>