From 39e2060caf46c1f44bce6b84748c8f25ee07dda5 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Mon, 17 Oct 2022 12:40:29 -0400 Subject: [PATCH 01/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 1f24d5c2..0d59e44a 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -24,6 +24,10 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 + + - name: Install Inno Setup + run: | + choco install innosetup - name: Download the prerequisite software run: | @@ -32,9 +36,8 @@ jobs: - name: Build the installer run: | - cd imls-windows-installer - Get-Content setup.iss - cd 'Inno Setup 6' + # cd imls-windows-installer + # cd 'Inno Setup 6' ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' - name: Upload the artifact From 1ee45e39c7dad402d657740d492d7f280dd6813f Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Mon, 17 Oct 2022 12:55:28 -0400 Subject: [PATCH 02/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 0d59e44a..2f459825 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -25,10 +25,6 @@ jobs: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - uses: actions/checkout@v3 - - name: Install Inno Setup - run: | - choco install innosetup - - name: Download the prerequisite software run: | cd imls-windows-installer @@ -36,9 +32,10 @@ jobs: - name: Build the installer run: | - # cd imls-windows-installer + cd imls-windows-installer # cd 'Inno Setup 6' - ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' + # ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' + iscc setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 From b75aeadb45851bbefbe549554350cc18eb8103bb Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Mon, 17 Oct 2022 13:08:38 -0400 Subject: [PATCH 03/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 2f459825..c3d8a151 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,8 +33,6 @@ jobs: - name: Build the installer run: | cd imls-windows-installer - # cd 'Inno Setup 6' - # ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' iscc setup.iss - name: Upload the artifact From 5cbc4d3146fa6d3d0befe3b69c6a230f77bee410 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Mon, 17 Oct 2022 13:17:27 -0400 Subject: [PATCH 04/29] Update setup.iss --- imls-windows-installer/setup.iss | 43 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/imls-windows-installer/setup.iss b/imls-windows-installer/setup.iss index db7a23b8..c228330f 100644 --- a/imls-windows-installer/setup.iss +++ b/imls-windows-installer/setup.iss @@ -103,6 +103,27 @@ Filename: "{app}\service\WinSw-x64.exe"; \ var IntroPage: TOutputMsgWizardPage; LibraryPage: TInputQueryWizardPage; + ExitCode: Integer; + FullFilePath: String; + + +procedure CurStepChanged(CurStep: TSetupStep); +begin + if CurStep = ssInstall then + begin + FullFilePath:= GetCurrentDir + '\wifi-hardware-search-windows.exe'; + //Run wifi-hardware-search + if ExecAsOriginalUser( + ExpandConstant(FullFilePath), '', '', SW_SHOW, ewWaitUntilTerminated, ExitCode) then + begin + if ExitCode <> 0 then begin + //wifi-hardware-search failed, abort install + SuppressibleMsgBox('Failed to find hardware device, aborting install.', mbError, MB_OK, IDOK); + Abort; + end; + end; + end; +end; procedure InitializeWizard; begin @@ -202,25 +223,3 @@ begin SetIniString('device', 'api_key', LibraryPage.Values[0], ExpandConstant(CurrentFileName)); SetIniString('device', 'fscs_id', LibraryPage.Values[1], ExpandConstant(CurrentFileName)); end; - -var - ExitCode: Integer; - FullFilePath: String; - -procedure CurStepChanged(CurStep: TSetupStep); -begin - if CurStep = ssInstall then - begin - FullFilePath:= GetCurrentDir + '\wifi-hardware-search-windows.exe'; - //Run wifi-hardware-search - if ExecAsOriginalUser( - ExpandConstant(FullFilePath), '', '', SW_SHOW, ewWaitUntilTerminated, ExitCode) then - begin - if ExitCode <> 0 then begin - //wifi-hardware-search failed, abort install - SuppressibleMsgBox('Failed to find hardware device, aborting install.', mbError, MB_OK, IDOK); - Abort; - end; - end; - end; -end; From 8a431503343ea9bcc8b33566ecb6e0a65c99e7be Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Mon, 17 Oct 2022 13:39:24 -0400 Subject: [PATCH 05/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index c3d8a151..38d01a53 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,7 +33,8 @@ jobs: - name: Build the installer run: | cd imls-windows-installer - iscc setup.iss + "%programfiles(x86)%\Inno Setup 6\iscc.exe" "setup.iss"\ + shell: cmd - name: Upload the artifact uses: actions/upload-artifact@v3 From 5e099056819ec7690fe29914e1271953ee24d9cf Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:36:15 -0400 Subject: [PATCH 06/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 38d01a53..cff71d78 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,8 +33,7 @@ jobs: - name: Build the installer run: | cd imls-windows-installer - "%programfiles(x86)%\Inno Setup 6\iscc.exe" "setup.iss"\ - shell: cmd + & "%programfiles(x86)%\Inno Setup 6\compil32.exe" /cc "setup.iss"\ - name: Upload the artifact uses: actions/upload-artifact@v3 From 02216473c5409c5af1535f47a148d987909156e9 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:49:56 -0400 Subject: [PATCH 07/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index cff71d78..c3d8a151 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,7 +33,7 @@ jobs: - name: Build the installer run: | cd imls-windows-installer - & "%programfiles(x86)%\Inno Setup 6\compil32.exe" /cc "setup.iss"\ + iscc setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 From 6b523f2a0b85542ed78377dbbb8dc3cb8831563e Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:52:55 -0400 Subject: [PATCH 08/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index c3d8a151..e5c62128 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -32,6 +32,7 @@ jobs: - name: Build the installer run: | + dir "env:ProgramFiles(x86)" cd imls-windows-installer iscc setup.iss From ec51399145a9d6440a8cb849156727757980126d Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:13:23 -0400 Subject: [PATCH 09/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index e5c62128..62780735 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -34,7 +34,7 @@ jobs: run: | dir "env:ProgramFiles(x86)" cd imls-windows-installer - iscc setup.iss + & "c:\program files (x86)\Inno Setup 6\iscc.exe" setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 From 3a2b62934be8e1497d4c2a8774721d90755db813 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:21:51 -0400 Subject: [PATCH 10/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 62780735..e2907a84 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,8 +33,10 @@ jobs: - name: Build the installer run: | dir "env:ProgramFiles(x86)" - cd imls-windows-installer - & "c:\program files (x86)\Inno Setup 6\iscc.exe" setup.iss + cd "C:\Program Files (x86)\Inno Setup 6" + ls + # cd imls-windows-installer + #& "c:\program files (x86)\Inno Setup 6\compil32.exe" setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 From fe54e63d5289edfe7474fd3027433df886c124e3 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:23:16 -0400 Subject: [PATCH 11/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index e2907a84..6472787f 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -32,11 +32,8 @@ jobs: - name: Build the installer run: | - dir "env:ProgramFiles(x86)" - cd "C:\Program Files (x86)\Inno Setup 6" - ls - # cd imls-windows-installer - #& "c:\program files (x86)\Inno Setup 6\compil32.exe" setup.iss + cd imls-windows-installer + & "c:\program files (x86)\Inno Setup 6\compil32.exe" /cc setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 From 1d4b4c6fb19a6a187a4f5538bd9e616539cc167d Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:25:13 -0400 Subject: [PATCH 12/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 6472787f..fe4b6c35 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,7 +33,7 @@ jobs: - name: Build the installer run: | cd imls-windows-installer - & "c:\program files (x86)\Inno Setup 6\compil32.exe" /cc setup.iss + & "c:\program files (x86)\Inno Setup 6\Compil32.exe" /cc setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 From c36255a40552fb76c5f0738a25e20b4ec684f46d Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:48:56 -0400 Subject: [PATCH 13/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index fe4b6c35..a93302d3 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,7 +33,7 @@ jobs: - name: Build the installer run: | cd imls-windows-installer - & "c:\program files (x86)\Inno Setup 6\Compil32.exe" /cc setup.iss + & "C:\Program Files (x86)\Inno Setup 6\iscc.exe" setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 From c9091ff86f70387931ce27d35ba597d6852093d7 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:04:18 -0400 Subject: [PATCH 14/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index a93302d3..a64d24a4 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -32,8 +32,8 @@ jobs: - name: Build the installer run: | - cd imls-windows-installer - & "C:\Program Files (x86)\Inno Setup 6\iscc.exe" setup.iss + cd 'imls-windows-installer\Inno Setup 6' + Compil32.exe /cc 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' - name: Upload the artifact uses: actions/upload-artifact@v3 From 93afdca5e8dbb2fc8971c7e0c4efe9cc8797ef3a Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:12:16 -0400 Subject: [PATCH 15/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index a64d24a4..407da6f8 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,7 +33,7 @@ jobs: - name: Build the installer run: | cd 'imls-windows-installer\Inno Setup 6' - Compil32.exe /cc 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' + & 'Compil32.exe' /cc 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' - name: Upload the artifact uses: actions/upload-artifact@v3 From 2149dcf9ffd3f69eeb9c975696df10e72326b02c Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:34:55 -0400 Subject: [PATCH 16/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 407da6f8..510d1bd4 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,7 +33,9 @@ jobs: - name: Build the installer run: | cd 'imls-windows-installer\Inno Setup 6' - & 'Compil32.exe' /cc 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' + ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' + cd $env:temp + Get-Content 'Setup Log 2022-10-18 #001.txt' - name: Upload the artifact uses: actions/upload-artifact@v3 From 36112cb15166954cc3d6d29786f52cd34248894f Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:40:28 -0400 Subject: [PATCH 17/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 510d1bd4..6770893c 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -35,6 +35,8 @@ jobs: cd 'imls-windows-installer\Inno Setup 6' ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' cd $env:temp + ls + cd 2 Get-Content 'Setup Log 2022-10-18 #001.txt' - name: Upload the artifact From 8388d93dc65dbfe0d582cfcb0ff994263b05d642 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:43:59 -0400 Subject: [PATCH 18/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 6770893c..4bc01dbd 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -36,7 +36,7 @@ jobs: ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' cd $env:temp ls - cd 2 + cd 1 Get-Content 'Setup Log 2022-10-18 #001.txt' - name: Upload the artifact From 3aa2c70e2acfc71672a1c798b413607493e7522c Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:51:59 -0400 Subject: [PATCH 19/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 4bc01dbd..848e8cb2 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -37,8 +37,7 @@ jobs: cd $env:temp ls cd 1 - Get-Content 'Setup Log 2022-10-18 #001.txt' - + ls - name: Upload the artifact uses: actions/upload-artifact@v3 with: From dd0c2c89de0836e9b98eb08bcdaf83b52fb8a346 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 12:57:37 -0400 Subject: [PATCH 20/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 848e8cb2..45d6fe6f 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -36,7 +36,7 @@ jobs: ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' cd $env:temp ls - cd 1 + cd '1' ls - name: Upload the artifact uses: actions/upload-artifact@v3 From 85b243253561783bf7a5c742881be7f8ea46a7a3 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 13:08:08 -0400 Subject: [PATCH 21/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 45d6fe6f..3a7ac411 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -34,10 +34,8 @@ jobs: run: | cd 'imls-windows-installer\Inno Setup 6' ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' - cd $env:temp + cd 'C:\Users\runneradmin\AppData\Local\Temp\1' ls - cd '1' - ls - name: Upload the artifact uses: actions/upload-artifact@v3 with: From 6a7f8f07f95f1d0fe204295adc69d559749a025c Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 13:28:43 -0400 Subject: [PATCH 22/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 3a7ac411..abd76fd6 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -35,7 +35,7 @@ jobs: cd 'imls-windows-installer\Inno Setup 6' ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' cd 'C:\Users\runneradmin\AppData\Local\Temp\1' - ls + Get-Content 'Setup Log 2022-10-18 #001.txt' - name: Upload the artifact uses: actions/upload-artifact@v3 with: From c7c12eca3a78bf4453d6d90ec3e47ab9fe114fcd Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 13:33:00 -0400 Subject: [PATCH 23/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index abd76fd6..2c6f49bf 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,9 +33,9 @@ jobs: - name: Build the installer run: | cd 'imls-windows-installer\Inno Setup 6' - ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' - cd 'C:\Users\runneradmin\AppData\Local\Temp\1' - Get-Content 'Setup Log 2022-10-18 #001.txt' + ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' /LOG="D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup_log.txt" + cd 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer' + Get-Content setup_log.txt - name: Upload the artifact uses: actions/upload-artifact@v3 with: From 04b65555dbbf4e441ec981530db9c3299437bd55 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 13:46:01 -0400 Subject: [PATCH 24/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 2c6f49bf..83cc5f2f 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -32,9 +32,8 @@ jobs: - name: Build the installer run: | - cd 'imls-windows-installer\Inno Setup 6' - ISCC.exe 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup.iss' /LOG="D:\a\estimating-wifi\estimating-wifi\imls-windows-installer\setup_log.txt" - cd 'D:\a\estimating-wifi\estimating-wifi\imls-windows-installer' + cd imls-windows-installer + iscc setup.iss /LOG="setup_log.txt" Get-Content setup_log.txt - name: Upload the artifact uses: actions/upload-artifact@v3 From 75ce1795dd6fd87bf1a166dad37c9fee48bcf31a Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 13:46:50 -0400 Subject: [PATCH 25/29] Update setup.iss --- imls-windows-installer/setup.iss | 37 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/imls-windows-installer/setup.iss b/imls-windows-installer/setup.iss index c228330f..a898e9af 100644 --- a/imls-windows-installer/setup.iss +++ b/imls-windows-installer/setup.iss @@ -105,25 +105,6 @@ var LibraryPage: TInputQueryWizardPage; ExitCode: Integer; FullFilePath: String; - - -procedure CurStepChanged(CurStep: TSetupStep); -begin - if CurStep = ssInstall then - begin - FullFilePath:= GetCurrentDir + '\wifi-hardware-search-windows.exe'; - //Run wifi-hardware-search - if ExecAsOriginalUser( - ExpandConstant(FullFilePath), '', '', SW_SHOW, ewWaitUntilTerminated, ExitCode) then - begin - if ExitCode <> 0 then begin - //wifi-hardware-search failed, abort install - SuppressibleMsgBox('Failed to find hardware device, aborting install.', mbError, MB_OK, IDOK); - Abort; - end; - end; - end; -end; procedure InitializeWizard; begin @@ -223,3 +204,21 @@ begin SetIniString('device', 'api_key', LibraryPage.Values[0], ExpandConstant(CurrentFileName)); SetIniString('device', 'fscs_id', LibraryPage.Values[1], ExpandConstant(CurrentFileName)); end; + +procedure CurStepChanged(CurStep: TSetupStep); +begin + if CurStep = ssInstall then + begin + FullFilePath:= GetCurrentDir + '\wifi-hardware-search-windows.exe'; + //Run wifi-hardware-search + if ExecAsOriginalUser( + ExpandConstant(FullFilePath), '', '', SW_SHOW, ewWaitUntilTerminated, ExitCode) then + begin + if ExitCode <> 0 then begin + //wifi-hardware-search failed, abort install + SuppressibleMsgBox('Failed to find hardware device, aborting install.', mbError, MB_OK, IDOK); + Abort; + end; + end; + end; +end; From 78804ea21d1efbbe20c3fe3b4cabcbc72e305e26 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 18 Oct 2022 14:11:39 -0400 Subject: [PATCH 26/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index 83cc5f2f..e66efc1b 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -33,8 +33,7 @@ jobs: - name: Build the installer run: | cd imls-windows-installer - iscc setup.iss /LOG="setup_log.txt" - Get-Content setup_log.txt + iscc setup.iss - name: Upload the artifact uses: actions/upload-artifact@v3 with: From c013c3a22d9f8e35946ebd80bd21d8c07b152efe Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Wed, 19 Oct 2022 09:21:04 -0400 Subject: [PATCH 27/29] Update automate_windows_build.yml --- .github/workflows/automate_windows_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automate_windows_build.yml b/.github/workflows/automate_windows_build.yml index e66efc1b..c24f6a0b 100644 --- a/.github/workflows/automate_windows_build.yml +++ b/.github/workflows/automate_windows_build.yml @@ -18,7 +18,7 @@ jobs: # This workflow contains a single job called "build" build: # The type of runner that the job will run on - runs-on: windows-latest + runs-on: windows-2019 # Steps represent a sequence of tasks that will be executed as part of the job steps: From 187e4e0d8850cc05199649f4fa103b91ef82f7c2 Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Mon, 24 Oct 2022 17:48:15 +0000 Subject: [PATCH 28/29] Update setup.iss --- imls-windows-installer/setup.iss | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/imls-windows-installer/setup.iss b/imls-windows-installer/setup.iss index a898e9af..3ed6abe4 100644 --- a/imls-windows-installer/setup.iss +++ b/imls-windows-installer/setup.iss @@ -53,26 +53,11 @@ Source:"WinSw-x64.exe"; \ Source:"WinSw-x64.xml"; \ DestDir: "{app}\service"; \ Flags: ignoreversion -; Wireshark 3.6.5 portable app -Source:"WiresharkPortable64_3.6.5.paf.exe"; \ - DestDir: "{app}\Wireshark"; \ - Flags: ignoreversion -Source:"npcap-1.60.exe"; \ - DestDir: "{app}\Wireshark"; \ - Flags: ignoreversion [Run] ;Filename: "{app}\{#MySecondaryAppExeName}"; \ ;Description: "wifi-hardware-search-windows"; \ ;Flags: runascurrentuser -Filename: "{app}\Wireshark\WiresharkPortable64_3.6.5.paf.exe"; \ - Description: "Wireshark 3.6.5"; \ - Parameters: "\D C:\imls"; \ - Flags: runascurrentuser -Filename: "{app}\Wireshark\npcap-1.60.exe"; \ - Description: "npcap 1.60"; \ - Parameters: "\D C:\imls"; \ - Flags: runascurrentuser Filename: "{app}\service\WinSw-x64.exe"; \ Parameters: "install"; \ Description: "WinSw-x64 install"; \ From cde879f02c50e5bc6dd3a7f5c44092dc4a19b3be Mon Sep 17 00:00:00 2001 From: Meenu Bhooshanan <108490143+meenubhooshanan@users.noreply.github.com> Date: Tue, 25 Oct 2022 10:52:44 -0400 Subject: [PATCH 29/29] Update setup.iss --- imls-windows-installer/setup.iss | 1 + 1 file changed, 1 insertion(+) diff --git a/imls-windows-installer/setup.iss b/imls-windows-installer/setup.iss index 3ed6abe4..d927307b 100644 --- a/imls-windows-installer/setup.iss +++ b/imls-windows-installer/setup.iss @@ -192,6 +192,7 @@ end; procedure CurStepChanged(CurStep: TSetupStep); begin + Log('CurStepChanged(' + IntToStr(Ord(CurStep)) + ') called'); if CurStep = ssInstall then begin FullFilePath:= GetCurrentDir + '\wifi-hardware-search-windows.exe';