diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-12-20 12:59:16 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-12-20 12:59:16 +0100 |
| commit | 1acfa0ca840a53173ce1f3118fd5380891e395c7 (patch) | |
| tree | 2e619a9bd9bf1329efff4738c8fc67462e3053bf | |
| parent | 2aae380b0af018bf0187bb31fb0fedf6a457ebf1 (diff) | |
| parent | 43d8ac288625df60c771395c496d5d3931001f19 (diff) | |
| download | mullvadvpn-1acfa0ca840a53173ce1f3118fd5380891e395c7.tar.xz mullvadvpn-1acfa0ca840a53173ce1f3118fd5380891e395c7.zip | |
Merge branch 'fix-electron-builder-paths'
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | app/lib/proc.js | 2 | ||||
| m--------- | client-binaries | 0 | ||||
| -rw-r--r-- | electron-builder.yml | 28 |
4 files changed, 18 insertions, 15 deletions
diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..9a71630149 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "client-binaries"] + path = client-binaries + url = https://github.com/mullvad/client-binaries.git diff --git a/app/lib/proc.js b/app/lib/proc.js index d11fa392a5..f7603bbdff 100644 --- a/app/lib/proc.js +++ b/app/lib/proc.js @@ -9,7 +9,7 @@ export function resolveBin(binaryName: string) { function getBasePath() { if (process.env.NODE_ENV === 'development') { - return process.env.MULLVAD_BACKEND || '../talpid_core/target/debug'; + return process.env.MULLVAD_BACKEND || './target/debug'; } else { return process.resourcesPath; diff --git a/client-binaries b/client-binaries new file mode 160000 +Subproject 114db9ca1f8f4625e5781274fadc0ea29e32fe4 diff --git a/electron-builder.yml b/electron-builder.yml index 9ee1544941..b4053a8d4d 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -14,7 +14,7 @@ extraResources: to: . - from: dist-assets/relays.json to: . - - from: ../talpid_core/CHANGELOG.md + - from: CHANGELOG.md to: . directories: @@ -45,15 +45,15 @@ mac: extendInfo: LSUIElement: true extraResources: - - from: ../talpid_core/target/release/mullvad + - from: ./target/release/mullvad to: . - - from: ../talpid_core/target/release/problem-report + - from: ./target/release/problem-report to: . - - from: ../talpid_core/target/release/mullvad-daemon + - from: ./target/release/mullvad-daemon to: . - - from: ../talpid_core/target/release/libtalpid_openvpn_plugin.dylib + - from: ./target/release/libtalpid_openvpn_plugin.dylib to: . - - from: ../client-binaries/mac/include/openvpn + - from: ./client-binaries/mac/include/openvpn to: ./openvpn-binaries/openvpn win: @@ -61,13 +61,13 @@ win: - nsis artifactName: ${productName}-${version}.${ext} extraResources: - - from: ../talpid_core/target/release/mullvad.exe + - from: ./target/release/mullvad.exe to: . - - from: ../talpid_core/target/release/problem-report.exe + - from: ./target/release/problem-report.exe to: . - - from: ../talpid_core/target/release/mullvad-daemon.exe + - from: ./target/release/mullvad-daemon.exe to: . - - from: ../talpid_core/target/release/libtalpid_openvpn_plugin.dll + - from: ./target/release/libtalpid_openvpn_plugin.dll to: . linux: @@ -75,11 +75,11 @@ linux: - deb artifactName: ${productName}-${version}_${arch}.${ext} extraResources: - - from: ../talpid_core/target/release/mullvad + - from: ./target/release/mullvad to: . - - from: ../talpid_core/target/release/problem-report + - from: ./target/release/problem-report to: . - - from: ../talpid_core/target/release/mullvad-daemon + - from: ./target/release/mullvad-daemon to: . - - from: ../talpid_core/target/release/libtalpid_openvpn_plugin.so + - from: ./target/release/libtalpid_openvpn_plugin.so to: . |