diff --git a/BUILD.md b/BUILD.md index e21bfe6..7885d8f 100644 --- a/BUILD.md +++ b/BUILD.md @@ -223,24 +223,10 @@ mklink dangerzone-container.exe dangerzone.exe ### To build the installer -Note that you must have a codesigning certificate installed in order to use the `install\windows\build.bat` script, because it codesigns `dangerzone.exe` and `Dangerzone.msi`. - -Open a command prompt, cd to the dangerzone directory, and run: +Note that you must have a codesigning certificate installed in order to use the `install\windows\build-app.bat` script, because it codesigns `dangerzone.exe` and `Dangerzone.msi`. ``` -poetry run install\windows\step1-build-exe.bat -``` - -Open a second command prompt _as an administratror_, cd to the dangerzone directory, and run: - -``` -install\windows\step2-make-symlink.bat -``` - -Then back in the first command prompt, run: - -``` -poetry run install\windows\step3-build-installer.bat +poetry run .\install\windows\build-app.bat ``` When you're done you will have `dist\Dangerzone.msi`. diff --git a/install/windows/step3-build-installer.bat b/install/windows/build-app.bat similarity index 58% rename from install/windows/step3-build-installer.bat rename to install/windows/build-app.bat index f3667ca..a2df1d1 100644 --- a/install/windows/step3-build-installer.bat +++ b/install/windows/build-app.bat @@ -1,3 +1,13 @@ +REM delete old dist and build files +rmdir /s /q dist +rmdir /s /q build + +REM build the exe with pyinstaller +pyinstaller install\pyinstaller\pyinstaller.spec + +REM code sign dangerzone.exe +signtool.exe sign /v /d "Dangerzone" /sha1 28a4af3b6ba5ed0ef307e1b96a140e1b42450c3b /tr http://timestamp.digicert.com dist\dangerzone\dangerzone.exe + REM build the wix file python install\windows\build-wxs.py > install\windows\Dangerzone.wxs diff --git a/install/windows/step1-build-exe.bat b/install/windows/step1-build-exe.bat deleted file mode 100644 index ea22b6a..0000000 --- a/install/windows/step1-build-exe.bat +++ /dev/null @@ -1,9 +0,0 @@ -REM delete old dist and build files -rmdir /s /q dist -rmdir /s /q build - -REM build the exe with pyinstaller -pyinstaller install\pyinstaller\pyinstaller.spec - -REM code sign dangerzone.exe -signtool.exe sign /v /d "Dangerzone" /sha1 28a4af3b6ba5ed0ef307e1b96a140e1b42450c3b /tr http://timestamp.digicert.com dist\dangerzone\dangerzone.exe diff --git a/install/windows/step2-make-symlink.bat b/install/windows/step2-make-symlink.bat deleted file mode 100644 index 2727b03..0000000 --- a/install/windows/step2-make-symlink.bat +++ /dev/null @@ -1,4 +0,0 @@ -REM make dangerzone-container.exe symbolic link (as administrator) -cd dist\dangerzone -mklink dangerzone-cli.exe dangerzone.exe -cd ..\.. \ No newline at end of file