attempt

client/src/electron/custom_install_steps.nsh

@@ -52,15 +52,15 @@ ${StrRep}
     File /r "${PROJECT_DIR}\third_party\tap-windows6\bin\i386\*"
   ${EndIf}
   SetOutPath -
-  File "${PROJECT_DIR}\src\electron\add_tap_device.bat"
-  File "${PROJECT_DIR}\src\electron\find_tap_device_name.bat"
+  File "${PROJECT_DIR}\client\src\electron\add_tap_device.bat"
+  File "${PROJECT_DIR}\client\src\electron\find_tap_device_name.bat"
 
   ; OutlineService files, stopping the service first in case it's still running.
   nsExec::Exec "$SYSDIR\net stop OutlineService"
-  File "${PROJECT_DIR}\tools\OutlineService\OutlineService\bin\OutlineService.exe"
-  File "${PROJECT_DIR}\tools\smartdnsblock\bin\smartdnsblock.exe"
+  File "${PROJECT_DIR}\client\tools\OutlineService\OutlineService\bin\OutlineService.exe"
+  File "${PROJECT_DIR}\client\tools\smartdnsblock\bin\smartdnsblock.exe"
   File "${PROJECT_DIR}\third_party\newtonsoft\Newtonsoft.Json.dll"
-  File "${PROJECT_DIR}\src\electron\install_windows_service.bat"
+  File "${PROJECT_DIR}\client\src\electron\install_windows_service.bat"
 
   ; ExecToStack captures both stdout and stderr from the script, in the order output.
   ; Set a (long) timeout in case the device never becomes visible to netsh.

client/src/electron/electron-builder.json

@@ -1,17 +1,17 @@
 {
-  "files": ["build/electron", "www", "resources/tray", "!node_modules/electron"],
-  "asarUnpack": ["third_party", "tools"],
+  "files": ["client/build/electron", "client/www", "client/resources/tray", "!node_modules/electron"],
+  "asarUnpack": ["third_party", "client/tools"],
   "artifactName": "Outline-Client.${ext}",
   "directories": {
-    "output": "output/build/dist"
+    "output": "client/output/build/dist"
   },
   "linux": {
     "target": {
       "target": "AppImage",
       "arch": ["x64"]
     },
-    "files": ["build/icons/png", "output/build/linux", "tools/outline_proxy_controller/dist"],
-    "icon": "build/icons/png",
+    "files": ["client/build/icons/png", "client/output/build/linux", "client/tools/outline_proxy_controller/dist"],
+    "icon": "client/build/icons/png",
     "category": "Network"
   },
   "win": {
@@ -21,13 +21,13 @@
         "arch": "ia32"
       }
     ],
-    "files": ["output/build/windows"],
-    "icon": "build/icons/win/icon.ico",
-    "sign": "src/electron/windows/electron_builder_signing_plugin.cjs",
+    "files": ["client/output/build/windows"],
+    "icon": "client/build/icons/win/icon.ico",
+    "sign": "client/src/electron/windows/electron_builder_signing_plugin.cjs",
     "signingHashAlgorithms": ["sha256"]
   },
   "nsis": {
     "perMachine": true,
-    "include": "src/electron/custom_install_steps.nsh"
+    "include": "client/src/electron/custom_install_steps.nsh"
   }
 }

client/src/electron/windows/sign_windows_executable.action.mjs

@@ -19,7 +19,7 @@ import {dirname, resolve} from 'path';
 import {fileURLToPath, pathToFileURL} from 'url';
 import {format} from 'util';
 
-import {jsign} from '../../../third_party/jsign/index.mjs';
+import {jsign} from '../../../../../third_party/jsign/index.mjs';
 
 /**
  * Get the parent folder path of this script.