updating paths in nsis code and sketching install commands in drone - but need a new container

This commit is contained in:
Dan Ballard 2021-06-28 17:59:46 -07:00
parent 43ce9b9df2
commit f2d18d44eb
2 changed files with 14 additions and 7 deletions

View File

@ -237,13 +237,20 @@ steps:
- echo $Env:pfx > codesign.pfx.b64 - echo $Env:pfx > codesign.pfx.b64
- certutil -decode codesign.pfx.b64 codesign.pfx - certutil -decode codesign.pfx.b64 codesign.pfx
- C:\MSIX-Toolkit\MSIX-Toolkit.x64\signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com $Env:releasedir\cwtch.exe - C:\MSIX-Toolkit\MSIX-Toolkit.x64\signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com $Env:releasedir\cwtch.exe
- copy window\runner\resources\knot_128.ico $Env:releasedir\cwtch.ico
- makensis windows\nsis\cwtch-installer.nsi
- C:\MSIX-Toolkit\MSIX-Toolkit.x64\signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com cwtch-installer.exe
- powershell -command "(Get-FileHash cwtch-installer.exe -Algorithm sha512).Hash" > cwtch-installer.sha512
- mkdir deploy - mkdir deploy
- mkdir deploy\$Env:builddir - mkdir deploy\$Env:builddir
- move $Env:releasedir $Env:builddir - move $Env:releasedir $Env:builddir
- powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath cwtch.zip" - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath cwtch.zip"
- powershell -command "(Get-FileHash cwtch.zip -Algorithm sha512).Hash" > $Env:zipsha - powershell -command "(Get-FileHash cwtch.zip -Algorithm sha512).Hash" > $Env:zipsha
- move cwtch-installer.exe deploy\$Env:builddir\cwtch-installer.exe
- move cwtch.zip deploy\$Env:builddir\$Env:zip - move cwtch.zip deploy\$Env:builddir\$Env:zip
- move $Env:zipsha deploy\$Env:builddir - move *.sha512 deploy\$Env:builddir
- name: deploy-windows - name: deploy-windows
image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc

View File

@ -27,14 +27,14 @@ InstallDirRegKey HKCU "Software\Cwtch" "installLocation"
!define MUI_INSTALLCOLORS "DFB9DE 281831" !define MUI_INSTALLCOLORS "DFB9DE 281831"
; 128x128, 32bit ; 128x128, 32bit
!define MUI_ICON "..\windows\cwtch.ico" !define MUI_ICON "windows/runner/resources/knot_128.ico"
!define MUI_HEADERIMAGE !define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "..\nsis\cwtch_title.bmp" !define MUI_HEADERIMAGE_BITMAP "windows/nsis/cwtch_title.bmp"
!define MUI_TEXTCOLOR "350052" !define MUI_TEXTCOLOR "350052"
!define MUI_WELCOMEFINISHPAGE_BITMAP "..\nsis\brand_side.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "windows/nsis/brand_side.bmp"
!define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCrop !define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCrop
!define MUI_INSTFILESPAGE_COLORS "DFB9DE 281831" !define MUI_INSTFILESPAGE_COLORS "DFB9DE 281831"
@ -60,7 +60,7 @@ ShowInstDetails show
!define MUI_FINISHPAGE_LINK_COLOR "D01972" !define MUI_FINISHPAGE_LINK_COLOR "D01972"
!insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE "../LICENSE" !insertmacro MUI_PAGE_LICENSE "LICENSE"
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
@ -78,13 +78,13 @@ Section
# define what to install and place it in the output path # define what to install and place it in the output path
# Filler for .sh to populate with contents of deploy/windows # Filler for .sh to populate with contents of deploy/windows
#FILESLISTSTART #FILESLISTSTART
FILE /r "windows\" FILE /r "build/windows/runner/Release/"
#FILESLISTEND #FILESLISTEND
# create a shortcut in the start menu programs directory # create a shortcut in the start menu programs directory
CreateDirectory "$SMPROGRAMS\Cwtch" CreateDirectory "$SMPROGRAMS\Cwtch"
CreateShortcut "$SMPROGRAMS\Cwtch\Cwtch.lnk" "$INSTDIR\ui.exe" "" "$INSTDIR\cwtch.ico" CreateShortcut "$SMPROGRAMS\Cwtch\Cwtch.lnk" "$INSTDIR\cwtch.exe" "" "$INSTDIR\cwtch.ico"
;Store installation folder ;Store installation folder
WriteRegStr HKCU "Software\Cwtch" "installLocation" $INSTDIR WriteRegStr HKCU "Software\Cwtch" "installLocation" $INSTDIR