summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOdd Stranne <odd@mullvad.net>2018-06-27 13:21:46 +0200
committerOdd Stranne <odd@mullvad.net>2018-06-29 11:48:30 +0200
commit5a8ff52371216537bc2b984bbc81f9aed2c0466b (patch)
tree7cc8f7f5272dcb0efa0dda4c633413cca208b2b4
parent2505dabe29fca85d38dd3277122c06b822634e8a (diff)
downloadmullvadvpn-5a8ff52371216537bc2b984bbc81f9aed2c0466b.tar.xz
mullvadvpn-5a8ff52371216537bc2b984bbc81f9aed2c0466b.zip
Rename build script to avoid any confusion with submodule having similar name
-rw-r--r--appveyor.yml2
-rwxr-xr-xbuild.sh2
-rw-r--r--build_windows_modules.sh (renamed from build_windows_libraries.sh)0
3 files changed, 2 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 8c5a2eeab6..9a26b5104d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -48,7 +48,7 @@ install:
# This is the "test phase", tweak it as you see fit
test_script:
- - bash -x build_windows_libraries.sh
+ - bash -x build_windows_modules.sh
- cargo build
- cargo test
diff --git a/build.sh b/build.sh
index afadb4d5fd..2cd5a8f817 100755
--- a/build.sh
+++ b/build.sh
@@ -104,7 +104,7 @@ sed -i.bak \
################################################################################
if [[ "$(uname -s)" == "MINGW"* ]]; then
- CPP_BUILD_MODES="Release" ./build_windows_libraries.sh $1
+ CPP_BUILD_MODES="Release" ./build_windows_modules.sh $1
fi
echo "Building Rust code in release mode using $RUSTC_VERSION..."
diff --git a/build_windows_libraries.sh b/build_windows_modules.sh
index b675112e28..b675112e28 100644
--- a/build_windows_libraries.sh
+++ b/build_windows_modules.sh