From aae8bed3fa20bce731a0b6eef0dccf875cffbd4a Mon Sep 17 00:00:00 2001 From: ofTheo Date: Mon, 24 Apr 2023 13:57:02 -0700 Subject: [PATCH 1/4] test this approach --- scripts/ci/vs/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/vs/install.sh b/scripts/ci/vs/install.sh index 4d5b5a162f2..8081992acb7 100644 --- a/scripts/ci/vs/install.sh +++ b/scripts/ci/vs/install.sh @@ -17,5 +17,5 @@ unzip projectGenerator-vs.zip 2> /dev/null rm projectGenerator-vs.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 +~/projectGenerator/projectGenerator.exe -o./ examples/templates/emptyExample +~/projectGenerator/projectGenerator.exe -o./ examples/templates/allAddonsExample From b0781e2c3ae23d1116858bed2e1f61d7dafe6ef6 Mon Sep 17 00:00:00 2001 From: ofTheo Date: Mon, 24 Apr 2023 15:08:49 -0700 Subject: [PATCH 2/4] try nightly from github ci --- scripts/ci/vs/install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci/vs/install.sh b/scripts/ci/vs/install.sh index 8081992acb7..8fd2394d8b9 100644 --- a/scripts/ci/vs/install.sh +++ b/scripts/ci/vs/install.sh @@ -12,10 +12,10 @@ mkdir -p ~/projectGenerator cd ~/projectGenerator echo "Downloading projectGenerator from ci server" -downloader http://ci.openframeworks.cc/projectGenerator/projectGenerator-vs.zip 2> /dev/null +downloader https://github.com/ofTheo/projectGenerator/releases/download/nightly/projectGenerator-vs.zip 2> /dev/null unzip projectGenerator-vs.zip 2> /dev/null rm projectGenerator-vs.zip cd $OF_ROOT -~/projectGenerator/projectGenerator.exe -o./ examples/templates/emptyExample -~/projectGenerator/projectGenerator.exe -o./ 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 From 37d49f21802ddbfcbe5a0a0daaf010902a5d0c3c Mon Sep 17 00:00:00 2001 From: ofTheo Date: Mon, 24 Apr 2023 16:11:35 -0700 Subject: [PATCH 3/4] update VS pg zip location --- scripts/ci/vs/install.sh | 4 ++-- scripts/dev/create_package.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/ci/vs/install.sh b/scripts/ci/vs/install.sh index 8fd2394d8b9..8a12082e6ef 100644 --- a/scripts/ci/vs/install.sh +++ b/scripts/ci/vs/install.sh @@ -11,8 +11,8 @@ rm -rf projectGenerator mkdir -p ~/projectGenerator cd ~/projectGenerator -echo "Downloading projectGenerator from ci server" -downloader https://github.com/ofTheo/projectGenerator/releases/download/nightly/projectGenerator-vs.zip 2> /dev/null +echo "Downloading projectGenerator from Github Nightly" +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 diff --git a/scripts/dev/create_package.sh b/scripts/dev/create_package.sh index 7dbee8bd304..672b7753aac 100755 --- a/scripts/dev/create_package.sh +++ b/scripts/dev/create_package.sh @@ -409,7 +409,7 @@ function createPackage { cd ${pkg_ofroot} rm -rf apps/projectGenerator cd ${pkg_ofroot}/projectGenerator-vs/resources/app/app/ - downloader http://ci.openframeworks.cc/projectGenerator/projectGenerator-vs.zip + downloader https://github.com/openFrameworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip unzip projectGenerator-vs.zip 2> /dev/null rm projectGenerator-vs.zip cd ${pkg_ofroot} From 82ce99ff6f7d17c8776214762fa757978b8e1d4e Mon Sep 17 00:00:00 2001 From: ofTheo Date: Mon, 24 Apr 2023 16:16:18 -0700 Subject: [PATCH 4/4] fix case --- scripts/ci/vs/install.sh | 2 +- scripts/dev/create_package.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci/vs/install.sh b/scripts/ci/vs/install.sh index 8a12082e6ef..a7061ff4dea 100644 --- a/scripts/ci/vs/install.sh +++ b/scripts/ci/vs/install.sh @@ -12,7 +12,7 @@ mkdir -p ~/projectGenerator cd ~/projectGenerator echo "Downloading projectGenerator from Github Nightly" -downloader https://github.com/openFrameworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip 2> /dev/null +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 diff --git a/scripts/dev/create_package.sh b/scripts/dev/create_package.sh index 672b7753aac..05e3dd9c8fc 100755 --- a/scripts/dev/create_package.sh +++ b/scripts/dev/create_package.sh @@ -409,7 +409,7 @@ function createPackage { cd ${pkg_ofroot} rm -rf apps/projectGenerator cd ${pkg_ofroot}/projectGenerator-vs/resources/app/app/ - downloader https://github.com/openFrameworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip + downloader https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip unzip projectGenerator-vs.zip 2> /dev/null rm projectGenerator-vs.zip cd ${pkg_ofroot}