From 4e7a254e5adde05c7d86324f72c84a5b92162abb Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 6 Apr 2024 13:19:27 +0200 Subject: [PATCH] [FIXUP] test it --- .github/workflows/build.yml | 4 ++-- .../library/cocoa/build.sh | 6 +++--- .../library/gtk/build.sh | 11 ++++++++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 197925f374d..8253a2d2843 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,13 +88,13 @@ jobs: - name: Build on POSIX working-directory: features/org.eclipse.equinox.executable.feature/library/${{ matrix.config.ws }} env: - BINARIES_LOC: ${{ github.workspace }}/equinox.binaries + BINARIES_DIR: ${{ github.workspace }}/equinox.binaries run: ./build.sh -ws ${{ matrix.config.ws }} -os ${{ matrix.config.os }} -arch x86_64 install if: ${{ matrix.config.ws != 'win32'}} - name: Build on Windows working-directory: features/org.eclipse.equinox.executable.feature/library/win32 env: - BINARIES_LOC: ${{ github.workspace }}/equinox.binaries + BINARIES_DIR: ${{ github.workspace }}/equinox.binaries run: .\build.bat -ws win32 -os win32 -arch x86_64 install if: ${{ matrix.config.ws == 'win32'}} diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh index 40642b22369..34e94e3ce90 100755 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/build.sh @@ -62,7 +62,7 @@ PROGRAM_OUTPUT="$programOutput" DEFAULT_OS="$defaultOS" DEFAULT_WS="$defaultWS" DEPLOYMENT_TARGET=11.0 -if [ "$BINARIES_DIR" == "" ]; then BINARIES_DIR="../../../../../rt.equinox.binaries"; fi +if [ "$BINARIES_DIR" = "" ]; then BINARIES_DIR="../../../../../rt.equinox.binaries"; fi if [ "$defaultOSArch" == "arm64" ] || [ "$defaultOSArch" == "aarch64" ] then @@ -72,8 +72,8 @@ else DEFAULT_OS_ARCH="$defaultOSArch" fi -if [ "$EXE_OUTPUT_DIR" == "" ]; then EXE_OUTPUT_DIR="$BINARIES_DIR/org.eclipse.equinox.executable/bin/$defaultWS/$defaultOS/$DEFAULT_OS_ARCH/Eclipse.app/Contents/MacOS"; fi -if [ "$LIB_OUTPUT_DIR" == "" ]; then LIB_OUTPUT_DIR="$BINARIES_DIR/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$DEFAULT_OS_ARCH"; fi +if [ "$EXE_OUTPUT_DIR" = "" ]; then EXE_OUTPUT_DIR="$BINARIES_DIR/org.eclipse.equinox.executable/bin/$defaultWS/$defaultOS/$DEFAULT_OS_ARCH/Eclipse.app/Contents/MacOS"; fi +if [ "$LIB_OUTPUT_DIR" = "" ]; then LIB_OUTPUT_DIR="$BINARIES_DIR/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$DEFAULT_OS_ARCH"; fi # /System/Library/Frameworks/JavaVM.framework/Headers does not exist anymore on Yosemite if [ -e /System/Library/Frameworks/JavaVM.framework/Headers ]; then diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh index b905e9786f4..6698fd3944d 100755 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh @@ -39,7 +39,12 @@ programOutput="eclipse" defaultOS="" defaultOSArch="" defaultWS="gtk" -if [ "$BINARIES_DIR" == "" ]; then BINARIES_DIR="../../../../../rt.equinox.binaries"; fi + +echo "Hello 1" +echo "Hello $BINARIES_DIR" +if [ "$BINARIES_DIR" = "" ]; then BINARIES_DIR="../../../../../rt.equinox.binaries"; fi +echo $BINARIES_DIR + defaultJava=DEFAULT_JAVA_JNI defaultJavaHome="" javaHome="" @@ -146,8 +151,8 @@ elif [ "$defaultOSArch" = "s390x" ]; then fi fi -if [ "$EXE_OUTPUT_DIR" == "" ]; then EXE_OUTPUT_DIR="$BINARIES_DIR/org.eclipse.equinox.executable/bin/$defaultWS/$defaultOS/$defaultOSArch"; fi -if [ "$LIB_OUTPUT_DIR" == "" ]; then LIB_OUTPUT_DIR="$BINARIES_DIR/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"; fi +if [ "$EXE_OUTPUT_DIR" = "" ]; then EXE_OUTPUT_DIR="$BINARIES_DIR/org.eclipse.equinox.executable/bin/$defaultWS/$defaultOS/$defaultOSArch"; fi +if [ "$LIB_OUTPUT_DIR" = "" ]; then LIB_OUTPUT_DIR="$BINARIES_DIR/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"; fi export PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS DEFAULT_JAVA EXE_OUTPUT_DIR LIB_OUTPUT_DIR