almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Improve make_installer.bat script so that it works in the build dir, and outputs into the dist dir

Browse source
This commit is contained in:
Micah Lee 2020-02-20 11:51:06 -08:00
parent 72de53c0c0
commit 2ae39db1c1
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
4 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -131,7 +131,4 @@ dmypy.json
.vscode .vscode
*.tar.gz *.tar.gz
deb_dist deb_dist
.DS_Store .DS_Store
install/windows/Dangerzone.msi
install/windows/Dangerzone.wixobj
install/windows/Dangerzone.wixpdb

6
install/pyinstaller/pyinstaller.spec
View file

@ -23,6 +23,11 @@ if p == "Darwin":
else: else:
datas = [("../../share", "share")] datas = [("../../share", "share")]
if p == "Windows":
icon = os.path.join(root, "install", "windows", "dangerzone.ico")
else:
icon = None
a = Analysis( a = Analysis(
["dangerzone"], ["dangerzone"],
pathex=["."], pathex=["."],
@ -48,6 +53,7 @@ exe = EXE(
strip=False, strip=False,
upx=True, upx=True,
console=False, console=False,
icon=icon,
) )
coll = COLLECT( coll = COLLECT(

2
install/windows/Dangerzone.wxs
View file

@ -6,7 +6,7 @@
<Package Id="*" Keywords="Installer" Description="Dangerzone $(var.ProductVersion) Installer" Manufacturer="First Look Media" InstallerVersion="100" Languages="1033" Compressed="yes" SummaryCodepage="1252" /> <Package Id="*" Keywords="Installer" Description="Dangerzone $(var.ProductVersion) Installer" Manufacturer="First Look Media" InstallerVersion="100" Languages="1033" Compressed="yes" SummaryCodepage="1252" />
<Media Id="1" Cabinet="product.cab" EmbedCab="yes" /> <Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
<Icon Id="ProductIcon" SourceFile="dangerzone.ico"/> <Icon Id="ProductIcon" SourceFile="..\..\install\windows\dangerzone.ico"/>
<Property Id="ARPPRODUCTICON" Value="ProductIcon"/> <Property Id="ARPPRODUCTICON" Value="ProductIcon"/>
<Property Id="ARPHELPLINK" Value="https://github.com/firstlookmedia/dangerzone"/> <Property Id="ARPHELPLINK" Value="https://github.com/firstlookmedia/dangerzone"/>
<Property Id="ARPURLINFOABOUT" Value="https://tech.firstlook.media"/> <Property Id="ARPURLINFOABOUT" Value="https://tech.firstlook.media"/>

24
install/windows/make_installer.bat
View file

@ -1,3 +1,21 @@
candle Dangerzone.wxs REM delete old dist and build files
light Dangerzone.wixobj rmdir /s /q dist
@pause rmdir /s /q build
REM build the exe with pyinstaller
pyinstaller install\pyinstaller\pyinstaller.spec
REM TODO: code sign dangerzone.exe
REM build the msi package
cd build
mkdir wix
cd wix
candle.exe ..\..\install\windows\Dangerzone.wxs
light.exe -ext WixUIExtension Dangerzone.wixobj
REM TODO: code sign dangerzone.msi
REM moving dangerzone.msi to dist
cd ..\..
move build/wix/Dangerzone.msi dist