diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ba39adc4ac..bca9c8adfcf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -94,7 +94,7 @@ jobs: - name: Build on Windows working-directory: features/org.eclipse.equinox.executable.feature/library/win32 env: - BINARIES_DIR: ${{ 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/make_cocoa.mak b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak index 5a8ae7988e3..4a766ecfa10 100644 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak @@ -86,6 +86,7 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS) $(CC) -bundle -o $(DLL) $(ARCHS) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS) install: all + $(info Install into: EXE_OUTPUT_DIR:$(EXE_OUTPUT_DIR) LIB_OUTPUT_DIR:$(LIB_OUTPUT_DIR)) mkdir -p $(EXE_OUTPUT_DIR) mv $(EXEC) $(EXE_OUTPUT_DIR) mkdir -p $(LIB_OUTPUT_DIR) diff --git a/features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak b/features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak index 87da1d8c85c..58d1d0be5de 100644 --- a/features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak +++ b/features/org.eclipse.equinox.executable.feature/library/win32/make_win64.mak @@ -96,7 +96,7 @@ eclipseJNI.obj: ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.c eclipseShm.obj: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c cl $(DEBUG) $(wcflags) $(cvarsmt) /Fo$*.obj ../eclipseShm.c - + $(EXEC): $(MAIN_OBJS) $(COMMON_OBJS) $(RES) link $(LFLAGS) -out:$(PROGRAM_OUTPUT) $(MAIN_OBJS) $(COMMON_OBJS) $(RES) $(LIBS) @@ -110,10 +110,11 @@ $(RES): $(PROGRAM_NAME).rc rc -r -fo $(RES) eclipse.rc install: all - mkdir $(EXE_OUTPUT_DIR) + @echo Install into: EXE_OUTPUT_DIR:$(EXE_OUTPUT_DIR) LIB_OUTPUT_DIR:$(LIB_OUTPUT_DIR)) + -1cmd /c "mkdir $(EXE_OUTPUT_DIR)" move /y $(EXEC) $(EXE_OUTPUT_DIR) move /y $(CONSOLE) $(EXE_OUTPUT_DIR) - mkdir $(LIB_OUTPUT_DIR) + -1cmd /c "mkdir $(LIB_OUTPUT_DIR)" del $(LIB_OUTPUT_DIR)\eclipse_*.dll move /y $(DLL) $(LIB_OUTPUT_DIR) del $(MAIN_OBJS) $(MAIN_CONSOLE_OBJS) $(DLL_OBJS) $(COMMON_OBJS) $(RES) eclipse_*.exp eclipse_*.lib