diff --git a/bundledApps/Java/JavaVirtualMachines/jdk17.0.11.jdk/Contents/Home/lib/modules.zip b/bundledApps/Java/JavaVirtualMachines/jdk17.0.11.jdk/Contents/Home/lib/modules.zip index 500d004d..72031f7c 100644 Binary files a/bundledApps/Java/JavaVirtualMachines/jdk17.0.11.jdk/Contents/Home/lib/modules.zip and b/bundledApps/Java/JavaVirtualMachines/jdk17.0.11.jdk/Contents/Home/lib/modules.zip differ diff --git a/bundledApps/MAKEFILE.sh b/bundledApps/MAKEFILE.sh index 80728c32..7d076d49 100644 --- a/bundledApps/MAKEFILE.sh +++ b/bundledApps/MAKEFILE.sh @@ -121,6 +121,16 @@ mvWARCsBackFromTemp () fi } +# JDK 17's modules file is > 100 MB, which doesn't play well with Git, decompress it in-place here +decompressJDKModules () +{ + echo "Decompressing JDK 17 modules file for Heritrix" + cd ./bundledApps/Java/JavaVirtualMachines/jdk17.0.11.jdk/Contents/Home/lib/ + unzip ./modules.zip + rm -rf ./modules.zip + cd - +} + mvProducts () { echo "Moving WAIL.app to /Applications" @@ -181,6 +191,7 @@ makeWAIL () createBinary mvWARCsToTemp deleteBinary # Remove previous version + decompressJDKModules optimizeforMac mvProducts cleanupByproducts diff --git a/bundledApps/WAIL.py b/bundledApps/WAIL.py index 7a2b0dbe..0701acd9 100644 --- a/bundledApps/WAIL.py +++ b/bundledApps/WAIL.py @@ -1900,7 +1900,7 @@ def generate_cdx(): cdx_file_path = ( f"{cdx_file_path_pre}" f"{file.replace('.warc', '.cdx')}") - + process = subprocess.Popen( [cdx_indexer_path, join(warcs_path, file), cdx_file_path], stdout=PIPE,