From eba7b085b89eb46b4f84ea833880adc6c15ee6f7 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Sat, 7 Dec 2019 13:41:25 +0100
Subject: [PATCH] Add FFmpeg to assembly

- Add FFmpeg to the assembly
- Remove assembly descriptors without JRE
---
 client/pom.xml                    |  3 ---
 client/src/assembly/linux-jre.xml |  5 ++++
 client/src/assembly/linux.xml     | 42 -----------------------------
 client/src/assembly/macos-jre.xml |  5 ++++
 client/src/assembly/macos.xml     | 42 -----------------------------
 client/src/assembly/win64-jre.xml |  5 ++++
 client/src/assembly/win64.xml     | 44 -------------------------------
 7 files changed, 15 insertions(+), 131 deletions(-)
 delete mode 100644 client/src/assembly/linux.xml
 delete mode 100644 client/src/assembly/macos.xml
 delete mode 100644 client/src/assembly/win64.xml

diff --git a/client/pom.xml b/client/pom.xml
index 1cf7c9a1..9fdaa29a 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -171,7 +171,6 @@
 								<configuration>
 									<finalName>ctbrec-${project.version}</finalName>
 									<descriptors>
-										<descriptor>src/assembly/win64.xml</descriptor>
 										<descriptor>src/assembly/win64-jre.xml</descriptor>
 									</descriptors>
 								</configuration>
@@ -204,7 +203,6 @@
 								<configuration>
 									<finalName>ctbrec-${project.version}</finalName>
 									<descriptors>
-										<descriptor>src/assembly/linux.xml</descriptor>
 										<descriptor>src/assembly/linux-jre.xml</descriptor>
 									</descriptors>
 								</configuration>
@@ -237,7 +235,6 @@
 								<configuration>
 									<finalName>ctbrec-${project.version}</finalName>
 									<descriptors>
-										<descriptor>src/assembly/macos.xml</descriptor>
 										<descriptor>src/assembly/macos-jre.xml</descriptor>
 									</descriptors>
 								</configuration>
diff --git a/client/src/assembly/linux-jre.xml b/client/src/assembly/linux-jre.xml
index 707e2bf9..ffc7487f 100644
--- a/client/src/assembly/linux-jre.xml
+++ b/client/src/assembly/linux-jre.xml
@@ -28,6 +28,11 @@
 			<source>${project.basedir}/README.md</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/ffmpeg/ffmpeg-linux64</source>
+			<outputDirectory>ctbrec/ffmpeg</outputDirectory>
+			<destName>ffmpeg</destName>
+		</file>
 	</files>
 	<fileSets>
 		<fileSet>
diff --git a/client/src/assembly/linux.xml b/client/src/assembly/linux.xml
deleted file mode 100644
index a692495d..00000000
--- a/client/src/assembly/linux.xml
+++ /dev/null
@@ -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>
diff --git a/client/src/assembly/macos-jre.xml b/client/src/assembly/macos-jre.xml
index 7565dba5..25afe97a 100644
--- a/client/src/assembly/macos-jre.xml
+++ b/client/src/assembly/macos-jre.xml
@@ -28,6 +28,11 @@
 			<source>${project.basedir}/README.md</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/ffmpeg/ffmpeg-macos64</source>
+			<outputDirectory>ctbrec/ffmpeg</outputDirectory>
+			<destName>ffmpeg</destName>
+		</file>
 	</files>
 	<fileSets>
 		<fileSet>
diff --git a/client/src/assembly/macos.xml b/client/src/assembly/macos.xml
deleted file mode 100644
index f9c9fcca..00000000
--- a/client/src/assembly/macos.xml
+++ /dev/null
@@ -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>
diff --git a/client/src/assembly/win64-jre.xml b/client/src/assembly/win64-jre.xml
index a8108468..fd2483c4 100644
--- a/client/src/assembly/win64-jre.xml
+++ b/client/src/assembly/win64-jre.xml
@@ -30,6 +30,11 @@
 			<source>${project.basedir}/README.md</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
+		<file>
+			<source>${project.basedir}/ffmpeg/ffmpeg-win64.exe</source>
+			<outputDirectory>ctbrec/ffmpeg</outputDirectory>
+			<destName>ffmpeg.exe</destName>
+		</file>
 	</files>
 	<fileSets>
 		<fileSet>
diff --git a/client/src/assembly/win64.xml b/client/src/assembly/win64.xml
deleted file mode 100644
index 1f1cf1e7..00000000
--- a/client/src/assembly/win64.xml
+++ /dev/null
@@ -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>