changeset 40:eb1788a438dc

Further MSVC bits
author Chris Cannam
date Wed, 18 Dec 2019 17:30:08 +0000
parents f24d8a6f1e49
children f1326adbb33b
files .hgignore deploy/win64/build-64.bat deploy/win64/generate-qrc.bat deploy/win64/mark-for-signing.bat
diffstat 4 files changed, 32 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Wed Dec 18 16:53:08 2019 +0000
+++ b/.hgignore	Wed Dec 18 17:30:08 2019 +0000
@@ -45,3 +45,4 @@
 .notarization-uuid
 *.dmg
 *.app
+installer.qrc
--- a/deploy/win64/build-64.bat	Wed Dec 18 16:53:08 2019 +0000
+++ b/deploy/win64/build-64.bat	Wed Dec 18 17:30:08 2019 +0000
@@ -28,6 +28,9 @@
 call .\repoint install
 if %errorlevel% neq 0 exit /b %errorlevel%
 
+call .\deploy\win64\generate-qrc installer.qrc
+if %errorlevel% neq 0 exit /b %errorlevel%
+
 mkdir build_win64
 cd build_win64
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win64/generate-qrc.bat	Wed Dec 18 17:30:08 2019 +0000
@@ -0,0 +1,16 @@
+@echo off
+
+set ME=%0
+set QRC=%1
+shift
+
+set IN=%QRC%.in
+
+if not exist %IN% (
+    echo Could not find input file %IN%
+    exit /b 2
+)
+
+@echo on
+
+powershell -Command "(Get-Content %IN%) -replace '@SUFFIX@', 'dll' | Out-File -encoding ASCII %QRC%"
--- a/deploy/win64/mark-for-signing.bat	Wed Dec 18 16:53:08 2019 +0000
+++ b/deploy/win64/mark-for-signing.bat	Wed Dec 18 17:30:08 2019 +0000
@@ -5,20 +5,20 @@
 shift
 
 if not defined DIR (
-@   echo "Usage: %ME% <directory>"
-@   exit /b 2
+   echo "Usage: %ME% <directory>"
+   exit /b 2
+)
+
+if not exist %DIR% (
+    echo Could not find directory %DIR%, trying release\%DIR%
+    set DIR=release\%DIR%
+)
+
+if not exist %DIR% (
+       echo Could not find directory %DIR%
+       exit /b 2
 )
 
 @echo on
 
-@if not exist %DIR% (
-@    echo Could not find directory %DIR%, trying release\%DIR%
-@    set DIR=release\%DIR%
-)
-
-@if not exist %DIR% (
-@       echo Could not find directory %DIR%
-@       exit /b 2
-)
-
 echo( > %DIR%\.something-to-sign