Add MAKEFILE cleanup function, rm old Heritrix, update WAIL version

.codeclimate.yml

@@ -7,6 +7,6 @@ exclude_paths:
 - "build/*"
 - "support/*"
 - "WAIL.spec"
-- "bundledApps/heritrix-3.2.0/*"
+- "bundledApps/heritrix-3.4.0-20240909/*"
 - "bundledApps/html/*"
 - "bundledApps/tomcat/*"

README.md

@@ -5,7 +5,7 @@
 
 Web Archiving Integration Layer (WAIL) is a graphical user interface (GUI) atop multiple web archiving tools intended to be used as an easy way for anyone to preserve and replay web pages.
 
-Tools included and accessible through the GUI are <a href="https://github.com/internetarchive/heritrix3">Heritrix 3.2.0</a> and <a href="https://github.com/iipc/openwayback">OpenWayback 2.4.0</a>. Support packages include Apache Tomcat, <a href="https://github.com/pyinstaller/pyinstaller/">pyinstaller</a>, and <a href="https://github.com/oduwsdl/memgator">MemGator</a>.
+Tools included and accessible through the GUI are <a href="https://github.com/internetarchive/heritrix3">Heritrix heritrix-3.4.0-20240909</a> and <a href="https://github.com/iipc/openwayback">OpenWayback 2.4.0</a>. Support packages include Apache Tomcat, <a href="https://github.com/pyinstaller/pyinstaller/">pyinstaller</a>, and <a href="https://github.com/oduwsdl/memgator">MemGator</a>.
 
 WAIL is written in Python and compiled to a native executable using <a href="http://www.pyinstaller.org/">PyInstaller</a>.
 

build/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleShortVersionString</key>
-	<string>2020.03.20</string>
+	<string>2024.10.03</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © Mat Kelly - Web Archiving Integration Layer (WAIL)</string>
 	<key>CFBundleExecutable</key>

bundledApps/MAKEFILE.sh

@@ -94,7 +94,7 @@ createBinary ()
   #pkgbuild --install-location=/Applications --component ./dist/WAIL.app ~/Downloads/WAIL.pkg
 }
 
-deleteBinary ()
+deleteOldBinary ()
 {
   echo "Deleting binary"
   rm -rf /Applications/WAIL.app
@@ -127,7 +127,6 @@ 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 -
 }
 
@@ -144,6 +143,7 @@ cleanupByproducts ()
   # Remove installation remnants
   rm -r ./dist
   rm -r ./build/WAIL
+  rm ./bundledApps/Java/JavaVirtualMachines/jdk17.0.11.jdk/Contents/Home/lib/modules
 }
 
 optimizeforMac ()
@@ -184,15 +184,23 @@ tweakOS ()
   /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -f /Applications/WAIL.app
 }
 
+doFinalCleanupBeforeMove ()
+{
+  # We don't need the Java dependency ZIP in the binary
+  rm ./dist/WAIL.app/bundledApps/Java/JavaVirtualMachines/jdk17.0.11.jdk/Contents/Home/lib/modules.zip
+  # TODO: remove MAKEFILE from binary and other cruft that is fine in src but not in the .app
+}
+
 makeWAIL ()
 {
   echo "Running makeWAIL()"
   installRequirements
+  decompressJDKModules
   createBinary
   mvWARCsToTemp
-  deleteBinary # Remove previous version
-  decompressJDKModules
+  deleteOldBinary # Remove previous version
   optimizeforMac
+  doFinalCleanupBeforeMove
   mvProducts
   cleanupByproducts
   mvWARCsBackFromTemp
@@ -203,7 +211,7 @@ makeWAIL ()
   if [[ $ans == "b" ]] || [[ $ans == "d" ]]; then
     buildDiskImage
     if [[ $ans = "d" ]]; then # Remove the installed binary if only making dmg
-      deleteBinary
+      deleteOldBinary
     fi
   fi