From dcda3c3cbcea37fb3f81056a77c54a39c21817cb Mon Sep 17 00:00:00 2001 From: crusader Date: Thu, 4 Oct 2018 18:50:51 +0900 Subject: [PATCH] ing --- config/build/win/nsis/installer.nsh | 17 +++-------------- electron-builder.json | 9 +++++++-- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/config/build/win/nsis/installer.nsh b/config/build/win/nsis/installer.nsh index 0b81b8a..761ba84 100644 --- a/config/build/win/nsis/installer.nsh +++ b/config/build/win/nsis/installer.nsh @@ -1,19 +1,8 @@ -Var SystemDrive - !macro preInit - ReadEnvStr $SystemDrive SYSTEMDRIVE - SetRegView 64 - WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$SystemDrive\앱이설치될폴더명" - WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$SystemDrive\앱이설치될폴더명" - SetRegView 32 - WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$SystemDrive\앱이설치될폴더명" - WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$SystemDrive\앱이설치될폴더명" + !macroend !macro customInstall - - File "${BUILD_RESOURCES_DIR}\drivers\nrfconnect-driver-installer.exe" - - ExecWait '"$INSTDIR\nrfconnect-driver-installer.exe" /npf_startup=yes /admin_only=no /dot11_support=yes /vlan_support=yes /winpcap_mode=yes' - + File "${BUILD_RESOURCES_DIR}\bin\npcap-0.99-r7.exe" + ExecWait '"$INSTDIR\npcap-0.99-r7.exe" /npf_startup=yes /loopback_support=yes /admin_only=no /dot11_support=yes /vlan_support=yes /winpcap_mode=yes' !macroend \ No newline at end of file diff --git a/electron-builder.json b/electron-builder.json index 13f1b1a..cc9d34b 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -108,8 +108,12 @@ "icon": "config/build/win/icon/overflow_256.ico", "extraResources": [ { - "from": "config/build/${os}/bin/probe-${os}-${arch}.exe", + "from": "config/build/win/bin/probe-${os}-${arch}.exe", "to": "./bin/probe.exe" + }, + { + "from": "config/build/win/bin/npcap-0.99-r7.exe", + "to": "./bin/npcap-0.99-r7.exe" } ] }, @@ -119,6 +123,7 @@ "allowToChangeInstallationDirectory": false, "installerIcon": "win/icon/overflow_256.ico", "uninstallerIcon": "win/icon/overflow_256.ico", - "menuCategory": "overFlow" + "menuCategory": "overFlow", + "include": "config/build/win/nsis/installer.nsh" } } \ No newline at end of file