Move platform scripts into platforms

.travis.yml

@@ -117,20 +117,20 @@ before_install:
 - source ./scripts/travis_helper.sh
 
 install:
-- ./scripts/${FLAVOR}/install.sh
+- ./platform/${FLAVOR}/scripts/install.sh
 
 before_script:
 - if command -v ccache >/dev/null 2>&1; then ccache --zero-stats ; fi
 
 script:
-- ./scripts/${FLAVOR}/${ACTION:-run}.sh
+- ./platform/${FLAVOR}/scripts/${ACTION:-run}.sh
 
 after_failure:
-- "[ -f ./scripts/${FLAVOR}/after_failure.sh ] && ./scripts/${FLAVOR}/after_failure.sh"
+- "[ -f ./platform/${FLAVOR}/scripts/after_failure.sh ] && ./platform/${FLAVOR}/scripts/after_failure.sh"
 
 after_script:
 - if command -v ccache >/dev/null 2>&1; then ccache --show-stats ; fi
-- "[ -f ./scripts/${FLAVOR}/after_script.sh ] && ./scripts/${FLAVOR}/after_script.sh"
+- "[ -f ./platform/${FLAVOR}/scripts/after_script.sh ] && ./platform/${FLAVOR}/scripts/after_script.sh"
 
 notifications:
   slack:

Makefile

@@ -50,16 +50,16 @@ ibench: export XCODEBUILD_ARGS += -sdk iphoneos ARCHS="arm64"
 ibench: ; $(RUN) HOST=ios Xcode/ios-bench
 
 .PHONY: ipackage ipackage-strip ipackage-sim ipackage-no-bitcode itest
-ipackage: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh
-ipackage-strip: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh strip
-ipackage-sim: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh sim
-ipackage-no-bitcode: Xcode/ios ; @JOBS=$(JOBS) ./scripts/ios/package.sh no-bitcode
-iframework: ipackage-strip ; ./scripts/ios/framework.sh
-itest: ipackage-sim ; ./scripts/ios/test.sh
+ipackage: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh
+ipackage-strip: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh strip
+ipackage-sim: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh sim
+ipackage-no-bitcode: Xcode/ios ; @JOBS=$(JOBS) ./platform/ios/scripts/package.sh no-bitcode
+iframework: ipackage-strip ; ./platform/ios/scripts/framework.sh
+itest: ipackage-sim ; ./platform/ios/scripts/test.sh
 
 .PHONY: xpackage xpackage-strip
-xpackage: Xcode/osx ; @JOBS=$(JOBS) ./scripts/osx/package.sh
-xpackage-strip: Xcode/osx ; @JOBS=$(JOBS) ./scripts/osx/package.sh strip
+xpackage: Xcode/osx ; @JOBS=$(JOBS) ./platform/osx/scripts/package.sh
+xpackage-strip: Xcode/osx ; @JOBS=$(JOBS) ./platform/osx/scripts/package.sh strip
 endif
 
 #### All platforms targets #####################################################

configure

@@ -54,9 +54,9 @@ function print_opengl_flags {
 }
 
 # Load dependencies
-source scripts/${MASON_PLATFORM}/configure.sh
-if [ -e scripts/${MASON_PLATFORM}/${MASON_PLATFORM_VERSION}/configure.sh ]; then
-    source scripts/${MASON_PLATFORM}/${MASON_PLATFORM_VERSION}/configure.sh
+source platform/${MASON_PLATFORM}/scripts/configure.sh
+if [ -e platform/${MASON_PLATFORM}/scripts/${MASON_PLATFORM_VERSION}/configure.sh ]; then
+    source platform/${MASON_PLATFORM}/scripts/${MASON_PLATFORM_VERSION}/configure.sh
 fi
 
 PYTHON=`which python || abort 'Cannot find python'`

docker/clang-tidy/tidy.sh

@@ -13,7 +13,7 @@ cd build
 source ./scripts/travis_helper.sh
 
 # install
-./scripts/${FLAVOR}/install.sh
+./platform/${FLAVOR}/scripts/install.sh
 
 export CLANG_TIDY=clang-tidy-3.8
 make tidy

docker/linux/test.sh

@@ -20,7 +20,7 @@ cd build
 source ./scripts/travis_helper.sh
 
 # install
-./scripts/${FLAVOR}/install.sh
+./platform/${FLAVOR}/scripts/install.sh
 
 # script
-./scripts/${FLAVOR}/run.sh
+./platform/${FLAVOR}/scripts/run.sh

platform/android/scripts/defaults.mk

@@ -8,4 +8,4 @@ GYP_FLAVOR_SUFFIX=-android
 
 HOST_VERSION ?= arm-v7
 
-ENV = $(shell MASON_ANDROID_ABI=$(HOST_VERSION) ./scripts/android/toolchain.sh)
+ENV = $(shell MASON_ANDROID_ABI=$(HOST_VERSION) ./platform/android/scripts/toolchain.sh)

platform/android/scripts/install.sh

@@ -10,4 +10,4 @@ export MASON_PLATFORM=android
 export MASON_ANDROID_ABI=${ANDROID_ABI}
 
 mapbox_time "android_toolchain" \
-./scripts/android/toolchain.sh
+./platform/android/scripts/toolchain.sh

platform/ios/scripts/add-key.sh

@@ -16,10 +16,10 @@ security unlock-keychain -p travis ios-build.keychain
 security set-keychain-settings -t 3600 -l ~/Library/Keychains/ios-build.keychain
 
 # Add certificates to keychain and allow codesign to access them
-security import ./scripts/ios/apple.crt    -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
-security import ./scripts/ios/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
-security import ./scripts/ios/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign
+security import ./platform/ios/scripts/apple.crt    -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
+security import ./platform/ios/scripts/ios-dist.cer -k ~/Library/Keychains/ios-build.keychain -T /usr/bin/codesign
+security import ./platform/ios/scripts/ios-dist.p12 -k ~/Library/Keychains/ios-build.keychain -P $IOS_KEY_PASSWORD -T /usr/bin/codesign
 
 # Put the provisioning profile in place
 mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
-cp "./scripts/ios/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/
+cp "./platform/ios/scripts/$IOS_PROFILE_NAME.mobileprovision" ~/Library/MobileDevice/Provisioning\ Profiles/

platform/ios/scripts/run.sh

@@ -4,7 +4,7 @@ set -e
 set -o pipefail
 set -u
 
-source ./scripts/ios/setup.sh
+source ./platform/ios/scripts/setup.sh
 
 BUILDTYPE=${BUILDTYPE:-Release}
 
@@ -23,21 +23,21 @@ if [[ ${PUBLISH_PLATFORM} = 'ios' ]]; then
     make ipackage
 
     mapbox_time "deploy_ios_symbols"
-    ./scripts/ios/publish.sh "${PUBLISH_VERSION}" symbols
+    ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}" symbols
 
     # no debug symbols, for smaller distribution
     mapbox_time "package_ios_stripped" \
     make ipackage-strip
 
     mapbox_time "deploy_ios_stripped"
-    ./scripts/ios/publish.sh "${PUBLISH_VERSION}"
+    ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}"
 
     # debug symbols but no Bitcode
     mapbox_time "package_ios_no_bitcode" \
     make ipackage-no-bitcode
 
     mapbox_time "deploy_ios_no_bitcode"
-    ./scripts/ios/publish.sh "${PUBLISH_VERSION}" no-bitcode
+    ./platform/ios/scripts/publish.sh "${PUBLISH_VERSION}" no-bitcode
 else
     # build & test iOS
     mapbox_time "run_ios_tests" \

platform/linux/scripts/run.sh

@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-source ./scripts/linux/setup.sh
+source ./platform/linux/scripts/setup.sh
 
 BUILDTYPE=${BUILDTYPE:-Release}
 

platform/node/scripts/after_script.sh

@@ -28,7 +28,7 @@ if [[ ${TRAVIS_TAG} == node-v${PACKAGE_JSON_VERSION} ]] || test "${COMMIT_MESSAG
     ./node_modules/.bin/node-pre-gyp publish info
 
     if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
-        source ./scripts/${TRAVIS_OS_NAME}/setup.sh
+        source ./platform/linux/scripts/setup.sh
 
         rm -rf build
         rm -rf lib

platform/node/scripts/create_node_scheme.sh

@@ -5,4 +5,4 @@ CMD=$@
 DIR="build/binding.xcodeproj/xcshareddata/xcschemes"
 mkdir -p "${DIR}"
 
-sed "s#{{NODE_PATH}}#$(dirname `which node`)#;s#{{BLUEPRINT_IDENTIFIER}}#$(hexdump -n 12 -v -e '/1 "%02X"' /dev/urandom)#;s#{{WORKING_DIRECTORY}}#$(pwd)#;s#{{NODE_ARGUMENT}}#${CMD}#" scripts/node/node.xcscheme > "${DIR}/${NAME}.xcscheme"
+sed "s#{{NODE_PATH}}#$(dirname `which node`)#;s#{{BLUEPRINT_IDENTIFIER}}#$(hexdump -n 12 -v -e '/1 "%02X"' /dev/urandom)#;s#{{WORKING_DIRECTORY}}#$(pwd)#;s#{{NODE_ARGUMENT}}#${CMD}#" platform/node/scripts/node.xcscheme > "${DIR}/${NAME}.xcscheme"

platform/node/scripts/run.sh

@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-source ./scripts/${TRAVIS_OS_NAME}/setup.sh
+source ./platform/${TRAVIS_OS_NAME}/scripts/setup.sh
 
 BUILDTYPE=${BUILDTYPE:-Release}
 

platform/osx/scripts/run.sh

@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-source ./scripts/osx/setup.sh
+source ./platform/osx/scripts/setup.sh
 
 BUILDTYPE=${BUILDTYPE:-Release}
 

scripts/main.mk

@@ -6,7 +6,7 @@ endif
 export HOST ?= $(BUILD)
 
 # Defines host defaults
-include scripts/$(HOST)/defaults.mk
+include platform/$(HOST)/scripts/defaults.mk
 
 export HOST_VERSION ?= $(BUILD_VERSION)
 
@@ -16,14 +16,14 @@ export HOST_VERSION ?= $(BUILD_VERSION)
 export MASON_PLATFORM=$(HOST)
 export MASON_PLATFORM_VERSION=$(HOST_VERSION)
 
-ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh))
+ifneq (,$(wildcard platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh))
 	CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh
 endif
 
 export HOST_SLUG = $(HOST)-$(HOST_VERSION)
-CONFIGURE_FILES = scripts/$(HOST)/configure.sh
-ifneq (,$(wildcard scripts/$(HOST)/$(HOST_VERSION)/configure.sh))
-	CONFIGURE_FILES += scripts/$(HOST)/$(HOST_VERSION)/configure.sh
+CONFIGURE_FILES = platform/$(HOST)/scripts/configure.sh
+ifneq (,$(wildcard platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh))
+	CONFIGURE_FILES += platform/$(HOST)/scripts/$(HOST_VERSION)/configure.sh
 endif
 
 ifneq (,$(findstring clang,$(CXX)))
@@ -112,8 +112,8 @@ node/configure:
 node/xproj: Xcode/__project__ node/configure
 	$(QUIET)$(ENV) $(NODE_PRE_GYP) configure --clang -- \
 	$(GYP_FLAGS) -f xcode -Dlibuv_cflags= -Dlibuv_ldflags= -Dlibuv_static_libs=
-	$(QUIET)$(ENV) ./scripts/node/create_node_scheme.sh "node test" "`npm bin tape`/tape platform/node/test/js/**/*.test.js"
-	$(QUIET)$(ENV) ./scripts/node/create_node_scheme.sh "npm run test-suite" "platform/node/test/render.test.js"
+	$(QUIET)$(ENV) ./platform/node/scripts/create_node_scheme.sh "node test" "`npm bin tape`/tape platform/node/test/js/**/*.test.js"
+	$(QUIET)$(ENV) ./platform/node/scripts/create_node_scheme.sh "npm run test-suite" "platform/node/test/render.test.js"
 
 Makefile/node: Makefile/__project__ node/configure
 	@printf "$(TEXT_BOLD)$(COLOR_GREEN)* Building target node...$(FORMAT_END)\n"