BUILD - Fix DemoBench Windows installer (#3451) (#3656)

Specify paths to build tools correctly or else bugfixes will not applied.

(cherry picked from commit 4cc4e3f)
This commit is contained in:
Viktor Kolomeyko 2018-07-19 16:13:05 +01:00 committed by Katelyn Baker
parent 5ae8325980
commit be611115df
2 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@ if "%DIRNAME%" == "" set DIRNAME=.
call %DIRNAME%\..\..\gradlew -PpackageType=exe javapackage %* call %DIRNAME%\..\..\gradlew -PpackageType=exe javapackage %*
if ERRORLEVEL 1 goto Fail if ERRORLEVEL 1 goto Fail
@echo @echo
@echo Wrote installer to %DIRNAME%\build\javapackage\bundles\ @echo Wrote installer to %DIRNAME%build\javapackage\bundles\
@echo @echo
goto end goto end

View File

@ -29,14 +29,14 @@ if exist "%BUILDDIR%" rmdir /s /q "%BUILDDIR%"
mkdir "%BUILDDIR%" mkdir "%BUILDDIR%"
for /r "%SOURCEDIR%" %%j in (*.java) do ( for /r "%SOURCEDIR%" %%j in (*.java) do (
javac -O -d "%BUILDDIR%" "%%j" "%JAVA_HOME%\bin\javac" -O -d "%BUILDDIR%" "%%j"
if ERRORLEVEL 1 ( if ERRORLEVEL 1 (
@echo "Failed to compile %%j" @echo "Failed to compile %%j"
exit /b 1 exit /b 1
) )
) )
jar uvf %1 -C "%BUILDDIR%" . "%JAVA_HOME%\bin\jar" uvf %1 -C "%BUILDDIR%" .
if ERRORLEVEL 1 ( if ERRORLEVEL 1 (
@echo "Failed to update %1" @echo "Failed to update %1"
exit /b 1 exit /b 1