Permalink
Browse files

Use SRCROOT to build output dir, copy all .a files when updating samp…

…les and packaging.
  • Loading branch information...
1 parent 10e6e54 commit a7203333e18baaa174463ab9995d81b4c507b4af @jtowle jtowle committed Sep 17, 2012
Showing with 4 additions and 3 deletions.
  1. +2 −1 AirshipLib/buildTarget.sh
  2. +2 −2 AirshipLib/update_library_reference.sh
@@ -25,10 +25,11 @@ xcode_setting() {
echo $(cat ${XCODE_SETTINGS} | awk "\$1 == \"${1}\" { print \$3 }")
}
+SRCROOT=$(xcode_setting "SRCROOT")
SDK_NAME=$(xcode_setting "SDK_NAME")
EXECUTABLE_NAME=$(xcode_setting "EXECUTABLE_NAME")
BUILT_PRODUCTS_DIR=$(xcode_setting "BUILT_PRODUCTS_DIR")
-DEPLOY_DIR="${BUILT_PRODUCTS_DIR}/distribution_binaries/"
+DEPLOY_DIR="${SRCROOT}/distribution_binaries/"
echo $DEPLOY_DIR
@@ -53,8 +53,8 @@ dest_package_root="${SRCROOT}/../${CONFIGURATION}/Airship"
#find "$dest_lib_root" -d 1 -name "$lib_base_name*.${EXECUTABLE_EXTENSION}" -exec rm {} \;
# Copies the lib to the Airship folder for sample projects to use (not for packaging)
-echo "copy $lib_name from ${BINARY_DIR} to $dest_lib_root"
-cp "${BINARY_DIR}/$lib_name" "$dest_lib_root"
+echo "copy *.$EXECUTABLE_EXTENSION from ${BINARY_DIR} to $dest_lib_root"
+cp "${BINARY_DIR}"/*.$EXECUTABLE_EXTENSION "$dest_lib_root"
# Copies the lib to the package root
#TODO: don't do this - the package script will do this for us

0 comments on commit a720333

Please sign in to comment.