From 93349b231351071beeb3b74671b0c5d33ead8db3 Mon Sep 17 00:00:00 2001 From: David Pershouse Date: Mon, 27 Jun 2016 12:45:46 +1000 Subject: [PATCH] osx sdk 1.7.5 --- scripts/build-all-osx.sh | 0 util/package-community-sdk/config.lua | 2 +- util/package-community-sdk/prepare-sdk-osx.sh | 25 +++++++++++++++++-- 3 files changed, 24 insertions(+), 3 deletions(-) mode change 100644 => 100755 scripts/build-all-osx.sh mode change 100644 => 100755 util/package-community-sdk/prepare-sdk-osx.sh diff --git a/scripts/build-all-osx.sh b/scripts/build-all-osx.sh old mode 100644 new mode 100755 diff --git a/util/package-community-sdk/config.lua b/util/package-community-sdk/config.lua index 561b1c9..a36da65 100644 --- a/util/package-community-sdk/config.lua +++ b/util/package-community-sdk/config.lua @@ -40,7 +40,7 @@ CLEAN_DIRS = { } CLEAN_DIRS_OSX = { - + ['xcode/build'] = true } CLEAN_DIRS_WINDOWS = { diff --git a/util/package-community-sdk/prepare-sdk-osx.sh b/util/package-community-sdk/prepare-sdk-osx.sh old mode 100644 new mode 100755 index 010de85..d9e107f --- a/util/package-community-sdk/prepare-sdk-osx.sh +++ b/util/package-community-sdk/prepare-sdk-osx.sh @@ -2,15 +2,36 @@ set -e echo "PREPARE SDK - OSX" +SCRIPT_DIR=$(cd `dirname $0` && pwd) pushd $(dirname "${0}")/../../ > /dev/null MOAI_SDK_ROOT=$(pwd) echo $MOAI_SDK_ROOT cd $MOAI_SDK_ROOT -source ./bin/env-osx.sh +source ./scripts/env-osx.sh -./bin/build-all-osx.sh +./scripts/build-all-osx.sh + +pushd $SCRIPT_DIR/moai-debugger > /dev/null + +echo y| pito host create android +pito host build android + +APK_DIR=../../../lib/android/apk + +if ! [ -d $APK_DIR ]; then + mkdir -p $APK_DIR +fi + +if [ -e $APK_DIR/moai-debug.apk ]; then + rm $APK_DIR/moai-debug.apk +fi +cp ./hosts/android/moai/build/outputs/apk/moai-debug.apk $APK_DIR/moai-debug.apk +rm -rf hosts/android + +popd + popd > /dev/null