From be611115dfac26db2e917d757f0fd3f51edfb61a Mon Sep 17 00:00:00 2001 From: Viktor Kolomeyko Date: Thu, 19 Jul 2018 16:13:05 +0100 Subject: [PATCH] BUILD - Fix DemoBench Windows installer (#3451) (#3656) Specify paths to build tools correctly or else bugfixes will not applied. (cherry picked from commit 4cc4e3f) --- tools/demobench/package-demobench-exe.bat | 2 +- tools/demobench/package/bugfixes/apply.bat | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/demobench/package-demobench-exe.bat b/tools/demobench/package-demobench-exe.bat index c2f0b41e80..5cbfd851a6 100644 --- a/tools/demobench/package-demobench-exe.bat +++ b/tools/demobench/package-demobench-exe.bat @@ -11,7 +11,7 @@ if "%DIRNAME%" == "" set DIRNAME=. call %DIRNAME%\..\..\gradlew -PpackageType=exe javapackage %* if ERRORLEVEL 1 goto Fail @echo -@echo Wrote installer to %DIRNAME%\build\javapackage\bundles\ +@echo Wrote installer to %DIRNAME%build\javapackage\bundles\ @echo goto end diff --git a/tools/demobench/package/bugfixes/apply.bat b/tools/demobench/package/bugfixes/apply.bat index 747dc67852..ba500032c1 100644 --- a/tools/demobench/package/bugfixes/apply.bat +++ b/tools/demobench/package/bugfixes/apply.bat @@ -29,14 +29,14 @@ if exist "%BUILDDIR%" rmdir /s /q "%BUILDDIR%" mkdir "%BUILDDIR%" for /r "%SOURCEDIR%" %%j in (*.java) do ( - javac -O -d "%BUILDDIR%" "%%j" + "%JAVA_HOME%\bin\javac" -O -d "%BUILDDIR%" "%%j" if ERRORLEVEL 1 ( @echo "Failed to compile %%j" exit /b 1 ) ) -jar uvf %1 -C "%BUILDDIR%" . +"%JAVA_HOME%\bin\jar" uvf %1 -C "%BUILDDIR%" . if ERRORLEVEL 1 ( @echo "Failed to update %1" exit /b 1