Skip to content

Commit b9a64ec

Browse files
committed
Improve build workflow.
1 parent 84df75b commit b9a64ec

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

build.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,17 @@ if [ $BUILD_MACOS ] ; then
138138

139139
# Fetch the ARX.framework from latest build into a location where Xcode will find it.
140140
SDK_FILENAME="artoolkitX.for.macOS.v${SDK_VERSION_PRETTY}.dmg"
141-
curl -f -o "${SDK_FILENAME}" --location "${SDK_URL_DIR}$(rawurlencode "${SDK_FILENAME}")"
141+
if [ ! -f "${SDK_FILENAME}" ] ; then
142+
curl -f -o "${SDK_FILENAME}" --location "${SDK_URL_DIR}$(rawurlencode "${SDK_FILENAME}")"
143+
fi
142144
hdiutil attach "${SDK_FILENAME}" -noautoopen -quiet -mountpoint "SDK"
143145
rm -rf depends/macOS/Frameworks/ARX.framework
144146
cp -af SDK/artoolkitX/SDK/Frameworks/ARX.framework depends/macOS/Frameworks
145147
hdiutil detach "SDK" -quiet -force
146148

147149
# Make the version number available to Xcode.
148150
cp macOS/user-config-in.xcconfig macOS/user-config.xcconfig
149-
sed -E -i "s/@VERSION@/${VERSION}/" macOS/user-config.xcconfig
151+
sed -E -i "" -e "s/@VERSION@/${VERSION}/" macOS/user-config.xcconfig
150152

151153
(cd macOS
152154
xcodebuild -target "artoolkitX Camera Calibration Utility" -configuration Release
@@ -159,7 +161,9 @@ if [ $BUILD_IOS ] ; then
159161

160162
# Fetch libARX from latest build into a location where Xcode will find it.
161163
SDK_FILENAME="artoolkitX.for.iOS.v${SDK_VERSION_PRETTY}.dmg"
162-
curl -f -o "${SDK_FILENAME}" --location "${SDK_URL_DIR}$(rawurlencode "${SDK_FILENAME}")"
164+
if [ ! -f "${SDK_FILENAME}" ] ; then
165+
curl -f -o "${SDK_FILENAME}" --location "${SDK_URL_DIR}$(rawurlencode "${SDK_FILENAME}")"
166+
fi
163167
hdiutil attach "${SDK_FILENAME}" -noautoopen -quiet -mountpoint "SDK"
164168
rm -rf depends/iOS/include/ARX/
165169
cp -af SDK/artoolkitX/SDK/include/ARX depends/iOS/include
@@ -169,7 +173,7 @@ if [ $BUILD_IOS ] ; then
169173

170174
# Make the version number available to Xcode.
171175
cp iOS/user-config-in.xcconfig iOS/user-config.xcconfig
172-
sed -E -i "s/@VERSION@/${VERSION}/" iOS/user-config.xcconfig
176+
sed -E -i "" -e "s/@VERSION@/${VERSION}/" iOS/user-config.xcconfig
173177

174178
(cd iOS
175179
xcodebuild -target "artoolkitX Camera Calibration Utility" -configuration Release -destination generic/platform=iOS

iOS/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>NSCameraUsageDescription</key>
28-
<string>Used for AR tracking</string>
28+
<string>Required for AR camera calibration</string>
2929
<key>NSHumanReadableCopyright</key>
30-
<string>©2015-2017, DAQRI LLC</string>
30+
<string>©2018 artoolkitX contributors</string>
3131
<key>UILaunchStoryboardName</key>
3232
<string>LaunchScreen</string>
3333
<key>UIMainStoryboardFile</key>

macOS/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<key>LSMinimumSystemVersion</key>
2424
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2525
<key>NSHumanReadableCopyright</key>
26-
<string>Copyright © 2018 artoolkitx.org. All rights reserved.</string>
26+
<string>©2018 artoolkitX contributors</string>
2727
<key>NSMainNibFile</key>
2828
<string>MainMenu</string>
2929
<key>NSPrincipalClass</key>

0 commit comments

Comments
 (0)