Author: gavincornwell
Date: Mon Mar 10 21:08:42 2014
New Revision: 1576087
URL: http://svn.apache.org/r1576087
Log:
Build script fixes (also made scheme shared)
Added:
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/ (with
props)
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/xcschemes/
(with props)
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/xcschemes/ObjectiveCMIS.xcscheme
(with props)
chemistry/objectivecmis/trunk/build_package.sh (with props)
Modified:
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj
chemistry/objectivecmis/trunk/build_universal_lib.sh
chemistry/objectivecmis/trunk/run_test.sh
Modified: chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj?rev=1576087&r1=1576086&r2=1576087&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj
(original)
+++ chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/project.pbxproj Mon
Mar 10 21:08:42 2014
@@ -844,7 +844,6 @@
828072AE15153DE900EF635C /* Sources */,
828072AF15153DE900EF635C /* Frameworks */,
828072B015153DE900EF635C /* Resources */,
- 828072B115153DE900EF635C /* ShellScript */,
);
buildRules = (
);
@@ -919,19 +918,6 @@
shellPath = /bin/sh;
shellScript = "/usr/bin/appledoc \\\n--project-name
\"ObjectiveCMIS\" \\\n--project-company \"Apache Chemistry Project\"
\\\n--company-id org.apache.chemistry \\\n--output ~/help \\\n--logformat xcode
\\\n--keep-intermediate-files \\\n--keep-undocumented-objects
\\\n--keep-undocumented-members \\\n--exit-threshold 2 \\\n--ignore .m
\\\n--ignore ObjectiveCMISTests \\\n\"${PROJECT_DIR}\"\n\n";
};
- 828072B115153DE900EF635C /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "# Run the unit tests in this test
bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
- };
FE66BCA415936F8C00FC6FC4 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -943,7 +929,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "# [JORAM] Added check for variable: when
running a regular build in XCode, this causes not to trigger the universal lib
building.\n\necho \"BUILD_UNIVERSAL_LIB = $BUILD_UNIVERSAL_LIB\"\nif [ -z
$BUILD_UNIVERSAL_LIB ]\nthen\necho \"Not building universal lib\"\nexit
0\nelse\necho \"Building universal lib\"\nfi\n\n#
--------------------------------------------------------------------------------------------------------------------------------------------------------\n#\n#
Following code is integral from
http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n#\n#
Version 2.0 (updated for Xcode 4, with some fixes)\n# Changes:\n# - Works
with xcode 4, even when running xcode 3 projects (Workarounds for apple
bugs)\n# - Faster / better: only runs lipo once, instead of once per
recursion\n# - Added some debugging statemetns that can be switched on/off
by changing the DEBUG_THIS_SCRIPT variable to \"true\"\n#
- Fixed some typos\n# \n# Purpose:\n# Create a static library for iPhone
from within XCode\n# Because Apple staff DELIBERATELY broke Xcode to make
this impossible from the GUI (Xcode 3.2.3 specifically states this in the
Release notes!)\n# ...no, I don't understand why they did this!\n#\n# Author:
Adam Martin - http://twitter.com/redglassesapps\n# Based on: original script
from Eonil (main changes: Eonil's script WILL NOT WORK in Xcode GUI - it WILL
CRASH YOUR COMPUTER)\n#\n# More info: see this Stack Overflow question:
http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n\n#################[
Tests: helps workaround any future bugs in Xcode
]########\n#\nDEBUG_THIS_SCRIPT=\"true\"\n\nif [ $DEBUG_THIS_SCRIPT = \"true\"
]\nthen\necho \"########### TESTS #############\"\necho \"Use the following
variables when debugging this script; note that they may change on
recursions\"\necho \"BUILD_DIR = $BUILD_DIR\"\necho \"BUILD_ROO
T = $BUILD_ROOT\"\necho \"CONFIGURATION_BUILD_DIR =
$CONFIGURATION_BUILD_DIR\"\necho \"BUILT_PRODUCTS_DIR =
$BUILT_PRODUCTS_DIR\"\necho \"CONFIGURATION_TEMP_DIR =
$CONFIGURATION_TEMP_DIR\"\necho \"TARGET_BUILD_DIR =
$TARGET_BUILD_DIR\"\nfi\n\n#####################[ part 1 ]##################\n#
First, work out the BASESDK version number (NB: Apple ought to report this, but
they hide it)\n# (incidental: searching for substrings in sh is a nightmare!
Sob)\n\nSDK_VERSION=$(echo ${SDK_NAME} | grep -o '.\\{3\\}$')\n\n# Next, work
out if we're in SIM or DEVICE\n\nif [ ${PLATFORM_NAME} = \"iphonesimulator\"
]\nthen\nOTHER_SDK_TO_BUILD=iphoneos${SDK_VERSION}\nelse\nOTHER_SDK_TO_BUILD=iphonesimulator${SDK_VERSION}\nfi\n\necho
\"XCode has selected SDK: ${PLATFORM_NAME} with version: ${SDK_VERSION}
(although back-targetting: ${IPHONEOS_DEPLOYMENT_TARGET})\"\necho
\"...therefore, OTHER_SDK_TO_BUILD =
${OTHER_SDK_TO_BUILD}\"\n#\n#####################[ end of part 1
]##################\n\n####
#################[ part 2 ]##################\n#\n# IF this is the original
invocation, invoke WHATEVER other builds are required\n#\n# Xcode is already
building ONE target...\n#\n# ...but this is a LIBRARY, so Apple is wrong to set
it to build just one.\n# ...we need to build ALL targets\n# ...we MUST NOT
re-build the target that is ALREADY being built: Xcode WILL CRASH YOUR COMPUTER
if you try this (infinite recursion!)\n#\n#\n# So: build ONLY the missing
platforms/configurations.\n\nif [ \"true\" == ${ALREADYINVOKED:-false}
]\nthen\necho \"RECURSION: I am NOT the root invocation, so I'm NOT going to
recurse\"\nelse\n# CRITICAL:\n# Prevent infinite recursion (Xcode
sucks)\nexport ALREADYINVOKED=\"true\"\n\necho \"RECURSION: I am the root ...
recursing all missing build targets NOW...\"\necho \"RECURSION: ...about to
invoke: xcodebuild -configuration \\\"${CONFIGURATION}\\\" -target
\\\"${TARGET_NAME}\\\" -sdk \\\"${OTHER_SDK_TO_BUILD}\\\" clean ${ACTION}
RUN_CLANG_STATIC_ANALYZER=
NO\"\nxcodebuild -configuration \"${CONFIGURATION}\" -target
\"${TARGET_NAME}\" -sdk \"${OTHER_SDK_TO_BUILD}\" clean ${ACTION}
RUN_CLANG_STATIC_ANALYZER=NO BUILD_DIR=\"${BUILD_DIR}\"
BUILD_ROOT=\"${BUILD_ROOT}\"\n\nACTION=\"build\"\n\n#Merge all platform
binaries as a fat binary for each configurations.\n\n# Calculate where the
(multiple) built files are coming
from:\nCURRENTCONFIG_DEVICE_DIR=${SYMROOT}/${CONFIGURATION}-iphoneos\nCURRENTCONFIG_SIMULATOR_DIR=${SYMROOT}/${CONFIGURATION}-iphonesimulator\n\necho
\"Taking device build from: ${CURRENTCONFIG_DEVICE_DIR}\"\necho \"Taking
simulator build from:
${CURRENTCONFIG_SIMULATOR_DIR}\"\n\nCREATING_UNIVERSAL_DIR=${SYMROOT}/${CONFIGURATION}-universal\necho
\"\"\necho \"...I will output a universal build to:
${CREATING_UNIVERSAL_DIR}\"\necho \"\"\n\n# ... remove the products of previous
runs of this script\n# NB: this directory is ONLY created by this script -
it should be safe to delete!\n\nrm -rf \"${CREATING_UNIVERSAL_DIR}\"\nmkd
ir \"${CREATING_UNIVERSAL_DIR}\"\n\n# [MIKEH] Rename universal library
depending on build configuration type\nif [ ${CONFIGURATION} = \"Debug\"
]\nthen\nUNIVERSAL_FILE=${EXECUTABLE_NAME%.a}-debug.a\nelse\nUNIVERSAL_FILE=${EXECUTABLE_NAME}\nfi\n\n#\necho
\"lipo: for current configuration (${CONFIGURATION}) creating output file:
${CREATING_UNIVERSAL_DIR}/${UNIVERSAL_FILE}\"\nlipo -create -output
\"${CREATING_UNIVERSAL_DIR}/${UNIVERSAL_FILE}\"
\"${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}\"
\"${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}\"\n\n#########\n#\n# Added:
StackOverflow suggestion to also copy \"include\" files\n# (untested, but
should work OK)\n#\nif [ -d \"${CURRENTCONFIG_DEVICE_DIR}/ObjectiveCMIS\"
]\nthen\nmkdir -p \"${CREATING_UNIVERSAL_DIR}/ObjectiveCMIS\"\n#mkdir -p
\"${CREATING_UNIVERSAL_DIR}/usr/local/include\"\n# * needs to be outside the
double quotes?\ncp \"${CURRENTCONFIG_DEVICE_DIR}/ObjectiveCMIS/\"*
\"${CREATING_UNIVERSAL_DIR}/ObjectiveCMIS\"\nfi\nfi\n
\n";
+ shellScript = "# [JORAM] Added check for variable: when
running a regular build in XCode, this causes not to trigger the universal lib
building.\n\necho \"BUILD_UNIVERSAL_LIB = $BUILD_UNIVERSAL_LIB\"\nif [ -z
$BUILD_UNIVERSAL_LIB ]\nthen\necho \"Not building universal lib\"\nexit
0\nelse\necho \"Building universal lib\"\nfi\n\n#
--------------------------------------------------------------------------------------------------------------------------------------------------------\n#\n#
Following code is integral from
http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n#\n#
Version 2.0 (updated for Xcode 4, with some fixes)\n# Changes:\n# - Works
with xcode 4, even when running xcode 3 projects (Workarounds for apple
bugs)\n# - Faster / better: only runs lipo once, instead of once per
recursion\n# - Added some debugging statemetns that can be switched on/off
by changing the DEBUG_THIS_SCRIPT variable to \"true\"\n#
- Fixed some typos\n# \n# Purpose:\n# Create a static library for iPhone
from within XCode\n# Because Apple staff DELIBERATELY broke Xcode to make
this impossible from the GUI (Xcode 3.2.3 specifically states this in the
Release notes!)\n# ...no, I don't understand why they did this!\n#\n# Author:
Adam Martin - http://twitter.com/redglassesapps\n# Based on: original script
from Eonil (main changes: Eonil's script WILL NOT WORK in Xcode GUI - it WILL
CRASH YOUR COMPUTER)\n#\n# More info: see this Stack Overflow question:
http://stackoverflow.com/questions/3520977/build-fat-static-library-device-simulator-using-xcode-and-sdk-4\n\n#################[
Tests: helps workaround any future bugs in Xcode
]########\n#\nDEBUG_THIS_SCRIPT=\"true\"\n\nif [ $DEBUG_THIS_SCRIPT = \"true\"
]\nthen\necho \"########### TESTS #############\"\necho \"Use the following
variables when debugging this script; note that they may change on
recursions\"\necho \"BUILD_DIR = $BUILD_DIR\"\necho \"BUILD_ROO
T = $BUILD_ROOT\"\necho \"CONFIGURATION_BUILD_DIR =
$CONFIGURATION_BUILD_DIR\"\necho \"BUILT_PRODUCTS_DIR =
$BUILT_PRODUCTS_DIR\"\necho \"CONFIGURATION_TEMP_DIR =
$CONFIGURATION_TEMP_DIR\"\necho \"TARGET_BUILD_DIR =
$TARGET_BUILD_DIR\"\nfi\n\n#####################[ part 1 ]##################\n#
First, work out the BASESDK version number (NB: Apple ought to report this, but
they hide it)\n# (incidental: searching for substrings in sh is a nightmare!
Sob)\n\nSDK_VERSION=$(echo ${SDK_NAME} | grep -o '.\\{3\\}$')\n\n# Next, work
out if we're in SIM or DEVICE\n\nif [ ${PLATFORM_NAME} = \"iphonesimulator\"
]\nthen\nOTHER_SDK_TO_BUILD=iphoneos${SDK_VERSION}\nelse\nOTHER_SDK_TO_BUILD=iphonesimulator${SDK_VERSION}\nfi\n\necho
\"XCode has selected SDK: ${PLATFORM_NAME} with version: ${SDK_VERSION}
(although back-targetting: ${IPHONEOS_DEPLOYMENT_TARGET})\"\necho
\"...therefore, OTHER_SDK_TO_BUILD =
${OTHER_SDK_TO_BUILD}\"\n#\n#####################[ end of part 1
]##################\n\n####
#################[ part 2 ]##################\n#\n# IF this is the original
invocation, invoke WHATEVER other builds are required\n#\n# Xcode is already
building ONE target...\n#\n# ...but this is a LIBRARY, so Apple is wrong to set
it to build just one.\n# ...we need to build ALL targets\n# ...we MUST NOT
re-build the target that is ALREADY being built: Xcode WILL CRASH YOUR COMPUTER
if you try this (infinite recursion!)\n#\n#\n# So: build ONLY the missing
platforms/configurations.\n\nif [ \"true\" == ${ALREADYINVOKED:-false}
]\nthen\necho \"RECURSION: I am NOT the root invocation, so I'm NOT going to
recurse\"\nelse\n# CRITICAL:\n# Prevent infinite recursion (Xcode
sucks)\nexport ALREADYINVOKED=\"true\"\n\necho \"RECURSION: I am the root ...
recursing all missing build targets NOW...\"\necho \"RECURSION: ...about to
invoke: xcodebuild -configuration \\\"${CONFIGURATION}\\\" -target
\\\"${TARGET_NAME}\\\" -sdk \\\"${OTHER_SDK_TO_BUILD}\\\" clean ${ACTION}
RUN_CLANG_STATIC_ANALYZER=
NO\"\nxcodebuild -configuration \"${CONFIGURATION}\" -target
\"${TARGET_NAME}\" -sdk \"${OTHER_SDK_TO_BUILD}\" clean ${ACTION}
ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO BUILD_DIR=\"${BUILD_DIR}\"
BUILD_ROOT=\"${BUILD_ROOT}\"\n\nACTION=\"build\"\n\n#Merge all platform
binaries as a fat binary for each configurations.\n\n# Calculate where the
(multiple) built files are coming
from:\nCURRENTCONFIG_DEVICE_DIR=${SYMROOT}/${CONFIGURATION}-iphoneos\nCURRENTCONFIG_SIMULATOR_DIR=${SYMROOT}/${CONFIGURATION}-iphonesimulator\n\necho
\"Taking device build from: ${CURRENTCONFIG_DEVICE_DIR}\"\necho \"Taking
simulator build from:
${CURRENTCONFIG_SIMULATOR_DIR}\"\n\nCREATING_UNIVERSAL_DIR=${SYMROOT}/${CONFIGURATION}-universal\necho
\"\"\necho \"...I will output a universal build to:
${CREATING_UNIVERSAL_DIR}\"\necho \"\"\n\n# ... remove the products of previous
runs of this script\n# NB: this directory is ONLY created by this script -
it should be safe to delete!\n\nrm -rf \"${CREATING_U
NIVERSAL_DIR}\"\nmkdir \"${CREATING_UNIVERSAL_DIR}\"\n\n# [MIKEH] Rename
universal library depending on build configuration type\nif [ ${CONFIGURATION}
= \"Debug\"
]\nthen\nUNIVERSAL_FILE=${EXECUTABLE_NAME%.a}-debug.a\nelse\nUNIVERSAL_FILE=${EXECUTABLE_NAME}\nfi\n\n#\necho
\"lipo: for current configuration (${CONFIGURATION}) creating output file:
${CREATING_UNIVERSAL_DIR}/${UNIVERSAL_FILE}\"\nlipo -create -output
\"${CREATING_UNIVERSAL_DIR}/${UNIVERSAL_FILE}\"
\"${CURRENTCONFIG_DEVICE_DIR}/${EXECUTABLE_NAME}\"
\"${CURRENTCONFIG_SIMULATOR_DIR}/${EXECUTABLE_NAME}\"\n\n#########\n#\n# Added:
StackOverflow suggestion to also copy \"include\" files\n# (untested, but
should work OK)\n#\nif [ -d \"${CURRENTCONFIG_DEVICE_DIR}/ObjectiveCMIS\"
]\nthen\nmkdir -p \"${CREATING_UNIVERSAL_DIR}/ObjectiveCMIS\"\n#mkdir -p
\"${CREATING_UNIVERSAL_DIR}/usr/local/include\"\n# * needs to be outside the
double quotes?\ncp \"${CURRENTCONFIG_DEVICE_DIR}/ObjectiveCMIS/\"*
\"${CREATING_UNIVERSAL_DIR}/Objec
tiveCMIS\"\nfi\nfi\n\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@@ -1087,7 +1073,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -1123,7 +1108,6 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -1151,6 +1135,7 @@
828072C815153DE900EF635C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/ObjectiveCMIS.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER =
"ObjectiveCMIS/ObjectiveCMIS-Prefix.pch";
@@ -1166,6 +1151,7 @@
828072C915153DE900EF635C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
DSTROOT = /tmp/ObjectiveCMIS.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER =
"ObjectiveCMIS/ObjectiveCMIS-Prefix.pch";
@@ -1181,6 +1167,7 @@
828072CB15153DE900EF635C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
@@ -1195,6 +1182,7 @@
828072CC15153DE900EF635C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
Propchange: chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 10 21:08:42 2014
@@ -0,0 +1,2 @@
+xcuserdata
+*.xccheckout
Propchange:
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/xcschemes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 10 21:08:42 2014
@@ -0,0 +1,2 @@
+xcuserdata
+*.xccheckout
Added:
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/xcschemes/ObjectiveCMIS.xcscheme
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/xcschemes/ObjectiveCMIS.xcscheme?rev=1576087&view=auto
==============================================================================
---
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/xcschemes/ObjectiveCMIS.xcscheme
(added)
+++
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/xcschemes/ObjectiveCMIS.xcscheme
Mon Mar 10 21:08:42 2014
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "0500"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "828072A215153DE800EF635C"
+ BuildableName = "libObjectiveCMIS.a"
+ BlueprintName = "ObjectiveCMIS"
+ ReferencedContainer = "container:ObjectiveCMIS.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "NO"
+ buildForProfiling = "NO"
+ buildForArchiving = "NO"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "828072B215153DE900EF635C"
+ BuildableName = "ObjectiveCMISTests.xctest"
+ BlueprintName = "ObjectiveCMISTests"
+ ReferencedContainer = "container:ObjectiveCMIS.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ buildConfiguration = "Debug">
+ <Testables>
+ <TestableReference
+ skipped = "NO">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "828072B215153DE900EF635C"
+ BuildableName = "ObjectiveCMISTests.xctest"
+ BlueprintName = "ObjectiveCMISTests"
+ ReferencedContainer = "container:ObjectiveCMIS.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ allowLocationSimulation = "YES">
+ <AdditionalOptions>
+ </AdditionalOptions>
+ </LaunchAction>
+ <ProfileAction
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ buildConfiguration = "Release"
+ debugDocumentVersioning = "YES">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Release">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>
Propchange:
chemistry/objectivecmis/trunk/ObjectiveCMIS.xcodeproj/xcshareddata/xcschemes/ObjectiveCMIS.xcscheme
------------------------------------------------------------------------------
svn:eol-style = native
Added: chemistry/objectivecmis/trunk/build_package.sh
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/build_package.sh?rev=1576087&view=auto
==============================================================================
--- chemistry/objectivecmis/trunk/build_package.sh (added)
+++ chemistry/objectivecmis/trunk/build_package.sh Mon Mar 10 21:08:42 2014
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PACKAGE_ZIP=ObjectiveCMIS.zip
+PACKAGE_DIR=build/Package
+
+echo "Preparing package folder structure..."
+
+if [ -d $PACKAGE_DIR ]
+then
+ rm -R $PACKAGE_DIR
+fi
+mkdir -p $PACKAGE_DIR
+
+cp NOTICE $PACKAGE_DIR
+cp LICENSE $PACKAGE_DIR
+cp README $PACKAGE_DIR
+
+echo "Building static library..."
+
+export BUILD_UNIVERSAL_LIB='TRUE'
+xcodebuild -project ObjectiveCMIS.xcodeproj -target ObjectiveCMIS
-configuration Debug ONLY_ACTIVE_ARCH=NO clean build
+xcodebuild -project ObjectiveCMIS.xcodeproj -target ObjectiveCMIS
-configuration Release clean build
+
+cp -R build/Debug-universal/* $PACKAGE_DIR
+cp build/Release-universal/*.a $PACKAGE_DIR
+
+echo "Creating package..."
+
+pushd $PACKAGE_DIR
+jar cvf $PACKAGE_ZIP *
+popd
+
+echo "done!"
+
Propchange: chemistry/objectivecmis/trunk/build_package.sh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: chemistry/objectivecmis/trunk/build_universal_lib.sh
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/build_universal_lib.sh?rev=1576087&r1=1576086&r2=1576087&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/build_universal_lib.sh (original)
+++ chemistry/objectivecmis/trunk/build_universal_lib.sh Mon Mar 10 21:08:42
2014
@@ -26,7 +26,7 @@ else
echo "Building release version of universal library..."
fi
-xcodebuild -project ObjectiveCMIS.xcodeproj -target ObjectiveCMIS
-configuration $BUILD_CONFIG clean build
+xcodebuild -project ObjectiveCMIS.xcodeproj -target ObjectiveCMIS
-configuration $BUILD_CONFIG ONLY_ACTIVE_ARCH=NO clean build
-appledoc --project-name ObjectiveCMIS --project-company "Apache Chemistry"
--company-id org.apache.chemistry.opencmis --output ./ObjectiveCMISHelp
--keep-intermediate-files --exit-threshold 2 --keep-undocumented-objects
--keep-undocumented-members --ignore .m --ignore ObjectiveCMISTests .
+appledoc --project-name ObjectiveCMIS --project-company "Apache Chemistry"
--company-id org.apache.chemistry.opencmis --output ./ObjectiveCMISHelp
--keep-intermediate-files --exit-threshold 2 --keep-undocumented-objects
--keep-undocumented-members --ignore .m --ignore ObjectiveCMISTests --ignore
build .
Modified: chemistry/objectivecmis/trunk/run_test.sh
URL:
http://svn.apache.org/viewvc/chemistry/objectivecmis/trunk/run_test.sh?rev=1576087&r1=1576086&r2=1576087&view=diff
==============================================================================
--- chemistry/objectivecmis/trunk/run_test.sh (original)
+++ chemistry/objectivecmis/trunk/run_test.sh Mon Mar 10 21:08:42 2014
@@ -15,4 +15,37 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-xcodebuild -sdk iphonesimulator -project ObjectiveCMIS.xcode.proj -target
ObjectiveCMISTests -configuration Debug clean build
+usage ()
+{
+ echo
+ echo "usage: run_test [-junit]"
+ echo " -junit : Pipe output through ocunit2junit to allow Bamboo to parse
test results"
+ echo
+ exit 1
+}
+
+# check parameters
+for param in $*
+do
+ if [[ "$param" == "-junit" ]] ; then
+ JUNIT_FLAG="true"
+ else
+ # no other parameters supported
+ usage
+ fi
+done
+
+# remove previous test reports
+if [[ -d test-reports ]] ; then
+ echo "Removing previous test-reports folder..."
+ rm -R test-reports
+fi
+
+BUILD_OPTS=(test -scheme ObjectiveCMIS -destination OS=7.0,name="iPhone Retina
(4-inch 64-bit)")
+
+if [[ "$JUNIT_FLAG" == "true" ]] ; then
+ echo "Tests are running, output is being piped to ocunit2junit, results
will appear soon..."
+ xcodebuild "${BUILD_OPTS[@]}" 2>&1 | ocunit2junit
+else
+ xcodebuild "${BUILD_OPTS[@]}"
+fi
