From 43ce9b9df28a471d9233230c1d8b88a2ab9a6f55 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Mon, 28 Jun 2021 15:24:15 -0700 Subject: [PATCH 1/4] initial import of ui nsis script for testing and adaptation --- windows/nsis/brand_side.bmp | Bin 0 -> 52574 bytes windows/nsis/create.sh | 6 ++ windows/nsis/cwtch-installer.nsi | 92 +++++++++++++++++++++++++++++++ windows/nsis/cwtch_title.bmp | Bin 0 -> 9742 bytes 4 files changed, 98 insertions(+) create mode 100644 windows/nsis/brand_side.bmp create mode 100644 windows/nsis/create.sh create mode 100644 windows/nsis/cwtch-installer.nsi create mode 100644 windows/nsis/cwtch_title.bmp diff --git a/windows/nsis/brand_side.bmp b/windows/nsis/brand_side.bmp new file mode 100644 index 0000000000000000000000000000000000000000..3d03803d6a41d90139914246d3e6bcf0ff706c9b GIT binary patch literal 52574 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 L3`7Qg8Uz0ec2!&j literal 0 HcmV?d00001 diff --git a/windows/nsis/create.sh b/windows/nsis/create.sh new file mode 100644 index 00000000..d5c95dd5 --- /dev/null +++ b/windows/nsis/create.sh @@ -0,0 +1,6 @@ +- cp nsis/cwtch-installer.nsi deploy/ +- cd deploy +- makensis -V3 cwtch-installer.nsi +- export BUILDDATE=`date +%G-%m-%d-%H-%M` +- export FILENAME=cwtch-installer-$BUILDDATE.exe +- mv cwtch-installer.exe $FILENAME diff --git a/windows/nsis/cwtch-installer.nsi b/windows/nsis/cwtch-installer.nsi new file mode 100644 index 00000000..25a6584f --- /dev/null +++ b/windows/nsis/cwtch-installer.nsi @@ -0,0 +1,92 @@ +; USAGE: Run in ui/deploy, requires the output be in 'windows' directory + +!include "MUI2.nsh" + +; General settings ---------------------------- +Name "Cwtch" +; !define MUI_BRANDINGTEXT "SIG Beta Ver. 1.0" + +Unicode True + +# define the name of the installer +Outfile "cwtch-installer.exe" + +# For removing Start Menu shortcut in Windows 7 +#RequestExecutionLevel user +RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on) + +# define the directory to install to, the desktop in this case as specified +# by the predefined $DESKTOP variable +InstallDir "$PROGRAMFILES\Cwtch" + +;Get installation folder from registry if available +InstallDirRegKey HKCU "Software\Cwtch" "installLocation" + +; MUI Interface ----------------------------- + +!define MUI_INSTALLCOLORS "DFB9DE 281831" + +; 128x128, 32bit +!define MUI_ICON "..\windows\cwtch.ico" + +!define MUI_HEADERIMAGE +!define MUI_HEADERIMAGE_BITMAP "..\nsis\cwtch_title.bmp" + +!define MUI_TEXTCOLOR "350052" + +!define MUI_WELCOMEFINISHPAGE_BITMAP "..\nsis\brand_side.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCrop + +!define MUI_INSTFILESPAGE_COLORS "DFB9DE 281831" +!define MUI_INSTFILESPAGE_PROGRESSBAR "colored" + +!define MUI_FINISHPAGE_NOAUTOCLOSE + + +ShowInstDetails show + +; Pages -------- + + +!define MUI_WELCOMEPAGE_TITLE "Welcome to the Cwtch installer" +!define MUI_WELCOMEPAGE_TEXT "Cwtch (pronounced: kutch) is a Welsh word roughly meaning 'a hug that creates a safe space'$\n$\n\ + Cwtch is a platform for building consentful, decentralized, untrusted infrastructure using metadata resistant group communication applications. Currently there is a selfnamed instant messaging prototype app that is driving development and testing. Many Further apps are planned as the platform matures." + +!define MUI_FINISHPAGE_TITLE "Enjoy Cwtch" +!define MUI_FINISHPAGE_RUN $INSTDIR/ui.exe +!define MUI_FINISHPAGE_TEXT "You can keep up-to-date on Cwtch and report any issues you have at https://cwtch.im" +!define MUI_FINISHPAGE_LINK "https://cwtch.im" +!define MUI_FINISHPAGE_LINK_LOCATION "https://cwtch.im" +!define MUI_FINISHPAGE_LINK_COLOR "D01972" + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "../LICENSE" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +; Languages -------------------------------- + +!insertmacro MUI_LANGUAGE "English" + +# default section +Section + + # define the output path for this file + SetOutPath $INSTDIR + + # define what to install and place it in the output path + # Filler for .sh to populate with contents of deploy/windows + #FILESLISTSTART + FILE /r "windows\" + #FILESLISTEND + + + # create a shortcut in the start menu programs directory + CreateDirectory "$SMPROGRAMS\Cwtch" + CreateShortcut "$SMPROGRAMS\Cwtch\Cwtch.lnk" "$INSTDIR\ui.exe" "" "$INSTDIR\cwtch.ico" + + ;Store installation folder + WriteRegStr HKCU "Software\Cwtch" "installLocation" $INSTDIR + +SectionEnd diff --git a/windows/nsis/cwtch_title.bmp b/windows/nsis/cwtch_title.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8acc80af148011d3f4d1b9d0e041aae3f509c603 GIT binary patch literal 9742 zcmeH~F|I2o6o!cu$*JBNNE2lRkq557v}f+ET~C{kqwDRLzmmv{8~6qAp0 zU&N;^8pML)IossK@uZ{Vh+Ar`Ud}Y3o`+t6G%%apYHbR1Ij5A#!~L)AnJ4m<>ikRT({fCUF00z^oVjp1#w1qU7iL`aa0GsrX+%F9E52nn)o z&00za9s)#2kagS6QabPuAVPwyF7cMqfrkJQ5@dB(u#^rw1c;Czt1F|Wbl@RCgaldL zoGhgS4*?=1$PxmVEu{kw0U{*GCb0itER>ylD6a?!vI*9J1qU7iL`aY|Y|c_T@DLzE zf~+C+mePTT01*;o4L6H~;J`zG2nn*LLbQ|)JOqf4AZwZ=OX9C!#2p}exDmbH`)JOqf4AZyw=OXikRWTi221I{ zLx2bgvZivhlny)uh>##_nkP%?z(as&KL5R%Ul|v$XUr;Zv#zBEyvnW8{*aew`+&-x zx*iM4(_c@2J?4SOMnCiG>95B;@Yv{Qem(v5m>eCj+n`dJ>l#8)Hh!f#RR-ZFn|$$<7T^VcHdkLNZY>v!tXiF=^d^*rcO%PsSD`@?`H zYZ^zj-c*&Li)|ws_6J0m0zo$zVy3o=$+t*1$SC*EmAJXdAy2Sc4=>}>wCJSf0`|-OZvr2W!qz``KguHx@3Io9?Gkp5``|muKI`B`txu+ zv{4#D3GHMrb6xYpu36lcyU-)9WVPDX7+xm1;r%Qf3Za(SBhD73KM_MhsW7n{K z{o#^ZGly;V`boVm86Y>*Mg8YnnWPIyPHim>YaP0r>m^IHhKdpEvv9ntOH*hNc4#eG zsP48Js#@ANpx?#pcU!Fw!WLb)o-2Z zl6AIkot&oozU7;$M@5aW1bzRgX<3gNS+!cfSJ%1=t7dii%UI#C&3U?9H*ObHYfV=t ztoGckOONx;vaTmLI#-{&GhUNPb$;1j7^r?~3y5Nw)ESp-l6AK@mfrpkZVf?tfbtMp#$LYe;Ke%=2ely7jGC8em??v!p#=2E-5 w_K=qu?^`bhWX|BPZMFZt^3?TM44(da`s* Date: Mon, 28 Jun 2021 17:59:46 -0700 Subject: [PATCH 2/4] updating paths in nsis code and sketching install commands in drone - but need a new container --- .drone.yml | 9 ++++++++- windows/nsis/cwtch-installer.nsi | 12 ++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index d1f9aeac..58f599d0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -237,13 +237,20 @@ steps: - echo $Env:pfx > codesign.pfx.b64 - 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 + + - 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\$Env:builddir - move $Env:releasedir $Env:builddir - powershell -command "Compress-Archive -Path $Env:builddir -DestinationPath cwtch.zip" - 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 $Env:zipsha deploy\$Env:builddir + - move *.sha512 deploy\$Env:builddir - name: deploy-windows image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc diff --git a/windows/nsis/cwtch-installer.nsi b/windows/nsis/cwtch-installer.nsi index 25a6584f..ad8eebc1 100644 --- a/windows/nsis/cwtch-installer.nsi +++ b/windows/nsis/cwtch-installer.nsi @@ -27,14 +27,14 @@ InstallDirRegKey HKCU "Software\Cwtch" "installLocation" !define MUI_INSTALLCOLORS "DFB9DE 281831" ; 128x128, 32bit -!define MUI_ICON "..\windows\cwtch.ico" +!define MUI_ICON "windows/runner/resources/knot_128.ico" !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_WELCOMEFINISHPAGE_BITMAP "..\nsis\brand_side.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "windows/nsis/brand_side.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCrop !define MUI_INSTFILESPAGE_COLORS "DFB9DE 281831" @@ -60,7 +60,7 @@ ShowInstDetails show !define MUI_FINISHPAGE_LINK_COLOR "D01972" !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "../LICENSE" +!insertmacro MUI_PAGE_LICENSE "LICENSE" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -78,13 +78,13 @@ Section # define what to install and place it in the output path # Filler for .sh to populate with contents of deploy/windows #FILESLISTSTART - FILE /r "windows\" + FILE /r "build/windows/runner/Release/" #FILESLISTEND # create a shortcut in the start menu programs directory 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 WriteRegStr HKCU "Software\Cwtch" "installLocation" $INSTDIR From bd29ad8d4c8b7d05a1ec21ab31b0e7188833e543 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 30 Jun 2021 11:57:56 -0700 Subject: [PATCH 3/4] integrating changes from tests in flutter_app --- .drone.yml | 50 ++++++++++++++++++-------------- windows/nsis/create.sh | 6 ---- windows/nsis/cwtch-installer.nsi | 10 +++---- 3 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 windows/nsis/create.sh diff --git a/.drone.yml b/.drone.yml index 58f599d0..38c902ce 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,7 +11,7 @@ steps: image: cirrusci/flutter:dev environment: buildbot_key_b64: - from_secret: buildbot_key_b64 + from_secret: buildbot_key_b64 commands: - mkdir ~/.ssh - echo $buildbot_key_b64 > ~/.ssh/id_rsa.b64 @@ -68,8 +68,8 @@ steps: - name: test-build-android image: cirrusci/flutter:dev - when: - event: pull_request + when: + event: pull_request volumes: - name: deps path: /root/.pub-cache @@ -106,7 +106,7 @@ steps: - name: deps path: /root/.pub-cache commands: - # - flutter config --enable-linux-desktop + # - flutter config --enable-linux-desktop - flutter test --coverage - genhtml coverage/lcov.info -o coverage/html @@ -209,21 +209,10 @@ steps: - name: build-windows image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc - environment: - pfx: - from_secret: pfx - pfx_pass: - from_secret: pfx_pass commands: - flutter pub get - $Env:version += type .\VERSION - $Env:builddate += type .\BUILDDATE - - $Env:buildname = 'flwtch-win-' + $Env:version + '-' + $Env:builddate - - $Env:builddir = $Env:buildname - - $Env:zip = 'cwtch-' + $Env:version + '.zip' - - $Env:zipsha = $Env:zip + '.sha512' - - $Env:msix = 'cwtch-install-' + $Env:version + '.msix' - - $Env:msixsha = $Env:msix + '.sha512' - $Env:releasedir = "build\\windows\\runner\\Release\\" - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:builddate - copy windows\libCwtch.dll $Env:releasedir @@ -234,15 +223,32 @@ steps: - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\vcruntime140_1.dll $Env:releasedir - copy C:\BuildTools\VC\Redist\MSVC\14.29.30036\x64\Microsoft.VC142.CRT\msvcp140.dll $Env:releasedir - powershell -command "Expand-Archive -Path tor.zip -DestinationPath $Env:releasedir\Tor" + + - name: package-windows + image: openpriv/nsis:latest + environment: + pfx: + from_secret: pfx + pfx_pass: + from_secret: pfx_pass + commands: + - $Env:version += type .\VERSION + - $Env:builddate += type .\BUILDDATE + - $Env:releasedir = "build\\windows\\runner\\Release\\" + - $Env:zip = 'cwtch-' + $Env:version + '.zip' + - $Env:zipsha = $Env:zip + '.sha512' + - $Env:msix = 'cwtch-install-' + $Env:version + '.msix' + - $Env:msixsha = $Env:msix + '.sha512' + - $Env:buildname = 'flwtch-win-' + $Env:version + '-' + $Env:builddate + - $Env:builddir = $Env:buildname - echo $Env:pfx > codesign.pfx.b64 - 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 - - - copy window\runner\resources\knot_128.ico $Env:releasedir\cwtch.ico + - signtool sign /v /fd sha256 /a /f codesign.pfx /p $Env:pfx_pass /tr http://timestamp.digicert.com $Env:releasedir\cwtch.exe + - copy windows\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 + - move windows\nsis\cwtch-installer.exe cwtch-installer.exe + - 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\$Env:builddir - move $Env:releasedir $Env:builddir @@ -255,8 +261,8 @@ steps: - name: deploy-windows image: openpriv/flutter-desktop:windows-sdk30-fdev2.3rc when: - event: push - status: [ success ] + event: push + status: [ success ] environment: BUILDFILES_KEY: from_secret: buildfiles_key diff --git a/windows/nsis/create.sh b/windows/nsis/create.sh deleted file mode 100644 index d5c95dd5..00000000 --- a/windows/nsis/create.sh +++ /dev/null @@ -1,6 +0,0 @@ -- cp nsis/cwtch-installer.nsi deploy/ -- cd deploy -- makensis -V3 cwtch-installer.nsi -- export BUILDDATE=`date +%G-%m-%d-%H-%M` -- export FILENAME=cwtch-installer-$BUILDDATE.exe -- mv cwtch-installer.exe $FILENAME diff --git a/windows/nsis/cwtch-installer.nsi b/windows/nsis/cwtch-installer.nsi index ad8eebc1..684a0e3a 100644 --- a/windows/nsis/cwtch-installer.nsi +++ b/windows/nsis/cwtch-installer.nsi @@ -27,14 +27,14 @@ InstallDirRegKey HKCU "Software\Cwtch" "installLocation" !define MUI_INSTALLCOLORS "DFB9DE 281831" ; 128x128, 32bit -!define MUI_ICON "windows/runner/resources/knot_128.ico" +!define MUI_ICON "../runner/resources/knot_128.ico" !define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "windows/nsis/cwtch_title.bmp" +!define MUI_HEADERIMAGE_BITMAP "cwtch_title.bmp" !define MUI_TEXTCOLOR "350052" -!define MUI_WELCOMEFINISHPAGE_BITMAP "windows/nsis/brand_side.bmp" +!define MUI_WELCOMEFINISHPAGE_BITMAP "brand_side.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP_STRETCH NoStretchNoCrop !define MUI_INSTFILESPAGE_COLORS "DFB9DE 281831" @@ -60,7 +60,7 @@ ShowInstDetails show !define MUI_FINISHPAGE_LINK_COLOR "D01972" !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "LICENSE" +!insertmacro MUI_PAGE_LICENSE "../../LICENSE" !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -78,7 +78,7 @@ Section # define what to install and place it in the output path # Filler for .sh to populate with contents of deploy/windows #FILESLISTSTART - FILE /r "build/windows/runner/Release/" + FILE /r "..\..\build\windows\runner\Release\" #FILESLISTEND From 445a88ed882d6250a75b17adca2b71f092be3397 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 30 Jun 2021 12:39:51 -0700 Subject: [PATCH 4/4] fix 'Run app` after incaller closes not working --- windows/nsis/cwtch-installer.nsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/nsis/cwtch-installer.nsi b/windows/nsis/cwtch-installer.nsi index 684a0e3a..75a59515 100644 --- a/windows/nsis/cwtch-installer.nsi +++ b/windows/nsis/cwtch-installer.nsi @@ -53,7 +53,7 @@ ShowInstDetails show Cwtch is a platform for building consentful, decentralized, untrusted infrastructure using metadata resistant group communication applications. Currently there is a selfnamed instant messaging prototype app that is driving development and testing. Many Further apps are planned as the platform matures." !define MUI_FINISHPAGE_TITLE "Enjoy Cwtch" -!define MUI_FINISHPAGE_RUN $INSTDIR/ui.exe +!define MUI_FINISHPAGE_RUN $INSTDIR/cwtch.exe !define MUI_FINISHPAGE_TEXT "You can keep up-to-date on Cwtch and report any issues you have at https://cwtch.im" !define MUI_FINISHPAGE_LINK "https://cwtch.im" !define MUI_FINISHPAGE_LINK_LOCATION "https://cwtch.im"