From cee08b0925ff2c9297be07b3ee9538dbcbe306f6 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Fri, 12 Jul 2024 21:35:31 +1000 Subject: [PATCH 1/4] ci fixes projectGenerator download. pg set to put command line in root projectGenerator --- scripts/ci/vs/install_bleeding.sh | 18 +++++++++--------- scripts/dev/download_pg.sh | 5 +++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/ci/vs/install_bleeding.sh b/scripts/ci/vs/install_bleeding.sh index 093639cb879..8b244f3e2d2 100644 --- a/scripts/ci/vs/install_bleeding.sh +++ b/scripts/ci/vs/install_bleeding.sh @@ -6,22 +6,22 @@ if [[ ! -d "$SCRIPT_DIR" ]]; then SCRIPT_DIR="$PWD"; fi unset BITS -${OF_ROOT}/scripts/vs/download_latest_libs.sh -p vs --silent +cd ${OF_ROOT} +./scripts/vs/download_latest_libs.sh -p vs --silent -cd ~/ rm -rf projectGenerator -mkdir -p ~/projectGenerator -cd ~/projectGenerator +mkdir -p projectGenerator +cd projectGenerator echo "Downloading projectGenerator from Github Bleeding" downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip 2> /dev/null unzip projectGenerator-vs.zip 2> /dev/null rm projectGenerator-vs.zip -downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs-gui.zip 2> /dev/null -unzip projectGenerator-vs-gui.zip 2> /dev/null -rm projectGenerator-vs-gui.zip +# downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs-gui.zip 2> /dev/null +# unzip projectGenerator-vs-gui.zip 2> /dev/null +# rm projectGenerator-vs-gui.zip cd $OF_ROOT -PG_OF_PATH=$OF_ROOT ~/projectGenerator/projectGenerator.exe examples/templates/emptyExample -PG_OF_PATH=$OF_ROOT ~/projectGenerator/projectGenerator.exe examples/templates/allAddonsExample +PG_OF_PATH=$OF_ROOT/projectGenerator/projectGenerator.exe examples/templates/emptyExample +PG_OF_PATH=$OF_ROOT/projectGenerator/projectGenerator.exe examples/templates/allAddonsExample diff --git a/scripts/dev/download_pg.sh b/scripts/dev/download_pg.sh index bfb42f6b515..0ff49799f8b 100755 --- a/scripts/dev/download_pg.sh +++ b/scripts/dev/download_pg.sh @@ -208,16 +208,21 @@ if [ "$PLATFORM" == "msys2" ] || [ "$PLATFORM" == "vs" ]; then if ! command -v rsync &> /dev/null then cp -ar ${OUTPUT}/ ${OUTDIR}/projectGenerator + cp -ar ${OUTDIR}/projectGenerator/resources/app/projectGenerator.exe ${OUTDIR}/projectGenerator/projectGeneratorCMD.exe else rsync -a ${OUTPUT}/ ${OUTDIR}/projectGenerator + rsync -a ${OUTDIR}/projectGenerator/resources/app/projectGenerator.exe ${OUTDIR}/projectGenerator/projectGeneratorCMD.exe fi rm -rf $OUTPUT + else if ! command -v rsync &> /dev/null then cp -ar $OUTPUT/projectGenerator$EXT $OUTDIR/projectGenerator + cp -ar projectGenerator/projectGenerator.app/Contents/MacOS/projectGenerator projectGenerator else rsync -a $OUTPUT/projectGenerator$EXT $OUTDIR/projectGenerator + rsync -a projectGenerator/projectGenerator.app/Contents/MacOS/projectGenerator projectGenerator fi rm -rf $OUTPUT/projectGenerator$EXT From 26b7bb6f9a9c64d3bda4b38f5c5e97907a54e29d Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Fri, 12 Jul 2024 22:02:56 +1000 Subject: [PATCH 2/4] vs ci fix --- scripts/ci/vs/install_bleeding.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/ci/vs/install_bleeding.sh b/scripts/ci/vs/install_bleeding.sh index 8b244f3e2d2..636679444ac 100644 --- a/scripts/ci/vs/install_bleeding.sh +++ b/scripts/ci/vs/install_bleeding.sh @@ -17,11 +17,20 @@ echo "Downloading projectGenerator from Github Bleeding" downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip 2> /dev/null unzip projectGenerator-vs.zip 2> /dev/null rm projectGenerator-vs.zip +ls +cd ../ # downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs-gui.zip 2> /dev/null # unzip projectGenerator-vs-gui.zip 2> /dev/null # rm projectGenerator-vs-gui.zip -cd $OF_ROOT -PG_OF_PATH=$OF_ROOT/projectGenerator/projectGenerator.exe examples/templates/emptyExample -PG_OF_PATH=$OF_ROOT/projectGenerator/projectGenerator.exe examples/templates/allAddonsExample +PG_OF_PATH=$OF_ROOT/projectGenerator/projectGenerator.exe + +PROJECTS=( + "examples/templates/emptyExample" + "examples/templates/allAddonsExample" +) + +for PROJECT in "${PROJECTS[@]}"; do + "$PG_OF_PATH" -o"$OF_ROOT" -a"$PROJECT" +done \ No newline at end of file From 017dd5c09b6b0157dee32aab09633a35f39f2b52 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Fri, 12 Jul 2024 22:08:25 +1000 Subject: [PATCH 3/4] missing pipes --- scripts/ci/vs/install_bleeding.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/ci/vs/install_bleeding.sh b/scripts/ci/vs/install_bleeding.sh index 636679444ac..aef8fb527c4 100644 --- a/scripts/ci/vs/install_bleeding.sh +++ b/scripts/ci/vs/install_bleeding.sh @@ -32,5 +32,8 @@ PROJECTS=( ) for PROJECT in "${PROJECTS[@]}"; do - "$PG_OF_PATH" -o"$OF_ROOT" -a"$PROJECT" + OPTIONS="-o\"$OF_ROOT\" \"$OF_ROOT/$PROJECT\"" + # Run the project generator executable with the combined options + eval "$PG_OF_PATH $OPTIONS" + #"$PG_OF_PATH" -o"$OF_ROOT" "$OF_ROOT/$PROJECT" done \ No newline at end of file From 9b278fe8da1373a138684c2fe18a4cc394302507 Mon Sep 17 00:00:00 2001 From: Dan Rosser Date: Fri, 12 Jul 2024 22:11:12 +1000 Subject: [PATCH 4/4] ill figure it out later --- .github/workflows/of.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/of.yml b/.github/workflows/of.yml index 2fe30216a86..e6370dcb83c 100644 --- a/.github/workflows/of.yml +++ b/.github/workflows/of.yml @@ -118,22 +118,14 @@ jobs: ./scripts/ci/vs/install_bleeding.sh - name: Setup MSBuild uses: microsoft/setup-msbuild@v2 - # - name: Build emptyExample - # working-directory: ${{env.GITHUB_WORKSPACE}} - # run: - # msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 - # - name: Build allAddonsExample - # working-directory: ${{env.GITHUB_WORKSPACE}} - # run: - # msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 - name: Build DEBUG emptyExample working-directory: ${{env.GITHUB_WORKSPACE}} run: msbuild examples/templates/emptyExample/emptyExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 - - name: Build DEBUG allAddonsExample - working-directory: ${{env.GITHUB_WORKSPACE}} - run: - msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 + # - name: Build DEBUG allAddonsExample + # working-directory: ${{env.GITHUB_WORKSPACE}} + # run: + # msbuild examples/templates/allAddonsExample/allAddonsExample.vcxproj /p:configuration=debug /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - -