From 28d26e4749c33edc7a67520c62b610abf906d7b0 Mon Sep 17 00:00:00 2001 From: mplescano Date: Fri, 10 Feb 2017 23:12:29 -0500 Subject: [PATCH] For java 8 x64 Tested once and worked. --- extra/jdk2z/jdk2z.bat | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/extra/jdk2z/jdk2z.bat b/extra/jdk2z/jdk2z.bat index 01bf0c6..dc9d430 100644 --- a/extra/jdk2z/jdk2z.bat +++ b/extra/jdk2z/jdk2z.bat @@ -61,16 +61,19 @@ REM ######################################## Echo [INFO] Target:%target_archive_full_path% Set 7z="%~dp07z\7z.exe" + Echo Path !7z! For /f "usebackq tokens=*" %%i In (`Cscript "%~dp0uuidgen.vbs"`) Do Set uuid=%%i For /f "tokens=1* delims=;" %%i In ("%TEMP%") Do Set tmpdir=%%i Set outputdir=%tmpdir%\%uuid% Echo [INFO] Extract to "%outputdir%" - !7z! x -y -o"%outputdir%" "%jdk_installer_full_path%" > NUL + Echo !7z! x -y -o"%outputdir%" "%jdk_installer_full_path%" + !7z! x -y -o"%outputdir%" "%jdk_installer_full_path%" Set isBuilt=0 - If Exist "%outputdir%\.rsrc" (Call :process_jdk6 & Set isBuilt=1) + If Exist "%outputdir%\.rsrc\JAVA_CAB10" (Call :process_jdk6 & Set isBuilt=1) If Exist "%outputdir%\tools.zip" (Call :process_jdk7 & Set isBuilt=1) + If Exist "%outputdir%\.rsrc\1033\JAVA_CAB10" (Call :process_jdk8_x64 & Set isBuilt=1) Call :cleanup If "%isBuilt%"=="0" Goto err_unknown_jdk @@ -93,6 +96,13 @@ Goto complete popd Goto complete +:process_jdk8_x64 + pushd "%outputdir%\.rsrc\1033\JAVA_CAB10" + extrac32 111 > NUL + Call :build_archive + popd +Goto complete + :build_archive Echo [INFO] Extract to "%CD%\tools" !7z! x -y -otools tools.zip > NUL @@ -133,4 +143,4 @@ REM ######################################## Exit /b 1 :complete - Exit /b 0 \ No newline at end of file + Exit /b 0