From 0148a43946834dc21d4a9bc273b6f359f29fd8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Wed, 27 Sep 2023 17:59:25 +0200 Subject: [PATCH] windows: install the share folder from gtk/gst --- installer/wix/build_installer.ps1 | 10 ++++++---- installer/wix/gps.bat | 2 +- installer/wix/gps.wxs | 1 + installer/wix/prepare_gstreamer.ps1 | 1 + 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/installer/wix/build_installer.ps1 b/installer/wix/build_installer.ps1 index ac151ef..a65edf2 100644 --- a/installer/wix/build_installer.ps1 +++ b/installer/wix/build_installer.ps1 @@ -33,13 +33,15 @@ try # GST and GTK are installed in this folder by prepare_gstreamer.ps1. # GST and GTK are built by the docker image. $gstreamerInstallDir="c:\gst-install-clean" - $gstreamerBinInstallDir= Join-Path $gstreamerInstallDir -ChildPath "bin/" - $gstreamerPluginInstallDir= Join-Path $gstreamerInstallDir -ChildPath "lib\gstreamer-1.0" + $gstreamerBinInstallDir= Join-Path $gstreamerInstallDir -ChildPath "bin" + $gstreamerPluginInstallDir= Join-Path $gstreamerInstallDir -ChildPath "lib" + $gstreamerShareInstallDir= Join-Path $gstreamerInstallDir -ChildPath "share" & "$heatToolPath" dir "$gstreamerBinInstallDir" -gg -sfrag -template:fragment -out gstreamer-1.0.wxs -cg "_gstreamer" -var var.gstreamerBinInstallDir -dr INSTALLFOLDER & "$heatToolPath" dir "$gstreamerPluginInstallDir" -gg -sfrag -template:fragment -out gstreamer-plugins-1.0.wxs -cg "_gstreamer_plugins" -var var.gstreamerPluginInstallDir -dr INSTALLFOLDER + & "$heatToolPath" dir "$gstreamerShareInstallDir" -v -ke -gg -sfrag -template:fragment -out gstreamer-share-1.0.wxs -cg "_gstreamer_share" -var var.gstreamerShareInstallDir -dr INSTALLFOLDER - $files = "gps gstreamer-1.0 gstreamer-plugins-1.0" + $files = "gps gstreamer-1.0 gstreamer-plugins-1.0 gstreamer-share-1.0" $wxs_files = @() $obj_files = @() foreach ($f in $files.split(" ")){ @@ -51,7 +53,7 @@ try # compiling wxs file into wixobj $msiFileName = "GstPipelineStudio-$GPSVersion.msi" foreach ($f in $wxs_files){ - & "$candleToolPath" "$f" -dPlatform=x64 -dGPSUpgradeCode="$GPSUpgradeCode" -dGPSVersion="$GPSVersion" -dgstreamerBinInstallDir="$gstreamerBinInstallDir" -dgstreamerPluginInstallDir="$gstreamerPluginInstallDir" + & "$candleToolPath" "$f" -dPlatform=x64 -dGPSUpgradeCode="$GPSUpgradeCode" -dGPSVersion="$GPSVersion" -dgstreamerBinInstallDir="$gstreamerBinInstallDir" -dgstreamerPluginInstallDir="$gstreamerPluginInstallDir" -dgstreamerShareInstallDir="$gstreamerShareInstallDir" if($LASTEXITCODE -ne 0) { throw "Compilation of $wxsFileName failed with exit code $LASTEXITCODE" diff --git a/installer/wix/gps.bat b/installer/wix/gps.bat index 3e501bd..df85317 100644 --- a/installer/wix/gps.bat +++ b/installer/wix/gps.bat @@ -3,6 +3,6 @@ set MYDIR=%~dp0 setlocal set PATH=%MYDIR%bin;%PATH% echo %PATH% -set GST_PLUGIN_PATH=%MYDIR%/gstreamer-1.0 +set GST_PLUGIN_PATH=%MYDIR%\lib\gstreamer-1.0 echo %GST_PLUGIN_PATH% gst_pipeline_studio.exe \ No newline at end of file diff --git a/installer/wix/gps.wxs b/installer/wix/gps.wxs index 62d8990..61e2b85 100644 --- a/installer/wix/gps.wxs +++ b/installer/wix/gps.wxs @@ -59,6 +59,7 @@ + diff --git a/installer/wix/prepare_gstreamer.ps1 b/installer/wix/prepare_gstreamer.ps1 index 54dd11c..c85e07d 100644 --- a/installer/wix/prepare_gstreamer.ps1 +++ b/installer/wix/prepare_gstreamer.ps1 @@ -9,3 +9,4 @@ Copy-Item -Path C:\gst-install\bin\*.exe -Destination c:\gst-install-clean\bin\ New-Item c:\gst-install-clean\lib\gstreamer-1.0 -ItemType Directory Copy-Item -Path C:\gst-install\lib\gstreamer-1.0\*.dll -Destination c:\gst-install-clean\lib\gstreamer-1.0 +Copy-Item -Path C:\gst-install\share -Destination c:\gst-install-clean\ -Recurse