4 Commits

Author SHA1 Message Date
RatzzFatzz
c33777b038 Add debian build to github action 2025-02-05 23:02:40 +01:00
RatzzFatzz
6c08ce69ea Fix logging for debian build 2025-02-05 22:59:38 +01:00
RatzzFatzz
7f8c14e3a9 Use maven properties for wix installer vars 2025-02-05 16:00:01 +01:00
RatzzFatzz
553c672e4d Implement debian package build 2025-02-05 15:49:46 +01:00
7 changed files with 208 additions and 78 deletions

View File

@@ -20,11 +20,11 @@ jobs:
with:
timezoneLinux: "Europe/Berlin"
- name: Set up JDK 21
- name: Set up JDK 17
uses: actions/setup-java@v4.7.0
with:
distribution: temurin
java-version: 21
java-version: 17
- name: Setup workspace
run: mkdir artifacts
@@ -41,6 +41,41 @@ jobs:
with:
args: 'artifacts/M*'
debian-build:
runs-on: ubuntu-latest
steps:
- name: Install mkvtoolnix
run: sudo apt-get install -y mkvtoolnix
- name: Checkout
uses: actions/checkout@v4
- name: Set timezone
uses: szenius/set-timezone@v2.0
with:
timezoneLinux: "Europe/Berlin"
- name: Set up JDK 17
uses: actions/setup-java@v4.7.0
with:
distribution: temurin
java-version: 17
- name: Setup workspace
run: mkdir artifacts
- name: Build with Maven
run: |
mvn clean package --file pom.xml -P linux
cp target/M*.deb artifacts/
- name: Upload artifacts
uses: skx/github-action-publish-binaries@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
args: 'artifacts/M*'
windows-installer-build:
runs-on: windows-latest
steps:
@@ -57,11 +92,11 @@ jobs:
with:
timezoneWindows: "Berlin Standard Time"
- name: Set up JDK 21
- name: Set up JDK 17
uses: actions/setup-java@v4.7.0
with:
distribution: temurin
java-version: 21
java-version: 17
- name: Setup workspace
run: mkdir artifacts

190
pom.xml
View File

@@ -11,6 +11,11 @@
<properties>
<mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
<project.maintainer>RatzzFatzz</project.maintainer>
<project.maintainer.mail>github.contact@ratzloeffel.de</project.maintainer.mail>
<project.description>Command-line utility for batch-managing default audio and subtitle tracks in MKV files.</project.description>
<java-version>17</java-version>
<lombok-version>1.18.36</lombok-version>
</properties>
@@ -66,24 +71,70 @@
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-jpackage-input</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/jpackage-input</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>filter-windows-installer-info</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/wix-resources</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/wix/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.panteleyev</groupId>
<artifactId>jpackage-maven-plugin</artifactId>
<version>1.6.5</version>
<configuration>
<name>${project.artifactId}</name>
<vendor>RatzzFatzz</vendor>
<appVersion>${project.version}</appVersion>
<destination>target/installer</destination>
<input>target/jpackage-input</input>
<mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
<mainJar>${project.artifactId}-${project.version}.jar</mainJar>
<resourceDir>${project.build.directory}/wix-resources/</resourceDir>
<type>EXE</type>
<winConsole>true</winConsole>
<winShortcut>false</winShortcut>
<winMenu>false</winMenu>
<javaOptions>
<javaOption>-Dlog4j.configurationFile=log4j2-windows.yaml</javaOption>
</javaOptions>
</configuration>
<executions>
<execution>
<id>windows</id>
<configuration>
<resourceDir>${project.basedir}/src/main/resources/</resourceDir>
<type>EXE</type>
<winConsole>true</winConsole>
<winShortcut>false</winShortcut>
<winMenu>false</winMenu>
<javaOptions>
<javaOption>-Dlog4j.configurationFile=log4j2-installed.yaml</javaOption>
</javaOptions>
</configuration>
<phase>package</phase>
<goals>
<goal>jpackage</goal>
@@ -97,25 +148,71 @@
<profile>
<id>linux</id>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>log4j2-debian.yaml</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.panteleyev</groupId>
<artifactId>jpackage-maven-plugin</artifactId>
<version>1.4.0</version>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>linux-deb</id>
<configuration>
<type>DEB</type>
<installDir>/usr/local/bin</installDir>
<linuxShortcut>false</linuxShortcut>
<linuxPackageName>mkvasc</linuxPackageName>
<linuxDebMaintainer>your@email.com</linuxDebMaintainer>
</configuration>
<id>filter-linux-package-info</id>
<phase>package</phase>
<goals>
<goal>jpackage</goal>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/debian-package-info</outputDirectory>
<resources>
<resource>
<directory>${project.basedir}/src/deb</directory>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>jdeb</artifactId>
<groupId>org.vafer</groupId>
<version>1.13</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>jdeb</goal>
</goals>
<configuration>
<dataSet>
<!-- JAR file -->
<data>
<src>${project.build.directory}/${project.build.finalName}.jar</src>
<type>file</type>
<mapper>
<type>perm</type>
<prefix>/usr/lib/${project.artifactId}</prefix>
</mapper>
</data>
<!-- Launcher script -->
<data>
<src>${project.build.directory}/debian-package-info/bin/mkvaudiosubtitlechanger</src>
<type>file</type>
<mapper>
<type>perm</type>
<prefix>/usr/bin</prefix>
<filemode>755</filemode>
</mapper>
</data>
</dataSet>
<controlDir>${project.build.directory}/debian-package-info/control</controlDir>
</configuration>
</execution>
</executions>
</plugin>
@@ -197,8 +294,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<configuration>
<source>21</source>
<target>21</target>
<source>${java-version}</source>
<target>${java-version}</target>
<compilerArgs>
<arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
</compilerArgs>
@@ -218,51 +315,6 @@
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-jpackage-input</id>
<phase>package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/jpackage-input</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}</directory>
<includes>
<include>${project.artifactId}-${project.version}.jar</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.panteleyev</groupId>
<artifactId>jpackage-maven-plugin</artifactId>
<version>1.4.0</version>
<configuration>
<name>${project.artifactId}</name>
<vendor>RatzzFatzz</vendor>
<appVersion>${project.version}</appVersion>
<destination>target/installer</destination>
<input>target/jpackage-input</input>
<mainClass>at.pcgamingfreaks.mkvaudiosubtitlechanger.Main</mainClass>
<mainJar>${project.artifactId}-${project.version}.jar</mainJar>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<repositories>

View File

@@ -0,0 +1 @@
java -Dlog4j.configurationFile=log4j2-debian.yaml -jar /usr/lib/${project.artifactId}/${project.artifactId}-${project.version}.jar "$@"

8
src/deb/control/control Normal file
View File

@@ -0,0 +1,8 @@
Package: ${project.artifactId}
Version: ${project.version}
Section: misc
Priority: optional
Architecture: all
Depends: java-runtime (>=${java-version}), mkvtoolnix
Maintainer: ${project.maintainer} <${project.maintainer.mail}>
Description: ${project.description}

View File

@@ -0,0 +1,34 @@
Configuration:
name: DefaultLogger
Appenders:
RollingFile:
name: FileAppender
fileName: /var/log/MKVAudioSubtitleChanger/application.log
filePattern: /var/log/MKVAudioSubtitleChanger/archive/application-%d{yyyy-MM-dd}-%i.log.gz
PatternLayout:
Pattern: "%d{DEFAULT} | %-5level | %thread | %msg %n %throwable"
ThresholdFilter:
level: info
Policies:
OnStartupTriggeringPolicy:
minSize: 0
DefaultRolloverStrategy:
max: 30
Delete:
basePath: archive
maxDepth: 1
IfLastModified:
age: 30d
IfAccumulatedFileSize:
exceeds: 1GB
Loggers:
Root:
level: info
AppenderRef:
- ref: FileAppender
Logger:
name: "com.zaxxer.hikari.HikariConfig"
level: info
AppenderRef:
- ref: FileAppender

View File

@@ -24,12 +24,12 @@
<?endif?>
<?define JpProductCode="*"?>
<?define JpAppName="MKVAudioSubtitleChanger"?>
<?define JpAppVersion="4.0.0"?>
<?define JpAppVendor="RatzzFatzz"?>
<?define JpAppName="${project.artifactId}"?>
<?define JpAppVersion="${project.version}"?>
<?define JpAppVendor="${project.maintainer}"?>
<?define JpProductUpgradeCode="a9527300-d364-4cc3-a392-94035065d8c9"?>
<?define JpAppDescription="Change audio and subtitle tracks for .mkv files"?>
<?define JpHelpURL="github.com/RatzzFatzz"?>
<?define JpAppDescription="${project.description}"?>
<?define JpHelpURL="github.com/${project.maintainer}/${project.artifactId}"?>
<Product
Id="$(var.JpProductCode)"