Attempt to bundle gstreamer

quelea-projection · Dec 23, 2023 · fb1a6bd · fb1a6bd
1 parent 4bce212
commit fb1a6bd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,9 +19,11 @@ Quelea/build/*
 Quelea/out-mac/*
 Quelea/dist/*
 Quelea/nbproject/*
-.idea/*
+Quelea/.idea/*
+Quelea/output/*
 Quelea/.gradle/*
 Quelea/.nb-gradle/*
 Quelea/bin/*
 
 Thumbs.db
+gs.msi
diff --git a/Quelea/build.gradle b/Quelea/build.gradle
@@ -85,6 +85,13 @@ task createQueleaExe64(type: edu.sc.seis.launch4j.tasks.Launch4jLibraryTask) { /
     outfile = "Quelea64.exe"
 }
 
+task downloadGStreamer {
+    def f = new File('gs.msi')
+    if (!f.exists()) {
+        new URL('https://gstreamer.freedesktop.org/data/pkg/windows/1.22.8/msvc/gstreamer-1.0-msvc-x86_64-1.22.8.msi').withInputStream{ i -> f.withOutputStream{ it << i }}
+    }
+}
+
 task copyToDist {
     doLast {
         copy {from configurations.runtimeClasspath into project.distdir + "/lib"} //libraries
@@ -176,7 +183,7 @@ task zipMacPackr(type: Zip) {
 runPackr.finalizedBy(zipMacPackr);
 
 task dist(type: GradleBuild) {
-    tasks = ['labelcheck', 'createQueleaExe64', 'copyToDist', 'runPackr', 'izpack', 'innosetup', 'releaseSummary']
+    tasks = ['labelcheck', 'downloadGStreamer', 'createQueleaExe64', 'copyToDist', 'runPackr', 'izpack', 'innosetup', 'releaseSummary']
 }
 
 dependencies {

diff --git a/Quelea/quelea64.iss b/Quelea/quelea64.iss
@@ -61,6 +61,7 @@ Type: filesandordirs; Name: "{app}/winjre"
 Type: filesandordirs; Name: "{app}/winjre64"
 
 [Files]
+Source: gs.msi; DestDir: {tmp}; Flags: deleteafterinstall;
 Source: "build/launch4j/Quelea64.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "dist/Quelea.jar"; DestDir: "{app}"; Flags: ignoreversion
 Source: "fopcfg.xml"; DestDir: "{app}"; Flags: ignoreversion
@@ -89,4 +90,5 @@ Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFil
 Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; IconFilename: "{app}\icons\logo.ico"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
 
 [Run]
+Filename: "msiexec.exe"; Parameters: "/i ""{tmp}\gs.msi"" /qb Complete=1"; WorkingDir: {tmp};
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, "&", "&&")}}"; Flags: shellexec postinstall skipifsilent
diff --git a/Quelea/src/main/java/org/quelea/services/utils/QueleaProperties.java b/Quelea/src/main/java/org/quelea/services/utils/QueleaProperties.java
@@ -44,7 +44,7 @@
  */
 public final class QueleaProperties extends SortedProperties {
 
-    public static final Version VERSION = new Version("2024.0", VersionType.BETA);
+    public static final Version VERSION = new Version("2024.0", VersionType.CI);
     private static QueleaProperties INSTANCE;
     private String userHome;