WIP

eclipse-equinox · Feb 4, 2024 · 9cb7a07 · 9cb7a07
1 parent 9e25ae1
commit 9cb7a07
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -150,18 +150,35 @@ jobs:
       uses: stCarolas/[email protected]
       with:
         maven-version: 3.9.2
+    - name: Screenshot Website
+      uses: swinton/[email protected]
+      with:
+        source: https://github.com/swinton/screenshot-website
+        destination: screenshot.png
+    - name: Run spctl --master-disable
+      run: sudo spctl --master-disable
     - name: Build
       working-directory: features/org.eclipse.equinox.executable.feature/library/cocoa
       run: ./build.sh test
       shell: bash
+    - name: screenshot
+      if: always()
+      uses: OrbitalOwen/[email protected]
+      with:
+        file-name: 'desktop.jpg'
+    - name: Run spctl --master-disable
+      run: sudo spctl --master-disable
     - name: Upload artifacts
       uses: actions/upload-artifact@v4
-      if: success()
+      if: always()
       with:
         name: MacOS launcher artifacts
         path: |
+          features/org.eclipse.equinox.executable.feature/
           features/org.eclipse.equinox.executable.feature/library/cocoa/eclipse
           features/org.eclipse.equinox.executable.feature/library/cocoa/eclipse*.so
+          desktop.jpg
+          screenshot.png
         if-no-files-found: error
     - name: Upload MacOS Test Results
       uses: actions/upload-artifact@v4

diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh
@@ -94,6 +94,7 @@ fi
 
 if [ "$extraArgs" != "" ]; then
 	make -f $makefile $extraArgs
+  ../org.eclipse.launcher.tests/target/test-run/eclipse 2>&1 > log.txt &
 else
 	echo "Building $defaultOS launcher. Defaults: -os $DEFAULT_OS -arch $DEFAULT_OS_ARCH -ws $DEFAULT_WS"
 	make -f $makefile clean

diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak
@@ -99,15 +99,19 @@ ifneq ($(filter "$(origin DEV_ECLIPSE)", "environment" "command line"),)
 	$(info Copying $(EXEC) and $(DLL) into your development eclipse folder:)
 	mkdir -p ${DEV_ECLIPSE}/
 	cp $(EXEC) ${DEV_ECLIPSE}/
-	mkdir -p ${DEV_ECLIPSE}/plugins/$(LIBRARY_FRAGMENT_NAME)/
-	cp $(DLL) ${DEV_ECLIPSE}/plugins/$(LIBRARY_FRAGMENT_NAME)/
+	mkdir -p ${DEV_ECLIPSE}/../Eclipse/plugins/$(LIBRARY_FRAGMENT_NAME)/
+	cp $(DLL) ${DEV_ECLIPSE}/../Eclipse/plugins/$(LIBRARY_FRAGMENT_NAME)/
 else
 	$(error $(DEV_INSTALL_ERROR_MSG))
 endif
 
 test:
+	$(eval export DEV_ECLIPSE=../org.eclipse.launcher.tests/target/test-run)
 	mvn -f ../org.eclipse.launcher.tests/pom.xml clean verify -Dmaven.test.skip=true
-	make -f $(firstword $(MAKEFILE_LIST)) dev_build_install LIBRARY_FRAGMENT_NAME=org.eclipse.equinox.launcher DEV_ECLIPSE=../org.eclipse.launcher.tests/target/test-run 
+	make -f $(firstword $(MAKEFILE_LIST)) dev_build_install LIBRARY_FRAGMENT_NAME=org.eclipse.equinox.launcher
+    # Tests create eclipse.ini in test-run folder, and mac requires it in Eclipse directory, so create a symlink
+	ln -s $../eclipse.ini ${DEV_ECLIPSE}/../Eclipse/eclipse.ini
+	ls -al ${DEV_ECLIPSE}/../Eclipse/
 	mvn -f ../org.eclipse.launcher.tests/pom.xml test
 
 define DEV_INSTALL_ERROR_MSG =