Split Build Steps for PG into seperate files. macOS / VS now should be easily built

.github/workflows/build-macos.yml

@@ -3,60 +3,116 @@ name: build-macos
 on:
   push:
     paths-ignore:
-    - '**/README.md'
+      - '**/README.md'
   pull_request:
     paths-ignore:
-    - '**/README.md'
+      - '**/README.md'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
   build-osx:
-    runs-on: macos-12
+    runs-on: macos-13
     strategy:
-        matrix:
-          cfg:
+      matrix:
+        cfg:
           - {target: osx}
     env:
-     TARGET: ${{matrix.cfg.target}}
+      TARGET: ${{ matrix.cfg.target }}
     steps:
-    - uses: actions/checkout@v3
-    # - name: Cache OF
-    #   id: cache-of
-    #   uses: actions/cache@v3
-    #   env:
-    #     cache-name: cache-keep-of
-    #   with:
-    #     path: |
-    #       /Users/runner/work/projectGenerator/openFrameworks/**
-    #     key: ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-${{ hashFiles('openFrameworks/**/*.cpp') }}
-    #     restore-keys: |
-    #       ${{ runner.os }}-${{matrix.cfg.opt}}-${{ env.cache-name }}-          
-    - name: rm-dev
-      run: sudo rm -rf /Library/Developer
-    - name: Build
-      run:
-        ./scripts/osx/buildPG.sh;
-      env:
-        DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer"
-        SDKROOT: "/Applications/Xcode_13.4.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
-        # DEVELOPER_DIR: "/Applications/Xcode_14.2.app/Contents/Developer"
-        # SDKROOT: "/Applications/Xcode_14.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
-        GA_CI_SECRET: ${{ secrets.CI_SECRET }}
-        CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
-        CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
-        GA_APPLE_USERNAME: ${{ secrets.GA_APPLE_USERNAME }}
-        GA_APPLE_PASS: ${{ secrets.GA_APPLE_PASS }}
-        GA_NOTARIZE_PROVIDER: ${{ secrets.GA_NOTARIZE_PROVIDER }}
-    - name: Update Release
-      if: github.repository == 'openframeworks/projectGenerator' && github.ref == 'refs/heads/master'
-      uses: IsaacShelton/[email protected]
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        tag: nightly
-        release: nightly
-        prerelease: false
-        replace: false
-        files: ../openFrameworks/apps/projectGenerator/projectGenerator-osx/projectGenerator-osx.zip ../openFrameworks/apps/projectGenerator/projectGenerator-ios/projectGenerator-ios.zip
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 16
+      - name: Setup
+        run: ./scripts/osx/setup_environment.sh
+      - name: Determine Release
+        id: vars
+        shell: bash
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+            echo "release=nightly" >> $GITHUB_ENV
+            echo "prerelease=false" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+            echo "release=bleeding" >> $GITHUB_ENV
+            echo "prerelease=true" >> $GITHUB_ENV
+          fi
+      - name: Build PG macOS GUI and command line
+        run: |
+          echo "Current directory: (should be projectGenerator)"
+          pwd
+          echo "Directory contents:"
+          ls
+          echo "Setup CI setup environment / checkout oF "
+          ./scripts/osx/ci_install_core.sh
+
+          echo "Current directory after moving up: (should be projectGenerator/projectGenerator)"
+          pwd
+          cd ../
+
+          echo "Current directory after moving up: (should be projectGenerator/)"
+          echo "------------------"
+          pwd
+          ls
+          echo "------------------"
+          if [ -f "openFrameworks/apps/projectGenerator/scripts/osx/ci_build_pg.sh" ]; then
+            echo "ci_build_pg.sh exists, running script..."
+            openFrameworks/apps/projectGenerator/scripts/osx/ci_build_pg.sh
+          else
+            echo "ci_build_pg.sh does not exist, checking Git status..."
+            if cd openFrameworks/apps/projectGenerator; then
+              echo "Current Git branch in projectGenerator:"
+              git rev-parse --abbrev-ref HEAD
+              echo "Latest commit hash in projectGenerator:"
+              git rev-parse HEAD
+            else
+              echo "Failed to change directory to openFrameworks/apps/projectGenerator"
+            fi
+            echo "Current directory: (should be openFrameworks/apps/projectGenerator)"
+            pwd
+            echo "Directory contents:"
+            ls
+            echo "------------------"
+            echo "Failure exit1"
+            exit 1
+          fi
+        env:
+          GA_CI_SECRET: ${{ secrets.CI_SECRET }}
+          CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
+          CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
+          GA_APPLE_USERNAME: ${{ secrets.GA_APPLE_USERNAME }}
+          GA_APPLE_PASS: ${{ secrets.GA_APPLE_PASS }}
+          GA_NOTARIZE_PROVIDER: ${{ secrets.GA_NOTARIZE_PROVIDER }}
+      - name: Check output
+        run: |
+          echo "Current directory: (should be projectGenerator)"
+          pwd
+          echo "Directory contents:"
+          ls
+          if [ -f "projectGenerator/projectGenerator-osx.zip" ]; then
+            echo "projectGenerator/projectGenerator-osx.zip found at level 1"
+          else
+            echo "projectGenerator/projectGenerator-osx.zip NOT found at level 1"
+          fi
+          if [ -f "projectGenerator/projectGenerator/projectGenerator-osx.zip" ]; then
+            echo "projectGenerator/projectGenerator/projectGenerator-osx.zip found at level 2"
+          else
+            echo "projectGenerator/projectGenerator/projectGenerator-osx.zip NOT found at level 2"
+          fi
+          if [ -f "projectGenerator-osx.zip" ]; then
+            echo "projectGenerator-osx.zip found at level 0"
+          else
+            echo "projectGenerator-osx.zip NOT found at level 0"
+          fi
+      - name: Update Release x86_64
+        if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+        uses: IsaacShelton/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ env.release }}
+          release: ${{ env.release }}
+          prerelease: ${{ env.prerelease }}
+          replace: false
+          files: projectGenerator-osx.zip

.github/workflows/build-vs.yml

@@ -29,7 +29,10 @@ jobs:
       BITS: ${{ matrix.bits }}
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 18
       - uses: msys2/setup-msys2@v2
         with:
           update: true
@@ -39,28 +42,66 @@ jobs:
             zip
             rsync
             wget
+      - name: Determine Release
+        id: vars
+        shell: bash
+        run: |
+          if [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+            echo "release=nightly" >> $GITHUB_ENV
+            echo "prerelease=false" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+            echo "release=bleeding" >> $GITHUB_ENV
+            echo "prerelease=true" >> $GITHUB_ENV
+          fi 
       - name: Install dependencies
-        shell: msys2 {0}
+        shell: bash
         run:
-          ./scripts/vs/install.sh
+          ./scripts/vs/ci_install.sh
       - name: Setup MSBuild
         uses: microsoft/[email protected]
-      - name: Build projectGenerator
+
+      - name: Build projectGenerator CMDLine with oF
         working-directory: ${{env.GITHUB_WORKSPACE}}
         run:
           msbuild ../openFrameworks/apps/projectGenerator/commandLine/commandLine.vcxproj /p:configuration=release /p:platform=${{ matrix.platform }} /p:PlatformToolset=v142
-      - name: Create zip
-        if: github.repository == 'openframeworks/projectGenerator' && github.ref == 'refs/heads/master'
+
+      - name: Create projectGenerator cmd zip
         shell: msys2 {0}
         run:
-          ./scripts/vs/create_package.sh
-      - name: Update Release
-        if: github.repository == 'openframeworks/projectGenerator' && github.ref == 'refs/heads/master'
-        uses: IsaacShelton/[email protected]
+          ../openFrameworks/apps/projectGenerator/scripts/vs/ci_cmd_package.sh
+
+      - name: Build and Package projectGenerator VS GUI
+        shell: bash
+        run: |
+          cd ../openFrameworks/apps/projectGenerator/frontend
+          npm install
+          npm update
+          npm run dist:win64
+          cd dist
+          pwd
+          ls
+      - name: Create projectGenerator VS GUI package
+        shell: msys2 {0}
+        run:
+          ../openFrameworks/apps/projectGenerator/scripts/vs/ci_frontend_package.sh
+
+      - name: Update CMD Gen Release
+        if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+        uses: IsaacShelton/[email protected]
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          tag: nightly
-          release: nightly
-          prerelease: false
+          tag: ${{ env.release }}
+          release: ${{ env.release }}
+          prerelease: ${{ env.release }}
           replace: false
           files: ../openFrameworks/apps/projectGenerator/commandLine/bin/projectGenerator-vs.zip
+      - name: Update Project Gen GUI Release
+        if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+        uses: IsaacShelton/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ env.release }}
+          release: ${{ env.release }}
+          prerelease: ${{ env.release }}
+          replace: false
+          files: ../openFrameworks/apps/projectGenerator/frontend/dist/projectGenerator-vs-gui.zip

.gitignore

@@ -96,3 +96,4 @@ Temporary Items
 commandLine/bin/projectGenerator*
 frontend/app/projectGenerator*
 
+commandLine/.vs/commandLine/xs

commandLine/commandLine.xcodeproj/project.pbxproj

@@ -282,7 +282,7 @@
 			buildActionMask = 2147483647;
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if test -f \"$TARGET_BUILD_DIR/projectGenerator\"; then rm \"$TARGET_BUILD_DIR/projectGenerator\"; fi;  cp \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\" \"$TARGET_BUILD_DIR/projectGenerator\"";
+			shellScript = "if test -f \"$TARGET_BUILD_DIR/projectGenerator\"; then rm \"$TARGET_BUILD_DIR/projectGenerator\"; fi;  cp \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\" \"$TARGET_BUILD_DIR/projectGenerator\"\n";
 			showEnvVarsInLog = 0;
 		};
 		E42962A92163ECCD00A6A9E2 /* Run Script — Compile OF */ = {
@@ -342,6 +342,7 @@
 					"$(OF_CORE_HEADERS)",
 					src,
 				);
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__";
 			};
 			name = Debug;
@@ -358,6 +359,7 @@
 					"$(OF_CORE_HEADERS)",
 					src,
 				);
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CPLUSPLUSFLAGS = "-D__MACOSX_CORE__";
 			};
 			name = Release;
@@ -381,6 +383,7 @@
 					src/uuidxx/src,
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(OF_CORE_LIBS)",
 					"$(OF_CORE_FRAMEWORKS)",
@@ -407,6 +410,7 @@
 					src/uuidxx/src,
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(OF_CORE_LIBS)",
 					"$(OF_CORE_FRAMEWORKS)",