davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Add FFmpeg to assembly 

- Add FFmpeg to the assembly
- Remove assembly descriptors without JRE
This commit is contained in:
0xboobface 2019-12-07 13:41:25 +01:00
parent 1c64b82deb
commit eba7b085b8
7 changed files with 15 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/pom.xml
View File

@ -171,7 +171,6 @@
<configuration> <configuration>
<finalName>ctbrec-${project.version}</finalName> <finalName>ctbrec-${project.version}</finalName>
<descriptors> <descriptors>
<descriptor>src/assembly/win64.xml</descriptor>
<descriptor>src/assembly/win64-jre.xml</descriptor> <descriptor>src/assembly/win64-jre.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
@ -204,7 +203,6 @@
<configuration> <configuration>
<finalName>ctbrec-${project.version}</finalName> <finalName>ctbrec-${project.version}</finalName>
<descriptors> <descriptors>
<descriptor>src/assembly/linux.xml</descriptor>
<descriptor>src/assembly/linux-jre.xml</descriptor> <descriptor>src/assembly/linux-jre.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
@ -237,7 +235,6 @@
<configuration> <configuration>
<finalName>ctbrec-${project.version}</finalName> <finalName>ctbrec-${project.version}</finalName>
<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>

5
client/src/assembly/linux-jre.xml
View File

@ -28,6 +28,11 @@
<source>${project.basedir}/README.md</source> <source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file>
<source>${project.basedir}/ffmpeg/ffmpeg-linux64</source>
<outputDirectory>ctbrec/ffmpeg</outputDirectory>
<destName>ffmpeg</destName>
</file>
</files> </files>
<fileSets> <fileSets>
<fileSet> <fileSet>

42
client/src/assembly/linux.xml
View File

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>linux</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<source>${project.basedir}/src/assembly/ctbrec-linux.sh</source>
<outputDirectory>ctbrec</outputDirectory>
<filtered>true</filtered>
<destName>ctbrec.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>
<file>
<source>${project.basedir}/LICENSE.txt</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
</files>
<fileSets>
<fileSet>
<directory>browser/ctbrec-minimal-browser-linux-x64</directory>
<includes>
<include>**/*</include>
</includes>
<outputDirectory>ctbrec/browser</outputDirectory>
<filtered>false</filtered>
</fileSet>
</fileSets>
</assembly>

5
client/src/assembly/macos-jre.xml
View File

@ -28,6 +28,11 @@
<source>${project.basedir}/README.md</source> <source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file>
<source>${project.basedir}/ffmpeg/ffmpeg-macos64</source>
<outputDirectory>ctbrec/ffmpeg</outputDirectory>
<destName>ffmpeg</destName>
</file>
</files> </files>
<fileSets> <fileSets>
<fileSet> <fileSet>

42
client/src/assembly/macos.xml
View File

@ -1,42 +0,0 @@
<?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/main/resources/pp.sh</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.build.directory}/${name.final}.jar</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/LICENSE.txt</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
</files>
<fileSets>
<fileSet>
<directory>browser/ctbrec-minimal-browser-darwin-x64</directory>
<includes>
<include>**/*</include>
</includes>
<outputDirectory>ctbrec/browser</outputDirectory>
<filtered>false</filtered>
</fileSet>
</fileSets>
</assembly>

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

@ -30,6 +30,11 @@
<source>${project.basedir}/README.md</source> <source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory> <outputDirectory>ctbrec</outputDirectory>
</file> </file>
<file>
<source>${project.basedir}/ffmpeg/ffmpeg-win64.exe</source>
<outputDirectory>ctbrec/ffmpeg</outputDirectory>
<destName>ffmpeg.exe</destName>
</file>
</files> </files>
<fileSets> <fileSets>
<fileSet> <fileSet>

44
client/src/assembly/win64.xml
View File

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>win64</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<source>${project.build.directory}/ctbrec.exe</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/src/main/resources/pp.bat</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/src/main/resources/pp.ps1</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.build.directory}/${name.final}.jar</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/LICENSE.txt</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
<file>
<source>${project.basedir}/README.md</source>
<outputDirectory>ctbrec</outputDirectory>
</file>
</files>
<fileSets>
<fileSet>
<directory>browser/ctbrec-minimal-browser-win32-x64</directory>
<includes>
<include>**/*</include>
</includes>
<outputDirectory>ctbrec/browser</outputDirectory>
<filtered>false</filtered>
</fileSet>
</fileSets>
</assembly>