From 0d3640609e8197e553a8b2556867377109b915b9 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 22 Oct 2018 19:11:18 +0200 Subject: [PATCH] Make watchos.sh looks like other scripts --- dist-build/Makefile.am | 3 ++- dist-build/{watchOS.sh => watchos.sh} | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) rename dist-build/{watchOS.sh => watchos.sh} (94%) diff --git a/dist-build/Makefile.am b/dist-build/Makefile.am index 3d0a0e63..63a8298f 100644 --- a/dist-build/Makefile.am +++ b/dist-build/Makefile.am @@ -14,4 +14,5 @@ EXTRA_DIST = \ msys2-win64.sh \ nativeclient-pnacl.sh \ nativeclient-x86.sh \ - nativeclient-x86_64.sh + nativeclient-x86_64.sh \ + watchos.sh diff --git a/dist-build/watchOS.sh b/dist-build/watchos.sh similarity index 94% rename from dist-build/watchOS.sh rename to dist-build/watchos.sh index f688992a..9f8c9bd4 100755 --- a/dist-build/watchOS.sh +++ b/dist-build/watchos.sh @@ -2,16 +2,16 @@ # # Step 1. # Configure for base system so simulator is covered -# +# # Step 2. # Make for iOS and iOS simulator # # Step 3. # Merge libs into final version for xcode import -export PREFIX="$(pwd)/libsodium-watchOS" -export WATCHOS32_PREFIX="$PREFIX/tmp/watchOS32" -export WATCHOS64_PREFIX="$PREFIX/tmp/watchOS64" +export PREFIX="$(pwd)/libsodium-watchos" +export WATCHOS32_PREFIX="$PREFIX/tmp/watchos32" +export WATCHOS64_PREFIX="$PREFIX/tmp/watchos64" export SIMULATOR32_PREFIX="$PREFIX/tmp/simulator32" export SIMULATOR64_PREFIX="$PREFIX/tmp/simulator64" export XCODEDIR=$(xcode-select -p) @@ -110,5 +110,5 @@ echo file -- "$PREFIX/lib/libsodium.a" # Cleanup -# rm -rf -- "$PREFIX/tmp" -# make distclean > /dev/null +rm -rf -- "$PREFIX/tmp" +make distclean > /dev/null