@@ -24,26 +24,24 @@ sign_and_upload(){
2424 PLATFORM=$1
2525 # Copy commandLine into electron .app
2626 cd ${pg_root}
27- # cp commandLine/bin/projectGenerator projectGenerator-$PLATFORM/projectGenerator.app/Contents/Resources/app/app/projectGenerator 2> /dev/null
27+ cp commandLine/bin/projectGenerator projectGenerator-$PLATFORM /projectGenerator.app/Contents/Resources/app/app/projectGenerator 2> /dev/null
2828 sed -i -e " s/osx/$PLATFORM /g" projectGenerator-$PLATFORM /projectGenerator.app/Contents/Resources/app/settings.json
2929
3030 echo " ${TRAVIS_REPO_SLUG} /${TRAVIS_BRANCH} " ;
3131 if [ " ${TRAVIS_REPO_SLUG} /${TRAVIS_BRANCH} " = " openframeworks/projectGenerator/master" ] && [ " ${TRAVIS_PULL_REQUEST} " = " false" ]; then
32- # Sign app
32+ # Sign app
3333 echo " Signing electron .app"
3434 cd ${pg_root}
3535 xattr -cr projectGenerator-$PLATFORM /projectGenerator.app
36- # codesign --deep --force --verbose --sign "Developer ID Application: Arturo Castro" "projectGenerator-$PLATFORM/projectGenerator.app/Contents/Frameworks/Electron Framework.framework"
37- echo codesign pg
3836 # codesign --deep --force --verbose --sign "Developer ID Application: Arturo Castro" "projectGenerator-$PLATFORM/projectGenerator.app"
3937 electron-osx-sign projectGenerator-$PLATFORM /projectGenerator.app --platform=darwin --type=distribution
4038
4139
4240 echo " Compressing PG app"
4341 zip --symlinks -r -q projectGenerator-$PLATFORM .zip projectGenerator-$PLATFORM
4442
45- # Upload to OF CI server
46- echo " Uploading app to CI servers"
43+ # Upload to OF CI server
44+ echo " Uploading $PLATFORM PG to CI servers"
4745 openssl aes-256-cbc -K $encrypted_cd38768cbb9d_key -iv $encrypted_cd38768cbb9d_iv -in scripts/id_rsa.enc -out scripts/id_rsa -d
4846 cp scripts/ssh_config ~ /.ssh/config
4947 chmod 600 scripts/id_rsa
@@ -80,12 +78,12 @@ git clone --depth=1 https://github.com/openframeworks/openFrameworks
8078mv projectGenerator openFrameworks/apps/
8179
8280cd ${of_root}
83- # scripts/osx/download_libs.sh
81+ scripts/osx/download_libs.sh
8482
8583# Compile commandline tool
8684cd ${pg_root}
8785echo " Building openFrameworks PG - OSX"
88- # xcodebuild -configuration Release -target commandLine -project commandLine/commandLine.xcodeproj
86+ xcodebuild -configuration Release -target commandLine -project commandLine/commandLine.xcodeproj
8987ret=$?
9088if [ $ret -ne 0 ]; then
9189 echo " Failed building Project Generator"
0 commit comments