From c3fbbd781e061210637df6781ed10896e90485d2 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Thu, 14 Oct 2010 18:13:44 +0000 Subject: Tidy up build settings, by ensuring they are consistent across all targets, specifically the compiler used. Also add a very basic Makefile to ease builds from the command line during build testing. --- Scripts/build.sh | 40 +------------------------------------- Scripts/localize.sh | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 39 deletions(-) create mode 100755 Scripts/localize.sh (limited to 'Scripts') diff --git a/Scripts/build.sh b/Scripts/build.sh index 88641238..149705cb 100755 --- a/Scripts/build.sh +++ b/Scripts/build.sh @@ -13,7 +13,6 @@ BUILD_PRODUCT="${BUILT_PRODUCTS_DIR}/${TARGET_NAME}${WRAPPER_SUFFIX}" - echo 'Updating build version...' # Add the build/bundle version @@ -25,44 +24,7 @@ rm -rf "${BUILD_PRODUCT}/Contents/Frameworks/BWToolkitFramework.framework/Versio # Perform localisation updates for 'Release' or 'Distribution' builds if [[ "$CONFIGURATION" == 'Release' || "$CONFIGURATION" == 'Distribution' ]] then - - echo "Running genstrings to update 'Localizable.strings'..." - - # Update 'Localizable.strings' by running genstrings(1) - GENSTRINGS_ERRORS=$(genstrings -o "${SRCROOT}/Resources/English.lproj" "${SRCROOT}/Source/"*.m) - - # Check for genstrings errors - if [[ ${GENSTRINGS_ERRORS} -ne 0 ]] - then - echo "error: genstrings exited with error: ${GENSTRINGS_ERRORS}" - fi - - echo "Updating nib and xib localisations..." - - # Generate up-to-date nib .strings files for localisation - find "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"/**/*.nib | while read nibFile - do - stringsFilePath="${SOURCE_ROOT}/Resources/English.lproj/`basename "${nibFile}" .nib`.strings" - xibFile=`basename "${nibFile}" .nib`.xib - xibFilePath=`echo "${SOURCE_ROOT}"/Interfaces/**/"${xibFile}"` - if [[ -e ${xibFilePath} ]] - then - xibfileModDate=`stat -f "%m" "${xibFilePath}"` - if [[ -e ${stringsFilePath} ]] - then - stringsFileModDate=`stat -f "%m" "${stringsFilePath}"` - else - stringsFileModDate=0 - fi - if [[ ${xibfileModDate} -gt ${stringsFileModDate} ]] - then - printf "\tLocalising ${xibFile}...\n"; - ibtool --generate-stringsfile "${stringsFilePath}~" "${xibFilePath}" - "${BUILT_PRODUCTS_DIR}"/xibLocalizationPostprocessor "${stringsFilePath}~" "${stringsFilePath}" - rm "${stringsFilePath}~" - fi - fi - done + "${SRCROOT}/Scripts/localize.sh" fi # Trim the application if this is a 'Release' or 'Distribution' build diff --git a/Scripts/localize.sh b/Scripts/localize.sh new file mode 100755 index 00000000..911cf8ea --- /dev/null +++ b/Scripts/localize.sh @@ -0,0 +1,56 @@ +#! /bin/ksh + +## $Id$ +## +## Author: Created by Rowan Beentje. +## Copyright (c) 2010 Sequel Pro Team. All rights reserved. +## +## Paramters: +## +## Description: Localizes all of the application's NIB files. This script should only be run by Xcode. + +echo "Running genstrings to update 'Localizable.strings'..." + +# Update 'Localizable.strings' by running genstrings(1) +GENSTRINGS_ERRORS=$(genstrings -o "${SRCROOT}/Resources/English.lproj" "${SRCROOT}/Source/"*.m) + +# Check for genstrings errors +if [[ ${GENSTRINGS_ERRORS} -ne 0 ]] +then + echo "error: genstrings exited with error: ${GENSTRINGS_ERRORS}" +fi + +echo "Updating nib and xib localisations..." + +# Generate up-to-date nib .strings files for localisation +find "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"/**/*.nib | while read nibFile +do + stringsFilePath="${SOURCE_ROOT}/Resources/English.lproj/`basename "${nibFile}" .nib`.strings" + xibFile=`basename "${nibFile}" .nib`.xib + xibFilePath=`echo "${SOURCE_ROOT}"/Interfaces/**/"${xibFile}"` + + if [[ -e ${xibFilePath} ]] + then + xibfileModDate=`stat -f "%m" "${xibFilePath}"` + + if [[ -e ${stringsFilePath} ]] + then + stringsFileModDate=`stat -f "%m" "${stringsFilePath}"` + else + stringsFileModDate=0 + fi + + if [[ ${xibfileModDate} -gt ${stringsFileModDate} ]] + then + printf "\tLocalising ${xibFile}...\n"; + + ibtool --generate-stringsfile "${stringsFilePath}~" "${xibFilePath}" + + "${BUILT_PRODUCTS_DIR}"/xibLocalizationPostprocessor "${stringsFilePath}~" "${stringsFilePath}" + + rm "${stringsFilePath}~" + fi + fi +done + +exit 0 -- cgit v1.2.3