From 1457f0f017dd21538c4f08a3ee87c964fca937a0 Mon Sep 17 00:00:00 2001 From: Pedro Pombeiro Date: Tue, 4 Jun 2019 19:00:19 +0200 Subject: [PATCH] Some changes from the node2nix test branch that don't need to be there Signed-off-by: Pedro Pombeiro --- android/app/build.gradle | 10 +- ci/Jenkinsfile.android | 2 +- ci/Jenkinsfile.ios | 2 +- mobile_files/package.json.orig | 4 +- mobile_files/yarn.lock | 10 +- nix/desktop/realm-node/default.nix | 1 - nix/desktop/realm-node/generate-nix.sh | 22 +- nix/desktop/realm-node/output/default.nix | 6 +- .../realm-node/output/node-packages.nix | 20 +- nix/desktop/realm-node/output/supplement.nix | 683 ++++++++++++++++++ project.clj | 2 +- scripts/add-gcroots.sh | 2 +- scripts/build-desktop.sh | 35 +- scripts/gen-deps-hash.sh | 2 +- scripts/gen_build_no.sh | 2 +- scripts/lib/setup/packages.sh | 2 +- scripts/prepare-for-platform.sh | 2 +- scripts/run-osx | 86 --- scripts/toolversion | 2 +- scripts/update-status-go.sh | 2 +- shell.nix | 2 +- 21 files changed, 754 insertions(+), 145 deletions(-) create mode 100644 nix/desktop/realm-node/output/supplement.nix delete mode 100755 scripts/run-osx diff --git a/android/app/build.gradle b/android/app/build.gradle index 916d2adaa9..d0757b0f1a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -84,6 +84,10 @@ project.ext.react = [ bundleConfig: "packager/config.js" ] +configurations.all { + exclude group: 'com.facebook.react', module: 'react-native' +} + apply from: "../../node_modules/react-native/react.gradle" /** @@ -250,10 +254,6 @@ android { } } -configurations.all { - exclude group: 'com.facebook.react', module: 'react-native' -} - dependencies { implementation project(':react-native-background-timer') implementation project(':react-native-svg') @@ -305,7 +305,7 @@ task hemroidBuild(type: Exec) { def rootDir = project.rootDir def localProperties = new File(rootDir, "local.properties") - def ndkDir = "$System.env.ANDROID_NDK" + def ndkDir = System.env.ANDROID_NDK if (localProperties.exists()) { Properties properties = new Properties() localProperties.withInputStream { instr -> diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index 5db3c709af..1e406951af 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -64,7 +64,7 @@ pipeline { } stage('Build') { steps { - script { cmn.nix.shell('lein prod-build-android')} + script { cmn.nix.shell('make prod-build-android')} } } stage('Bundle') { diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index 18b3d670de..4ec99522cc 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -63,7 +63,7 @@ pipeline { } stage('Build') { steps { - script { cmn.nix.shell('lein prod-build-ios') } + script { cmn.nix.shell('make prod-build-ios') } } } stage('Bundle') { diff --git a/mobile_files/package.json.orig b/mobile_files/package.json.orig index 9bb5ed153e..44fb3bc449 100644 --- a/mobile_files/package.json.orig +++ b/mobile_files/package.json.orig @@ -38,7 +38,7 @@ "react-native-camera": "git+https://github.com/status-im/react-native-camera.git#v1.1.5-1-status", "react-native-config": "git+https://github.com/status-im/react-native-config.git#0.11.2-1", "react-native-crypto": "2.1.1", - "react-native-dialogs": "1.0.2", + "react-native-dialogs": "1.0.4", "react-native-fetch-polyfill": "1.1.2", "react-native-firebase": "git+https://github.com/status-im/react-native-firebase.git#v5.0.0-rc1-status", "react-native-fs": "2.11.15", @@ -61,7 +61,7 @@ "react-native-svg-transformer": "^0.12.1", "react-native-tcp": "git+https://github.com/status-im/react-native-tcp.git#v3.3.0-1-status", "react-native-touch-id": "^4.4.1", - "react-native-udp": "git+https://github.com/status-im/react-native-udp.git#2.3.1-1", + "react-native-udp": "git+https://github.com/status-im/react-native-udp.git#v2.3.1-1-status", "react-native-webview": "^5.2.1", "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/classnames-colision", "react-navigation": "^2.12.1", diff --git a/mobile_files/yarn.lock b/mobile_files/yarn.lock index 59c53c0b38..acc65c278b 100644 --- a/mobile_files/yarn.lock +++ b/mobile_files/yarn.lock @@ -5493,10 +5493,10 @@ react-native-crypto@2.1.1: pbkdf2 "3.0.8" public-encrypt "^4.0.0" -react-native-dialogs@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/react-native-dialogs/-/react-native-dialogs-1.0.2.tgz#d16d68cecbd57f74904fb2d58fd846622d5fec9a" - integrity sha512-3hH6s67RD6w9MVttqWARnto3wnmSgnwPCzsk4aVaQbFjtgVZQecn+oP+jqj01G6OvxAtuG7aSe62fYGs5xileA== +react-native-dialogs@1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/react-native-dialogs/-/react-native-dialogs-1.0.4.tgz#c3bcee4a8a4ca2e97131bd5ffaed8db6ab1dec48" + integrity sha512-Q3e4bAPp13jnPkStKYzyE/pb6xVY1spSlGHzq3zljV7uMXqFHjuTBRiM/qfm2bSZplR/znzVS/y2TtcW+1aufQ== react-native-dismiss-keyboard@1.0.0: version "1.0.0" @@ -5683,7 +5683,7 @@ react-native-touch-id@^4.4.1: resolved "https://registry.yarnpkg.com/react-native-touch-id/-/react-native-touch-id-4.4.1.tgz#8b1bb2d04c30bac36bb9696d2d723e719c4a8b08" integrity sha512-1jTl8fC+0fxvqegy/XXTyo6vMvPhjzkoDdaqoYZx0OH8AT250NuXnNPyKktvigIcys3+2acciqOeaCall7lrvg== -"react-native-udp@git+https://github.com/status-im/react-native-udp.git#2.3.1-1": +"react-native-udp@git+https://github.com/status-im/react-native-udp.git#v2.3.1-1-status": version "2.3.1" resolved "git+https://github.com/status-im/react-native-udp.git#6e9a817326208f6ca36fa42b20f5e530c1b39d37" dependencies: diff --git a/nix/desktop/realm-node/default.nix b/nix/desktop/realm-node/default.nix index 17f6438889..6898130bac 100644 --- a/nix/desktop/realm-node/default.nix +++ b/nix/desktop/realm-node/default.nix @@ -22,7 +22,6 @@ let nodePackages = import ./output { inherit pkgs nodejs; }; "$out/lib/node_modules/realm/compiled/node-v64_linux_x64/realm.node"; in nodePackages // { ${realm-patched-name} = nodePackages.${realm-patched-name}.override(oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ pkgs.nodePackages.node-pre-gyp ]; reconstructLock = true; preRebuild = '' # Do not attempt to do any http calls! diff --git a/nix/desktop/realm-node/generate-nix.sh b/nix/desktop/realm-node/generate-nix.sh index 7f693c6474..d3244848a8 100755 --- a/nix/desktop/realm-node/generate-nix.sh +++ b/nix/desktop/realm-node/generate-nix.sh @@ -5,12 +5,13 @@ # Prerequisites: Node, npm, and node2nix (installed with npm i -g https://github.com/svanderburg/node2nix) # -GIT_ROOT=$(git rev-parse --show-toplevel) +GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" toolversion="${GIT_ROOT}/scripts/toolversion" dir="$SCRIPTPATH" input="${dir}/output/node-packages.json" output_dir="${dir}/output" +supplement_input="${dir}/output/supplement.json" rm -rf $output_dir && mkdir -p $output_dir # Specify the package.json file containing the dependencies to install @@ -20,12 +21,21 @@ cat << EOF > $input ] EOF +# Specify the package.json file containing the build dependencies to install +cat << EOF > $supplement_input +[ + "node-pre-gyp" +] +EOF + node_required_version=$($toolversion node) node_major_version=$(echo $node_required_version | cut -d. -f1,1) node2nix --nodejs-${node_major_version} --bypass-cache \ - -i $input \ - -o $output_dir/node-packages.nix \ - -c $output_dir/default.nix \ - -e $output_dir/node-env.nix -rm $input + --input $input \ + --output $output_dir/node-packages.nix \ + --supplement-input $supplement_input \ + --supplement-output $output_dir/supplement.nix \ + --composition $output_dir/default.nix \ + --node-env $output_dir/node-env.nix +rm $input $supplement_input diff --git a/nix/desktop/realm-node/output/default.nix b/nix/desktop/realm-node/output/default.nix index 6689fdd16f..49a790a068 100644 --- a/nix/desktop/realm-node/output/default.nix +++ b/nix/desktop/realm-node/output/default.nix @@ -5,6 +5,10 @@ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let + globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix { + inherit nodeEnv; + inherit (pkgs) fetchurl fetchgit; + }); nodeEnv = import ./node-env.nix { inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; inherit nodejs; @@ -13,5 +17,5 @@ let in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; + inherit nodeEnv globalBuildInputs; } \ No newline at end of file diff --git a/nix/desktop/realm-node/output/node-packages.nix b/nix/desktop/realm-node/output/node-packages.nix index 7dd2bf8226..31eddbed5a 100644 --- a/nix/desktop/realm-node/output/node-packages.nix +++ b/nix/desktop/realm-node/output/node-packages.nix @@ -994,13 +994,13 @@ let sha512 = "NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ=="; }; }; - "node-machine-id-1.1.10" = { + "node-machine-id-1.1.12" = { name = "node-machine-id"; packageName = "node-machine-id"; - version = "1.1.10"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.10.tgz"; - sha512 = "6SVxo3Ic2Qc09z1rCJh3No7ubizPLszImsMQnZZWfzeOC6SYU4orN214++c3ikB8uaP/A6dwSlO88A3ohI5oNA=="; + url = "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz"; + sha512 = "QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ=="; }; }; "node-pre-gyp-0.11.0" = { @@ -1210,13 +1210,13 @@ let sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; }; }; - "psl-1.1.31" = { + "psl-1.1.32" = { name = "psl"; packageName = "psl"; - version = "1.1.31"; + version = "1.1.32"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz"; - sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw=="; + url = "https://registry.npmjs.org/psl/-/psl-1.1.32.tgz"; + sha512 = "MHACAkHpihU/REGGPLj4sEfc/XKW2bheigvHO1dUqjaKigMp1C8+WLQYRGgeKFMsw5PMfegZcaN8IDXK/cD0+g=="; }; }; "punycode-1.4.1" = { @@ -1789,7 +1789,7 @@ in sources."nan-2.14.0" sources."needle-2.4.0" sources."node-fetch-1.7.3" - sources."node-machine-id-1.1.10" + sources."node-machine-id-1.1.12" sources."node-pre-gyp-0.11.0" sources."nopt-4.0.1" sources."npm-bundled-1.0.6" @@ -1812,7 +1812,7 @@ in sources."progress-2.0.3" sources."promise-7.3.1" sources."prop-types-15.7.2" - sources."psl-1.1.31" + sources."psl-1.1.32" sources."punycode-2.1.1" sources."qs-6.5.2" sources."querystringify-2.1.1" diff --git a/nix/desktop/realm-node/output/supplement.nix b/nix/desktop/realm-node/output/supplement.nix new file mode 100644 index 0000000000..e2ffec3d4b --- /dev/null +++ b/nix/desktop/realm-node/output/supplement.nix @@ -0,0 +1,683 @@ +# This file has been generated by node2nix 1.6.1. Do not edit! + +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "abbrev-1.1.1" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"; + sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; + }; + }; + "ansi-regex-2.1.1" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; + sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + }; + }; + "aproba-1.2.0" = { + name = "aproba"; + packageName = "aproba"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz"; + sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + }; + }; + "are-we-there-yet-1.1.5" = { + name = "are-we-there-yet"; + packageName = "are-we-there-yet"; + version = "1.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz"; + sha512 = "5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w=="; + }; + }; + "balanced-match-1.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; + sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "chownr-1.1.1" = { + name = "chownr"; + packageName = "chownr"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz"; + sha512 = "j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="; + }; + }; + "code-point-at-1.1.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; + sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "console-control-strings-1.1.0" = { + name = "console-control-strings"; + packageName = "console-control-strings"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"; + sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "debug-3.2.6" = { + name = "debug"; + packageName = "debug"; + version = "3.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; + sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + }; + }; + "deep-extend-0.6.0" = { + name = "deep-extend"; + packageName = "deep-extend"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz"; + sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; + }; + }; + "delegates-1.0.0" = { + name = "delegates"; + packageName = "delegates"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; + sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + }; + }; + "detect-libc-1.0.3" = { + name = "detect-libc"; + packageName = "detect-libc"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; + sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + }; + }; + "fs-minipass-1.2.6" = { + name = "fs-minipass"; + packageName = "fs-minipass"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz"; + sha512 = "crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ=="; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "gauge-2.7.4" = { + name = "gauge"; + packageName = "gauge"; + version = "2.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz"; + sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; + }; + }; + "glob-7.1.4" = { + name = "glob"; + packageName = "glob"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; + }; + }; + "has-unicode-2.0.1" = { + name = "has-unicode"; + packageName = "has-unicode"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"; + sha1 = "e0e6fe6a28cf51138855e086d1691e771de2a8b9"; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ignore-walk-3.0.1" = { + name = "ignore-walk"; + packageName = "ignore-walk"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz"; + sha512 = "DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "ini-1.3.5" = { + name = "ini"; + packageName = "ini"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; + sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "minipass-2.3.5" = { + name = "minipass"; + packageName = "minipass"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz"; + sha512 = "Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA=="; + }; + }; + "minizlib-1.2.1" = { + name = "minizlib"; + packageName = "minizlib"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz"; + sha512 = "7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA=="; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "needle-2.4.0" = { + name = "needle"; + packageName = "needle"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz"; + sha512 = "4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg=="; + }; + }; + "nopt-4.0.1" = { + name = "nopt"; + packageName = "nopt"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz"; + sha1 = "d0d4685afd5415193c8c7505602d0d17cd64474d"; + }; + }; + "npm-bundled-1.0.6" = { + name = "npm-bundled"; + packageName = "npm-bundled"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz"; + sha512 = "8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g=="; + }; + }; + "npm-packlist-1.4.1" = { + name = "npm-packlist"; + packageName = "npm-packlist"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz"; + sha512 = "+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw=="; + }; + }; + "npmlog-4.1.2" = { + name = "npmlog"; + packageName = "npmlog"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz"; + sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + }; + }; + "number-is-nan-1.0.1" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "os-homedir-1.0.2" = { + name = "os-homedir"; + packageName = "os-homedir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + }; + }; + "os-tmpdir-1.0.2" = { + name = "os-tmpdir"; + packageName = "os-tmpdir"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + }; + }; + "osenv-0.1.5" = { + name = "osenv"; + packageName = "osenv"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz"; + sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "process-nextick-args-2.0.0" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz"; + sha512 = "MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="; + }; + }; + "rc-1.2.8" = { + name = "rc"; + packageName = "rc"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz"; + sha512 = "y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw=="; + }; + }; + "readable-stream-2.3.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz"; + sha512 = "tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw=="; + }; + }; + "rimraf-2.6.3" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"; + sha512 = "mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "sax-1.2.4" = { + name = "sax"; + packageName = "sax"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; + sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; + }; + }; + "semver-5.7.0" = { + name = "semver"; + packageName = "semver"; + version = "5.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz"; + sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="; + }; + }; + "set-blocking-2.0.0" = { + name = "set-blocking"; + packageName = "set-blocking"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; + sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + }; + }; + "signal-exit-3.0.2" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; + sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "strip-json-comments-2.0.1" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; + sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + }; + }; + "tar-4.4.8" = { + name = "tar"; + packageName = "tar"; + version = "4.4.8"; + src = fetchurl { + url = "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz"; + sha512 = "LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ=="; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "wide-align-1.1.3" = { + name = "wide-align"; + packageName = "wide-align"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz"; + sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "yallist-3.0.3" = { + name = "yallist"; + packageName = "yallist"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz"; + sha512 = "S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="; + }; + }; + }; +in +{ + node-pre-gyp = nodeEnv.buildNodePackage { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz"; + sha512 = "Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ=="; + }; + dependencies = [ + sources."abbrev-1.1.1" + sources."ansi-regex-2.1.1" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."chownr-1.1.1" + sources."code-point-at-1.1.0" + sources."concat-map-0.0.1" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-3.2.6" + sources."deep-extend-0.6.0" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."fs-minipass-1.2.6" + sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" + sources."glob-7.1.4" + sources."has-unicode-2.0.1" + sources."iconv-lite-0.4.24" + sources."ignore-walk-3.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."ini-1.3.5" + sources."is-fullwidth-code-point-1.0.0" + sources."isarray-1.0.0" + sources."minimatch-3.0.4" + sources."minimist-0.0.8" + sources."minipass-2.3.5" + sources."minizlib-1.2.1" + sources."mkdirp-0.5.1" + sources."ms-2.1.1" + sources."needle-2.4.0" + sources."nopt-4.0.1" + sources."npm-bundled-1.0.6" + sources."npm-packlist-1.4.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" + sources."path-is-absolute-1.0.1" + sources."process-nextick-args-2.0.0" + (sources."rc-1.2.8" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + sources."readable-stream-2.3.6" + sources."rimraf-2.6.3" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + sources."sax-1.2.4" + sources."semver-5.7.0" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.2" + sources."string-width-1.0.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-3.0.1" + sources."strip-json-comments-2.0.1" + sources."tar-4.4.8" + sources."util-deprecate-1.0.2" + sources."wide-align-1.1.3" + sources."wrappy-1.0.2" + sources."yallist-3.0.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Node.js native addon binary install tool"; + homepage = "https://github.com/mapbox/node-pre-gyp#readme"; + license = "BSD-3-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +} \ No newline at end of file diff --git a/project.clj b/project.clj index 65e706b7ca..4a7067ea5e 100644 --- a/project.clj +++ b/project.clj @@ -40,7 +40,7 @@ "prod-build-ios" ^{:doc "Recompile code for iOS with prod profile."} ["do" "clean" ["with-profile" "prod" "cljsbuild" "once" "ios"]] - "prod-build-desktop" ^{:doc "Recompile code for desktop with prod profile."} + "prod-build-desktop" ^{:doc "Recompile code for desktop with prod profile."} ["do" "clean" ["with-profile" "prod" "cljsbuild" "once" "desktop"]] "figwheel-repl" ["with-profile" "+figwheel" "run" "-m" "clojure.main" "env/dev/run.clj"] diff --git a/scripts/add-gcroots.sh b/scripts/add-gcroots.sh index ffb81516ab..a208928606 100755 --- a/scripts/add-gcroots.sh +++ b/scripts/add-gcroots.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -GIT_ROOT=$(git rev-parse --show-toplevel) +GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) rm -rf .nix-gcroots mkdir .nix-gcroots diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh index ad7fe1e89d..46be089561 100755 --- a/scripts/build-desktop.sh +++ b/scripts/build-desktop.sh @@ -81,12 +81,12 @@ if is_windows_target; then CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DCMAKE_RC_COMPILER='x86_64-w64-mingw32.shared-windres'" fi -STATUSREACTPATH="$(cd "$SCRIPTPATH" && cd '..' && pwd)" -WORKFOLDER="$(joinExistingPath "$STATUSREACTPATH" 'StatusImPackage')" +WORKFOLDER="$(joinExistingPath "$STATUS_REACT_HOME" 'StatusImPackage')" +JS_BUNDLE_PATH="$WORKFOLDER/index.desktop.bundle" function init() { - if [ -z $STATUSREACTPATH ]; then - echo "${RED}STATUSREACTPATH environment variable is not defined!${NC}" + if [ -z $STATUS_REACT_HOME ]; then + echo "${RED}STATUS_REACT_HOME environment variable is not defined!${NC}" exit 1 fi @@ -101,7 +101,7 @@ function init() { rm -rf ./desktop/toolchain/ # TODO: Use Conan for Linux and MacOS builds too if is_windows_target; then - export PATH=$STATUSREACTPATH:$PATH + export PATH=$STATUS_REACT_HOME:$PATH if ! program_exists 'conan'; then echo "${RED}Conan package manager not found. Exiting...${NC}" exit 1 @@ -136,8 +136,8 @@ function buildClojureScript() { echo "" # from index.desktop.js create javascript bundle and resources folder - echo "Generating Status.jsbundle and assets folder..." - react-native bundle --entry-file index.desktop.js --bundle-output "$WORKFOLDER/Status.jsbundle" \ + echo "Generating $JS_BUNDLE_PATH and assets folder..." + react-native bundle --entry-file index.desktop.js --bundle-output "$JS_BUNDLE_PATH" \ --dev false --platform desktop --assets-dest "$WORKFOLDER/assets" echo -e "${GREEN}Generating done.${NC}" echo "" @@ -145,9 +145,8 @@ function buildClojureScript() { function compile() { # Temporarily add path to javascript bundle to package.json - local JS_BUNDLE_PATH="$WORKFOLDER/Status.jsbundle" local jsBundleLine="\"desktopJSBundlePath\": \"$JS_BUNDLE_PATH\"" - local jsPackagePath=$(joinExistingPath "$STATUSREACTPATH" 'desktop_files/package.json.orig') + local jsPackagePath=$(joinExistingPath "$STATUS_REACT_HOME" 'desktop_files/package.json.orig') local tmp=$(mktemp) jq ".=(. + {$jsBundleLine})" "$jsPackagePath" > "$tmp" && mv "$tmp" "$jsPackagePath" echo -e "${YELLOW}Added 'desktopJSBundlePath' line to $jsPackagePath:${NC}" @@ -158,7 +157,7 @@ function compile() { pushd desktop rm -rf CMakeFiles CMakeCache.txt cmake_install.cmake Makefile modules reportApp/CMakeFiles desktop/node_modules/google-breakpad/CMakeFiles desktop/node_modules/react-native-keychain/desktop/qtkeychain-prefix/src/qtkeychain-build/CMakeFiles desktop/node_modules/react-native-keychain/desktop/qtkeychain if is_windows_target; then - export PATH=$STATUSREACTPATH:$PATH + export PATH=$STATUS_REACT_HOME:$PATH # Get the toolchain bin folder from toolchain/conanbuildinfo.json local bin_dirs=$(jq -r '.dependencies[0].bin_paths | .[]' toolchain/conanbuildinfo.json) @@ -185,14 +184,14 @@ function compile() { function bundleWindows() { local buildType="$1" - local version_file="${STATUSREACTPATH}/VERSION" + local version_file="${STATUS_REACT_HOME}/VERSION" VERSION=$(cat $version_file) if [ -z "$VERSION" ]; then echo "${RED}Could not read version from ${version_file}!${NC}" exit 1 fi - pushd $STATUSREACTPATH/desktop/bin + pushd $STATUS_REACT_HOME/desktop/bin rm -rf cmake_install.cmake Makefile CMakeFiles Status_autogen popd @@ -206,7 +205,7 @@ function bundleWindows() { fi # TODO this needs to be fixed: status-react/issues/5378 - local top_srcdir=$(joinExistingPath "$STATUSREACTPATH" '.') + local top_srcdir=$(joinExistingPath "$STATUS_REACT_HOME" '.') VERSION_MAJOR="$(cut -d'.' -f1 <<<"$VERSION")" VERSION_MINOR="$(cut -d'.' -f2 <<<"$VERSION")" VERSION_BUILD="$(cut -d'.' -f3 <<<"$VERSION")" @@ -263,8 +262,8 @@ function bundleLinux() { -no-translations -bundle-non-qt-libs \ -qmake="$qmakePath" \ -executable="$(joinExistingPath "$usrBinPath" 'reportApp')" \ - -qmldir="$(joinExistingPath "$STATUSREACTPATH" 'node_modules/react-native')" \ - -qmldir="$(joinExistingPath "$STATUSREACTPATH" 'desktop/reportApp')" \ + -qmldir="$(joinExistingPath "$STATUS_REACT_HOME" 'node_modules/react-native')" \ + -qmldir="$(joinExistingPath "$STATUS_REACT_HOME" 'desktop/reportApp')" \ -extra-plugins=imageformats/libqsvg.so pushd $WORKFOLDER @@ -410,7 +409,7 @@ if is_macos; then fixupRPathsInDylib "$dylib" "$contentsDir" # Sanity check for absolute paths - local dependencies=$(otool -L "$dylib" | grep -E "\s+${STATUSREACTPATH}") + local dependencies=$(otool -L "$dylib" | grep -E "\s+${STATUS_REACT_HOME}") if [ -n "$dependencies" ]; then echo "Absolute path detected in dependencies of $dylib. Aborting..." echo "${dependencies[@]}" @@ -456,8 +455,8 @@ function bundleMacOS() { macdeployqt Status.app \ -verbose=$VERBOSE_LEVEL \ -executable="$(joinExistingPath "$usrBinPath" 'reportApp')" \ - -qmldir="$(joinExistingPath "$STATUSREACTPATH" 'node_modules/react-native')" \ - -qmldir="$(joinExistingPath "$STATUSREACTPATH" 'desktop/reportApp')" + -qmldir="$(joinExistingPath "$STATUS_REACT_HOME" 'node_modules/react-native')" \ + -qmldir="$(joinExistingPath "$STATUS_REACT_HOME" 'desktop/reportApp')" # macdeployqt doesn't fix rpaths for all the libraries (although it copies them all), so we'll just walk through them and update rpaths to not point to /nix echo "Fixing remaining rpaths in modules..." diff --git a/scripts/gen-deps-hash.sh b/scripts/gen-deps-hash.sh index e0f20b06a8..09cfc79953 100755 --- a/scripts/gen-deps-hash.sh +++ b/scripts/gen-deps-hash.sh @@ -6,7 +6,7 @@ # the combined versions of all the specified tools. ################################################################################ -GIT_ROOT=$(git rev-parse --show-toplevel) +GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) toolversion="${GIT_ROOT}/scripts/toolversion" usage () { diff --git a/scripts/gen_build_no.sh b/scripts/gen_build_no.sh index 3b5e2c9be1..232d70739c 100755 --- a/scripts/gen_build_no.sh +++ b/scripts/gen_build_no.sh @@ -14,7 +14,7 @@ # Fail on first error set -e -GIT_ROOT=$(git rev-parse --show-toplevel) +GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) BUILD_NUMBER_FILE="${GIT_ROOT}/BUILD_NUMBER" if [[ -f "${BUILD_NUMBER_FILE}" ]]; then diff --git a/scripts/lib/setup/packages.sh b/scripts/lib/setup/packages.sh index f49e0a53d5..2cc4f9698c 100755 --- a/scripts/lib/setup/packages.sh +++ b/scripts/lib/setup/packages.sh @@ -4,7 +4,7 @@ # Install checks ######## -GIT_ROOT=$(git rev-parse --show-toplevel) +GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) function program_exists() { local program=$1 diff --git a/scripts/prepare-for-platform.sh b/scripts/prepare-for-platform.sh index 2199e234fc..7f20239613 100755 --- a/scripts/prepare-for-platform.sh +++ b/scripts/prepare-for-platform.sh @@ -8,7 +8,7 @@ set -e -GIT_ROOT=$(git rev-parse --show-toplevel) +GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel) RED='\033[0;31m' GREEN='\033[0;32m' diff --git a/scripts/run-osx b/scripts/run-osx deleted file mode 100755 index 0f14e731ab..0000000000 --- a/scripts/run-osx +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh - -[ `uname -s` != "Darwin" ] && return - -function tab () { - local cmd="" - local cdto="$PWD" - local args="$@" - - if [ -d "$1" ]; then - cdto=`cd "$1"; pwd` - args="${@:2}" - fi - - if [ -n "$args" ]; then - cmd="; $args" - fi - - iterm_exists=`osascript -e "id of application \"iterm2\""` - if [ ! -z iterm_exists ]; then - osascript &>/dev/null </dev/null <