j62
/
ctbrec
2
2
Fork 2
Code Issues 9 Pull Requests Packages Projects Releases 3 Wiki Activity

Create assembly descriptors for all platforms w/ and w/o JRE

This commit is contained in:
0xboobface 2018-11-14 18:57:58 +01:00
parent ff8bbeacc2
commit 0d6d9a8442
17 changed files with 90 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -209,7 +209,6 @@
<descriptors> <descriptors>
<descriptor>src/assembly/win64.xml</descriptor> <descriptor>src/assembly/win64.xml</descriptor>
<descriptor>src/assembly/win64-jre.xml</descriptor> <descriptor>src/assembly/win64-jre.xml</descriptor>
<descriptor>src/assembly/win32-jre.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>
@ -241,6 +240,7 @@
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>src/assembly/linux.xml</descriptor> <descriptor>src/assembly/linux.xml</descriptor>
<descriptor>src/assembly/linux-jre.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</execution> </execution>
@ -271,6 +271,7 @@
</goals> </goals>
<configuration> <configuration>
<descriptors> <descriptors>
<descriptor>src/assembly/macos.xml</descriptor>
<descriptor>src/assembly/macos-jre.xml</descriptor> <descriptor>src/assembly/macos-jre.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>

7
src/assembly/ctbrec-linux-jre.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
pushd $(dirname $0)
JAVA=./jre/bin/java
$JAVA -version
$JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher
popd

4
ctbrec.sh → src/assembly/ctbrec-linux.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
#JAVA=/opt/jdk-10.0.1/bin/java pushd $(dirname $0)
JAVA=java JAVA=java
$JAVA -version $JAVA -version
$JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher $JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher
popd

0
ctbrec-macos.sh → src/assembly/ctbrec-macos-jre.sh
View File

8
src/assembly/ctbrec-macos.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
DIR=$(dirname $0)
pushd $DIR
JAVA=java
$JAVA -version
$JAVA -cp ${name.final}.jar ctbrec.ui.Launcher
popd

17
src/assembly/win32-jre.xml → src/assembly/linux-jre.xml
View File

@ -1,26 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<assembly> <assembly>
<id>win32-jre</id> <id>linux-jre</id>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<files> <files>
<file> <file>
<source>${project.build.directory}/ctbrec.exe</source> <source>${project.basedir}/src/assembly/ctbrec-linux-jre.sh</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/server.bat</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<destName>ctbrec.sh</destName>
</file> </file>
<file> <file>
<source>${project.basedir}/src/main/resources/pp.bat</source> <source>${project.basedir}/src/assembly/server-linux-jre.sh</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>server.sh</destName>
</file> </file>
<file> <file>
<source>${project.basedir}/src/main/resources/pp.ps1</source> <source>${project.basedir}/src/main/resources/pp.sh</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file> <file>
@ -30,7 +29,7 @@
</files> </files>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>jre/jre1.8.0_192_win32</directory> <directory>jre/jdk-11.0.1_linux</directory>
<includes> <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes>

6
src/assembly/linux.xml
View File

@ -7,14 +7,16 @@
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<files> <files>
<file> <file>
<source>${project.basedir}/ctbrec.sh</source> <source>${project.basedir}/src/assembly/ctbrec-linux.sh</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<destName>ctbrec.sh</destName>
</file> </file>
<file> <file>
<source>${project.basedir}/server.sh</source> <source>${project.basedir}/src/assembly/server-linux.sh</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<destName>server.sh</destName>
</file> </file>
<file> <file>
<source>${project.basedir}/src/main/resources/pp.sh</source> <source>${project.basedir}/src/main/resources/pp.sh</source>

8
src/assembly/macos-jre.xml
View File

@ -7,14 +7,16 @@
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<files> <files>
<file> <file>
<source>${project.basedir}/ctbrec-macos.sh</source> <source>${project.basedir}/src/assembly/ctbrec-macos-jre.sh</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<destName>ctbrec.sh</destName>
</file> </file>
<file> <file>
<source>${project.basedir}/server-macos.sh</source> <source>${project.basedir}/src/assembly/server-macos-jre.sh</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<destName>server.sh</destName>
</file> </file>
<file> <file>
<source>${project.basedir}/src/main/resources/pp.sh</source> <source>${project.basedir}/src/main/resources/pp.sh</source>
@ -27,7 +29,7 @@
</files> </files>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>jre/jre1.8.0_192_macos</directory> <directory>jre/jdk-11.0.1_macos</directory>
<includes> <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes>

30
src/assembly/macos.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>macos</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<source>${project.basedir}/src/assembly/ctbrec-macos.sh</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>ctbrec.sh</destName>
</file>
<file>
<source>${project.basedir}/src/assembly/server-macos.sh</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>server.sh</destName>
</file>
<file>
<source>${project.basedir}/src/main/resources/pp.sh</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.build.directory}/${name.final}.jar</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
</files>
</assembly>

1
src/assembly/server-jre.bat Executable file
View File

@ -0,0 +1 @@
jre\bin\java -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer

6
src/assembly/server-linux-jre.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
pushd $(dirname $0)
JAVA=./jre/bin/java
$JAVA -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
popd

3
server.sh → src/assembly/server-linux.sh
View File

@ -1,4 +1,7 @@
#!/bin/sh #!/bin/sh
pushd $(dirname $0)
JAVA=java JAVA=java
$JAVA -version
$JAVA -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer $JAVA -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
popd

0
server-macos.sh → src/assembly/server-macos-jre.sh
View File

8
src/assembly/server-macos.sh Executable file
View File

@ -0,0 +1,8 @@
#!/bin/bash
DIR=$(dirname $0)
pushd $DIR
JAVA=java
$JAVA -version
$JAVA -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
popd

0
server.bat → src/assembly/server.bat
View File

5
src/assembly/win64-jre.xml
View File

@ -11,9 +11,10 @@
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file> <file>
<source>${project.basedir}/server.bat</source> <source>${project.basedir}/src/assembly/server-jre.bat</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
<destName>server.bat</destName>
</file> </file>
<file> <file>
<source>${project.basedir}/src/main/resources/pp.bat</source> <source>${project.basedir}/src/main/resources/pp.bat</source>
@ -30,7 +31,7 @@
</files> </files>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>jre/jre1.8.0_192_win64</directory> <directory>jre/jdk-11.0.1_win64</directory>
<includes> <includes>
<include>**/*</include> <include>**/*</include>
</includes> </includes>

2
src/assembly/win64.xml
View File

@ -11,7 +11,7 @@
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file> <file>
<source>${project.basedir}/server.bat</source> <source>${project.basedir}/src/assembly/server.bat</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>