Skip to content

Commit 5aec348

Browse files
authored
Update Readme for scripts (#478)
Remove settings packaged so default target works and its not automatically macOS
1 parent ca4e483 commit 5aec348

3 files changed

Lines changed: 51 additions & 11 deletions

File tree

ReadMe.md

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,51 @@
11
# Download instructions
22
You can download packaged macOS and Windows builds here ( note Linux needs to be built per platform ):
33
- https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-osx.zip
4-
- https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip
4+
- https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs-gui.zip
5+
- https://github.com/openframeworks/projectGenerator/releases/download/nightly/projectGenerator-vs.zip (commmandLine)
56

67
---------------------------------------
78

8-
# Build instructions
9+
# Build instructions with Bash Scripts
10+
11+
In the projectGenerator scripts folder run the scripts in order to setup environment and build
12+
13+
14+
## Visual Studio 2022
15+
16+
projectGenerator\scripts\vs\setup_environment.sh (first time)
17+
18+
projectGenerator\scripts\vs\build_cmdline.sh
19+
- (build projectGenerator commandLine requires openFrameworks in directories above / or run from correct sub-module location)
20+
21+
projectGenerator\scripts\vs\build_frontend.sh (Builds Electron App GUI Project Generator)
22+
- requires commandLine.exe in folder.
23+
- If cannot build commandLine.exe download from releases and run just this
24+
25+
projectGenerator\scripts\vs\build_dev_frontend.sh
26+
- (Builds Electron App GUI Project Generator in DEBUG mode / Verbose and will autorun the test build)
27+
28+
## macOS / osx
29+
30+
projectGenerator\scripts\osx\setup_environment.sh (first time)
31+
32+
projectGenerator\scripts\vs\build_cmdline.sh
33+
- (build projectGenerator commandLine requires openFrameworks in directories above / or run from correct sub-module location)
34+
35+
projectGenerator\scripts\vs\build_frontend.sh (Builds Electron App GUI Project Generator)
36+
- requires commandLine.exe in folder.
37+
- If cannot build commandLine.exe download from releases and run just this
38+
39+
## Linux
40+
41+
projectGenerator\scripts\linux\setup_environment.sh (first time)
42+
43+
projectGenerator\scripts\linux\buildPG.sh
44+
45+
46+
47+
# LEGAGY BUILD INSTRUCTIONS ----- (more detail)
48+
---------------------------------------
949

1050
## Clone OF ( skip if already cloned )
1151
```
@@ -31,7 +71,7 @@ make Release
3171
cp bin/projectGenerator ../frontend/app/
3272
3373
# for windows do:
34-
msbuild commandLine.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
74+
msbuild commandLine.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v143
3575
cp commandLine.exe ../frontend/app/projectGenerator.exe
3676
3777
# for macos

frontend/npm-shrinkwrap.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/osx/ci_build_pg.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ package_app(){
5353
echo "Directory contents:"
5454
ls
5555
echo "-------------"
56-
sed -i -e "s/osx/$PLATFORM/g" projectGenerator-$PLATFORM/projectGenerator.app/Contents/Resources/app/settings.json
56+
# sed -i -e "s/osx/$PLATFORM/g" projectGenerator-$PLATFORM/projectGenerator.app/Contents/Resources/app/settings.json
5757

5858
# Sign app
5959
echo "Signing electron .app"
@@ -92,7 +92,7 @@ sign_and_upload(){
9292
cd ${PG_DIR}
9393
cp commandLine/bin/projectGenerator projectGenerator-$PLATFORM/projectGenerator.app/Contents/Resources/app/app/projectGenerator 2> /dev/null
9494

95-
sed -i -e "s/osx/$PLATFORM/g" projectGenerator-$PLATFORM/projectGenerator.app/Contents/Resources/app/settings.json
95+
# sed -i -e "s/osx/$PLATFORM/g" projectGenerator-$PLATFORM/projectGenerator.app/Contents/Resources/app/settings.json
9696

9797
if [[ -z "${GA_CI_SECRET}" ]] ; then
9898
echo " Not on main repo skipping sign and upload ";

0 commit comments

Comments
 (0)