GH-571 Adapt build scripts

qvacua · Nov 29, 2017 · 740392f · 740392f
1 parent 69c515f
commit 740392f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/bin/build.sh b/bin/build.sh
@@ -70,7 +70,7 @@ fi
 
 echo "### Compressing the app"
 VIMR_FILE_NAME="VimR-${COMPOUND_VERSION}.tar.bz2"
-pushd build/Release
+pushd build/Build/Products/Release
 tar cjf ${VIMR_FILE_NAME} VimR.app
 popd
 
@@ -89,7 +89,7 @@ fi
 ./bin/create_github_release.sh "${COMPOUND_VERSION}" "${TAG}" "${VIMR_FILE_NAME}" "${RELEASE_NOTES}" ${IS_SNAPSHOT}
 
 if [ "${UPDATE_APPCAST}" = true ] ; then
-    ./bin/set_appcast.py "build/Release/${VIMR_FILE_NAME}" "${BUNDLE_VERSION}" "${MARKETING_VERSION}" "${TAG}" ${IS_SNAPSHOT}
+    ./bin/set_appcast.py "build/Build/Products/Release/${VIMR_FILE_NAME}" "${BUNDLE_VERSION}" "${MARKETING_VERSION}" "${TAG}" ${IS_SNAPSHOT}
     ./bin/commit_and_push_appcast.sh "${BRANCH}" "${COMPOUND_VERSION}" ${IS_SNAPSHOT} ${UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE}
 fi
 

diff --git a/bin/build_travis.sh b/bin/build_travis.sh
@@ -20,9 +20,9 @@ carthage update --platform osx --cache-builds
 
 # to avoid Xcode time out, cf https://stackoverflow.com/questions/37922146/xctests-failing-on-physical-device-canceling-tests-due-to-timeout/40790171#40790171
 echo "### Building"
-xcodebuild build -scheme SwiftNeoVim
-xcodebuild build -scheme VimR
+xcodebuild build -scheme SwiftNeoVim -workspace VimR.xcworkspace
+xcodebuild build -scheme VimR -workspace VimR.xcworkspace
 
 echo "### Executing tests"
-xcodebuild test -scheme SwiftNeoVim
-xcodebuild test -scheme VimR
+xcodebuild test -scheme SwiftNeoVim -workspace VimR.xcworkspace
+xcodebuild test -scheme VimR -workspace VimR.xcworkspace
diff --git a/bin/build_vimr.sh b/bin/build_vimr.sh
@@ -39,9 +39,9 @@ carthage update --platform osx
 echo "### Xcodebuilding"
 
 if [ "${CODE_SIGN}" = true ] ; then
-    xcodebuild CODE_SIGN_IDENTITY="Developer ID Application: Tae Won Ha (H96Q2NKTQH)" -configuration Release -target VimR
+    xcodebuild CODE_SIGN_IDENTITY="Developer ID Application: Tae Won Ha (H96Q2NKTQH)" -configuration Release -scheme VimR -workspace VimR.xcworkspace -derivedDataPath build
 else
-    xcodebuild -configuration Release -target VimR
+    xcodebuild -configuration Release -scheme VimR -workspace VimR.xcworkspace -derivedDataPath build
 fi
 
 echo "### Built VimR target"
diff --git a/bin/commit_and_push_appcast.sh b/bin/commit_and_push_appcast.sh
@@ -8,9 +8,9 @@ IS_SNAPSHOT=$3
 UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE=$4
 
 if [ "${IS_SNAPSHOT}" = true ] ; then
-    cp ./build/Release/appcast_snapshot.xml .
+    cp ./build/Build/Products/Release/appcast_snapshot.xml .
 else
-    cp ./build/Release/appcast.xml .
+    cp ./build/Build/Products/Release/appcast.xml .
 fi
 
 if [ "${IS_SNAPSHOT}" = false ] && [ "${UPDATE_SNAPSHOT_APPCAST_FOR_RELEASE}" = true ] ; then

diff --git a/bin/create_github_release.sh b/bin/create_github_release.sh
@@ -16,7 +16,7 @@ echo "VIMR_FILE_NAME: ${VIMR_FILE_NAME}"
 echo "RELEASE_NOTES: ${RELEASE_NOTES}"
 echo "IS_SNAPSHOT: ${IS_SNAPSHOT}"
 
-pushd build/Release
+pushd build/Build/Products/Release
 
 echo "### Creating release"
 if [ "${IS_SNAPSHOT}" = true ] ; then

diff --git a/bin/set_appcast.py b/bin/set_appcast.py
@@ -59,5 +59,5 @@
 
 appcast_file_name = 'appcast_snapshot.xml' if is_snapshot else 'appcast.xml'
 
-with io.open('build/Release/{0}'.format(appcast_file_name), 'w+') as appcast_file:
+with io.open('build/Build/Products/Release/{0}'.format(appcast_file_name), 'w+') as appcast_file:
     appcast_file.write(appcast)
diff --git a/ci/create_build_job.groovy b/ci/create_build_job.groovy
@@ -11,7 +11,7 @@ buildSnapshotJob.with {
 Builds a new snapshot of VimR and pushes the tag:<br>
 <ul>
   <li>
-    <a href="lastSuccessfulBuild/artifact/build/Release/">Last successful Release</a>
+    <a href="lastSuccessfulBuild/artifact/build/Build/Products/Release/">Last successful Release</a>
   </li>
 </ul>
 '''
@@ -49,7 +49,7 @@ Builds a new snapshot of VimR and pushes the tag:<br>
 
   publishers {
     archiveArtifacts {
-      pattern('build/Release/**')
+      pattern('build/Build/Products/Release/**')
       onlyIfSuccessful()
     }
   }