Electron security hardening, upgrade to 43.4.1, Linux arm64 /Raspberry Pi GUI, Emscripten preview

.github/workflows/build-linux.yml

@@ -29,14 +29,14 @@ jobs:
     steps:
       # - name: Install libunwind
         # run: sudo apt-get install libunwind-dev wget2
-      
+
       - uses: actions/checkout@v4
-      
+
       - name: ccache
         uses: hendrikmuhs/ccache-action@v1.2.14
         with:
           key: ${{ matrix.cfg.target }}
-      
+
       - name: Determine Release
         id: vars
         shell: bash
@@ -56,56 +56,34 @@ jobs:
           fi
           TAG_NAME=${GITHUB_REF#refs/tags/}
           echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_ENV
-      
+
       - name: Install
         run: ./scripts/linux/ci_install_core.sh
-      
+
       - name: List directory
         run: ls -lah ./
-      
+
       - name: Build
         run: ./../openFrameworks/apps/projectGenerator/scripts/linux/build_cmdline.sh
 
-      - name: Test cmdline 
+      - name: Test cmdline
         run: ./../openFrameworks/apps/projectGenerator/scripts/linux/test_cmdline.sh
-      
+
       - name: List output directory
         run: ls -lah ./../openFrameworks/apps/projectGenerator/commandLine/bin
 
       - name: Copy commandLine to frontend
         run: |
           cp ./../openFrameworks/apps/projectGenerator/commandLine/bin/projectGenerator ./../openFrameworks/apps/projectGenerator/frontend/app/projectGenerator
           chmod 755 ./../openFrameworks/apps/projectGenerator/commandLine/bin/projectGenerator
-
-      - name: Build and Package projectGenerator Linux GUI
-        shell: bash
-        run: |
-          cd ../openFrameworks/apps/projectGenerator/frontend
-          npm install
-          npm update
-          npm run dist:linux64
-          cd dist
-          pwd
-          ls
-
-      - name: Build and Package projectGenerator Linux GUI
-        shell: bash
-        run: |
-          cd ../openFrameworks/apps/projectGenerator/frontend
-          npm install
-          npm update
-          npm run dist:linux:arm64
-          cd dist
-          pwd
-          ls
 
       - name: Build and Package projectGenerator Linux GUI
         shell: bash
         run: |
           cd ../openFrameworks/apps/projectGenerator/frontend
           npm install
           npm update
-          npm run dist:linux:armv7l
+          npm run dist:linux64
           cd dist
           pwd
           ls
@@ -116,18 +94,8 @@ jobs:
       - name: Copy GUI tarball to root directory
         run: |
           cd ./../openFrameworks/apps/projectGenerator/frontend/dist
-          mv projectGenerator-0.95.0.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-gui.gz
-
-      - name: Copy GUI tarball to root directory
-        run: |
-          cd ./../openFrameworks/apps/projectGenerator/frontend/dist
-          mv projectGenerator-0.95.0-arm64.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-arm64-gui.gz
+          mv projectGenerator-*.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-gui.gz
 
-      - name: Copy GUI tarball to root directory
-        run: |
-          cd ./../openFrameworks/apps/projectGenerator/frontend/dist
-          mv projectGenerator-0.95.0-armv7l.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-armv7l-gui.gz
-
       - name: Test Artefact zip
         run: |
           cd ./../openFrameworks/apps/projectGenerator/commandLine/bin/
@@ -154,26 +122,160 @@ jobs:
           tag_name: ${{ env.RELEASE }}
           files: projectGenerator-linux-gui.gz
 
-      - name: Update Release Linux gui - arm64
+      - name: Update Latest Tag - DateTime
+        uses: EndBug/latest-tag@latest
+        if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+        with:
+          ref: nightly
+          description: Latest Always Nightly Builds
+          force-branch: true
+
+  # Ubuntu 22.04 build - older glibc baseline, covers users/distros that can't
+  # run binaries linked against 24.04's newer glibc.
+  build-linux-ubuntu22:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2.14
+        with:
+          key: ubuntu22-linux
+
+      - name: Determine Release
+        shell: bash
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+            echo "RELEASE=nightly" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+            echo "RELEASE=bleeding" >> $GITHUB_ENV
+          else
+            echo "RELEASE=bleeding" >> $GITHUB_ENV
+          fi
+
+      - name: Install
+        run: ./scripts/linux/ci_install_core.sh
+
+      - name: Build
+        run: ./../openFrameworks/apps/projectGenerator/scripts/linux/build_cmdline.sh
+
+      - name: Test cmdline
+        run: ./../openFrameworks/apps/projectGenerator/scripts/linux/test_cmdline.sh
+
+      - name: Copy commandLine to frontend
+        run: |
+          cp ./../openFrameworks/apps/projectGenerator/commandLine/bin/projectGenerator ./../openFrameworks/apps/projectGenerator/frontend/app/projectGenerator
+          chmod 755 ./../openFrameworks/apps/projectGenerator/commandLine/bin/projectGenerator
+
+      - name: Build and Package projectGenerator Linux GUI
+        shell: bash
+        run: |
+          cd ../openFrameworks/apps/projectGenerator/frontend
+          npm install
+          npm update
+          npm run dist:linux64
+
+      - name: Copy GUI tarball to root directory
+        run: |
+          cd ./../openFrameworks/apps/projectGenerator/frontend/dist
+          mv projectGenerator-*.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-ubuntu22-gui.gz
+
+      - name: Test Artefact zip
+        run: |
+          cd ./../openFrameworks/apps/projectGenerator/commandLine/bin/
+          tar -cjf projectGenerator-linux-ubuntu22.tar.bz2 projectGenerator
+          mv projectGenerator-linux-ubuntu22.tar.bz2 $GITHUB_WORKSPACE/projectGenerator-linux-ubuntu22.tar.bz2
+
+      - name: Update Release Linux ubuntu22
         if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
         uses: softprops/action-gh-release@v2.0.8
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ env.RELEASE }}
-          files: projectGenerator-linux-arm64-gui.gz
+          files: projectGenerator-linux-ubuntu22.tar.bz2
 
-      - name: Update Release Linux gui - armv7l
+      - name: Update Release Linux gui ubuntu22
         if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
         uses: softprops/action-gh-release@v2.0.8
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           tag_name: ${{ env.RELEASE }}
-          files: projectGenerator-linux-armv7l-gui.gz
+          files: projectGenerator-linux-ubuntu22-gui.gz
 
-      - name: Update Latest Tag - DateTime
-        uses: EndBug/latest-tag@latest
-        if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+  # Native arm64 build for Raspberry Pi (64-bit Raspberry Pi OS / Ubuntu on Pi 3+).
+  # Runs on a real arm64 runner so the commandLine binary is actually arm64 -
+  # the previous armv7l/arm64 GUI packages just repackaged the x64 binary built
+  # above, which can't run on arm hardware at all.
+  build-linux-arm64:
+    runs-on: ubuntu-22.04-arm
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: ccache
+        uses: hendrikmuhs/ccache-action@v1.2.14
         with:
-          ref: nightly
-          description: Latest Always Nightly Builds
-          force-branch: true
+          key: arm64-linux
+
+      - name: Determine Release
+        shell: bash
+        run: |
+          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
+            echo "RELEASE=${{ github.ref_name }}" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/master" ]]; then
+            echo "RELEASE=nightly" >> $GITHUB_ENV
+          elif [[ "${{ github.ref }}" == "refs/heads/bleeding" ]]; then
+            echo "RELEASE=bleeding" >> $GITHUB_ENV
+          else
+            echo "RELEASE=bleeding" >> $GITHUB_ENV
+          fi
+
+      - name: Install
+        run: ./scripts/linux/ci_install_core.sh
+
+      - name: Build
+        run: ./../openFrameworks/apps/projectGenerator/scripts/linux/build_cmdline.sh
+
+      - name: Test cmdline
+        run: ./../openFrameworks/apps/projectGenerator/scripts/linux/test_cmdline.sh
+
+      - name: Copy commandLine to frontend
+        run: |
+          cp ./../openFrameworks/apps/projectGenerator/commandLine/bin/projectGenerator ./../openFrameworks/apps/projectGenerator/frontend/app/projectGenerator
+          chmod 755 ./../openFrameworks/apps/projectGenerator/commandLine/bin/projectGenerator
+
+      - name: Build and Package projectGenerator Linux GUI
+        shell: bash
+        run: |
+          cd ../openFrameworks/apps/projectGenerator/frontend
+          npm install
+          npm update
+          npm run dist:linux:arm64
+
+      - name: Copy GUI tarball to root directory
+        run: |
+          cd ./../openFrameworks/apps/projectGenerator/frontend/dist
+          mv projectGenerator-*-arm64.tar.gz $GITHUB_WORKSPACE/projectGenerator-linux-arm64-gui.gz
+
+      - name: Test Artefact zip
+        run: |
+          cd ./../openFrameworks/apps/projectGenerator/commandLine/bin/
+          tar -cjf projectGenerator-linux-arm64.tar.bz2 projectGenerator
+          mv projectGenerator-linux-arm64.tar.bz2 $GITHUB_WORKSPACE/projectGenerator-linux-arm64.tar.bz2
+
+      - name: Update Release Linux arm64
+        if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+        uses: softprops/action-gh-release@v2.0.8
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag_name: ${{ env.RELEASE }}
+          files: projectGenerator-linux-arm64.tar.bz2
+
+      - name: Update Release Linux gui arm64
+        if: github.repository == 'openframeworks/projectGenerator' && github.event_name == 'push' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/bleeding')
+        uses: softprops/action-gh-release@v2.0.8
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag_name: ${{ env.RELEASE }}
+          files: projectGenerator-linux-arm64-gui.gz

.github/workflows/build-vs.yml

@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
       - uses: msys2/setup-msys2@v2
         with:
           update: true

commandLine/App.xcconfig

@@ -2,4 +2,4 @@ OF_NO_FMOD = 1
 
 OF_CORE_LIBS = $(LIB_GLEW) $(LIB_PUGIXML)
 OF_CORE_HEADERS = $(HEADER_OF) $(HEADER_FREETYPE) $(HEADER_FREETYPE2) $(HEADER_FMOD) $(HEADER_GLEW) $(HEADER_FREEIMAGE) $(HEADER_TESS2) $(HEADER_CAIRO) $(HEADER_RTAUDIO) $(HEADER_GLFW) $(HEADER_UTF8) $(HEADER_JSON) $(HEADER_GLM) $(HEADER_CURL) ${HEADER_SSL} $(HEADER_URIPARSER) $(HEADER_PUGIXML) ${HEADER_BROTLI}
-OF_CORE_FRAMEWORKS = -framework Accelerate -framework AGL -framework AppKit -framework ApplicationServices -framework AudioToolbox -framework AVFoundation -framework Cocoa -framework CoreAudio -framework CoreFoundation -framework CoreMedia -framework CoreServices -framework CoreVideo -framework Foundation -framework IOKit -framework OpenGL -framework QuartzCore -framework Security -framework SystemConfiguration -framework Metal
+OF_CORE_FRAMEWORKS = -framework Accelerate -framework AppKit -framework ApplicationServices -framework AudioToolbox -framework AVFoundation -framework Cocoa -framework CoreAudio -framework CoreFoundation -framework CoreMedia -framework CoreServices -framework CoreVideo -framework Foundation -framework IOKit -framework OpenGL -framework QuartzCore -framework Security -framework SystemConfiguration -framework Metal

commandLine/src/addons/ofAddon.cpp

@@ -842,7 +842,20 @@ void ofAddon::parseLibsPath(const fs::path & libsPath, const fs::path & parentFo
 		s = fixPath(s);
 //        alert("fixpath after  " + ofPathToString(s));
 		addToFolder(s, parentFolder);
-		srcFiles.emplace_back(s);
+
+		// classify by extension instead of dumping everything into srcFiles (#8546)
+		string ext = ofPathToString(s.extension());
+		if (ext == ".c") {
+			csrcFiles.emplace_back(s);
+		} else if (ext == ".cpp" || ext == ".cc" || ext == ".cxx") {
+			cppsrcFiles.emplace_back(s);
+		} else if (ext == ".m" || ext == ".mm") {
+			objcsrcFiles.emplace_back(s);
+		} else if (ext == ".h" || ext == ".hpp") {
+			headersrcFiles.emplace_back(s);
+		} else {
+			srcFiles.emplace_back(s);
+		}
 	}
 
 	// so addons will never be system.

commandLine/src/defines.h

@@ -1,5 +1,5 @@
 #define OFPROJECTGENERATOR_MAJOR_VERSION "0"
-#define OFPROJECTGENERATOR_MINOR_VERSION "104"
+#define OFPROJECTGENERATOR_MINOR_VERSION "105"
 #define OFPROJECTGENERATOR_PATCH_VERSION "0"
 
 #define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION)

commandLine/src/main.cpp

@@ -26,6 +26,8 @@ enum optionIndex { UNKNOWN,
 	VERSION,
 	GET_OFPATH,
 	GET_HOST_PLATFORM,
+	GET_EMSDK,
+	OFMENU,
 	COMMAND,
 	BACKUP_PROJECT_FILES,
 	FRAMEWORKS,
@@ -47,6 +49,8 @@ constexpr option::Descriptor usage[] = {
 	{ VERSION, 0, "w", "version", option::Arg::None, "  --version, -w  \treturn the current version" },
 	{ GET_OFPATH, 0, "g", "getofpath", option::Arg::None, "  --getofpath, -g  \treturn the current ofPath" },
 	{ GET_HOST_PLATFORM, 0, "i", "platform", option::Arg::None, "  --getplatform, -i  \treturn the current host platform" },
+	{ GET_EMSDK, 0, "e", "getemsdk", option::Arg::None, "  --getemsdk, -e  \tdetect the Emscripten SDK (EMSDK env var, PATH, or a Homebrew install) and return its location" },
+	{ OFMENU, 0, "m", "ofmenu", option::Arg::Optional, "  --ofmenu, -m  \trun an oF Menu (scripts/of.sh) command: status | update-libs" },
 	{ COMMAND, 0, "c", "command", option::Arg::None, "  --command, -c \truns command" },
 	{ BACKUP_PROJECT_FILES, 0, "b", "backup", option::Arg::None, "  --backup, -b  \tbackup project files when replacing with template" },
 
@@ -509,6 +513,17 @@ int main(int argc, char ** argv) {
 		return EXIT_OK;
 	}
 
+	if (options[GET_EMSDK].count() > 0) {
+		auto sdk = resolveEmscriptenSDK();
+		ofLogNotice() << "{ \"emsdk\": " << sdk.emsdk << ", \"emccDir\": " << sdk.binDir << ", \"found\": " << (sdk.found ? "true" : "false") << " }";
+		return EXIT_OK;
+	}
+
+	if (options[OFMENU].count() > 0) {
+		string subcommand = options[OFMENU].arg ? options[OFMENU].arg : "status";
+		return runOfMenu(subcommand);
+	}
+
 	if (options[TEMPLATE].count() > 0) {
 		if (options[TEMPLATE].arg != NULL) {
 			string templateString(options[TEMPLATE].arg);

commandLine/src/projects/baseProject.cpp

@@ -22,7 +22,8 @@ baseProject::baseProject(const string & _target) : target(_target) {
 	bLoaded = false;
 }
 
-fs::path baseProject::getPlatformTemplateDir(std::string templateDir) {
+fs::path baseProject::getPlatformTemplateDir() {
+	// always the platform's own base template - extra templates are overlaid later via recursiveTemplateCopy (#8479)
 	string folder { target };
 	if ( target == "msys2"
 		|| target == "linux"
@@ -33,9 +34,6 @@ fs::path baseProject::getPlatformTemplateDir(std::string templateDir) {
 	) {
 		folder = "vscode";
 	}
-	if (templateDir != "") {
-		folder = templateDir;
-	}
 	return fs::weakly_canonical(getOFRoot() / templatesFolder / folder);
 }
 
@@ -137,7 +135,7 @@ bool baseProject::create(const fs::path & _path, string templateName){
 
 	addons.clear();
 	extSrcPaths.clear();
-	auto pathTemplate = getPlatformTemplateDir(templateName);
+	auto pathTemplate = getPlatformTemplateDir();
 	if (fs::exists(pathTemplate)) {
 		templatePath = normalizePath(pathTemplate);
 	} else {
@@ -659,7 +657,7 @@ void baseProject::addSrcFiles(ofAddon& addon, const vector<fs::path> &filepaths,
 		}
 		fs::path normalizedDir = makeRelative(getOFRoot(), s);
 		ofLogVerbose("baseProject::addSrcFiles") << "Adding addon " << toString(type) << " source file: [" << s.string() << "] folder:[" << addon.filesToFolders[s].string() << "]";
-		addSrc(normalizedDir, addon.filesToFolders[s]);
+		addSrc(normalizedDir, addon.filesToFolders[s], type);
 	}
 }
 

commandLine/src/projects/baseProject.h

@@ -82,7 +82,7 @@ class baseProject {
 
 	std::vector<Template> listAvailableTemplates(std::string target);
 	std::unique_ptr<baseProject::Template> parseTemplate(const fs::path & templateDir);
-	virtual fs::path getPlatformTemplateDir(std::string templateDir);
+	virtual fs::path getPlatformTemplateDir();
 
 	pugi::xml_document doc;
 	bool bLoaded;