change /bin/sh to /bin/bash to fix failure on ubuntu

.cvsignore

@@ -0,0 +1,5 @@
+*~
+*#
+*.class
+.DS_Store
+Thumbs.db

build.xml

@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project basedir="." default="all" name="DMGExtractor">
+  <property environment="env"/>
+  <property name="debuglevel" value="source,lines,vars"/>
+  <property name="java.target.level" value="1.5"/>
+  <property name="java.source.level" value="1.5"/>
+  <property name="java.source.dir" value="src"/>
+  <property name="builddir" value=".antbuild~"/>
+  <property name="java.build.library.dir" value="lib"/>
+  <property name="java.runtime.library.dir" value="targets/application/lib"/>
+  <property name="target.application.manifest.dir" value="src.META-INF/application"/>
+  <property name="target.standalone.manifest.dir" value="src.META-INF/standalone"/>
+  <property name="target.standalone.jnlp.dir" value="src.JNLP-INF/standalone"/>
+  <property name="target.application.outjar" value="targets/application/lib/dmgextractor.jar"/>
+  <property name="target.standalone.outjar" value="targets/standalone/dmgextractor-standalone.jar"/>
+  <property name="target.hfsxlib.outjar" value="targets/hfsxlib/hfsx_dmglib.jar"/>
+
+
+  <!-- TARGET: init -->
+
+  <target name="init">
+    <mkdir dir="${builddir}"/>
+  </target>
+
+
+  <!-- TARGET: clean -->
+
+  <target name="clean">
+    <mkdir dir="${builddir}"/>
+    <delete dir="${builddir}"/>
+  </target>
+
+
+  <!-- TARGET: all -->
+
+  <target name="all">
+    <echo message="Currently defined targets:"/>
+    <echo message="  build-application - Builds the application target, compiling all project sources."/>
+    <echo message="  build-standalone - Builds the standalone target, creating a standalone executable jar file with only the essentials to run DMGExtractor."/>
+    <echo message="  build-hfsxlib - Builds the library subset of DMGExtractor required by HFSExplorer."/>
+    <echo message="  javadoc - Creates the javadoc documentation for the project."/>
+  </target>
+
+
+  <!-- TARGET: application -->
+
+  <path id="target.application.classpath">
+    <fileset dir="${java.runtime.library.dir}">
+      <include name="*.jar"/>
+      <exclude name="dmgextractor.jar"/>
+    </fileset>
+  </path>
+
+  <target name="build-application" depends="clean,jar-application"/>
+
+  <target name="compile-application" depends="init">
+    <javac srcdir="${java.source.dir}"
+	   destdir="${builddir}"
+	   includes="**"
+	   debug="true"
+	   debuglevel="${debuglevel}"
+	   encoding="iso-8859-1"
+	   source="${java.source.level}"
+	   target="${java.target.level}"
+	   deprecation="on">
+      <compilerarg value="-Xlint:unchecked"/>
+      <classpath refid="target.application.classpath"/>
+    </javac>
+  </target>
+
+  <target name="jar-application" depends="compile-application">
+    <jar destfile="${target.application.outjar}" basedir="${builddir}" manifest="${target.application.manifest.dir}/MANIFEST.MF" level="9"/>
+  </target>
+
+
+  <!-- TARGET: standalone -->
+
+  <target name="build-standalone" depends="clean,jar-standalone"/>
+
+  <target name="copyresources-standalone" depends="init">
+    <copy todir="${builddir}">
+      <zipfileset src="${java.runtime.library.dir}/csframework.jar" includes="**/*.class"/>
+      <zipfileset src="${java.runtime.library.dir}/apache-ant-1.7.0-bzip2.jar" includes="**/*.class"/>
+      <zipfileset src="${java.runtime.library.dir}/iharder-base64.jar" includes="**/*.class"/>
+      <zipfileset src="${java.runtime.library.dir}/swing-layout-1.0.3.jar" includes="**/*.class"/>
+    </copy>
+    <mkdir dir="${builddir}/JNLP-INF"/>
+    <copy file="${target.standalone.jnlp.dir}/dmgextractor.jnlp" tofile="${builddir}/JNLP-INF/APPLICATION.JNLP"/>
+  </target>
+
+  <target name="compile-standalone" depends="init,copyresources-standalone">
+    <javac srcdir="${java.source.dir}"
+	   destdir="${builddir}"
+	   includes="org/catacombae/dmgextractor/DMGExtractorGraphical.java"
+	   debug="true"
+	   debuglevel="${debuglevel}"
+	   source="${java.source.level}"
+	   target="${java.target.level}"
+	   deprecation="on">
+      <compilerarg value="-Xlint:unchecked"/>
+      <classpath>
+	<pathelement path="${builddir}"/>
+      </classpath>
+    </javac>
+  </target>
+
+  <target name="jar-standalone" depends="compile-standalone">
+    <jar destfile="${target.standalone.outjar}" basedir="${builddir}" manifest="${target.standalone.manifest.dir}/MANIFEST.MF" level="9"/>
+  </target>
+
+
+  <!-- TARGET: hfsxlib -->
+
+  <path id="target.hfsxlib.classpath">
+    <fileset dir="${java.runtime.library.dir}">
+      <include name="*.jar"/>
+      <exclude name="dmgextractor.jar"/>
+    </fileset>
+  </path>
+
+  <target name="build-hfsxlib" depends="clean,jar-hfsxlib"/>
+
+  <target name="compile-hfsxlib" depends="init">
+    <javac srcdir="${java.source.dir}"
+	   destdir="${builddir}"
+	   debug="true"
+	   debuglevel="${debuglevel}"
+	   source="${java.source.level}"
+	   target="${java.target.level}"
+	   deprecation="on">
+      <!-- All entry points to the DMGExtractor libraries from HFSExplorer should be listed here. -->
+      <include name="org/catacombae/dmg/udif/*.java"/>
+      <include name="org/catacombae/dmg/encrypted/*.java"/>
+      <include name="org/catacombae/dmg/sparsebundle/ReadableSparseBundleStream.java"/>
+      <include name="org/catacombae/dmgextractor/ui/PasswordDialog.java"/>
+
+      <compilerarg value="-Xlint:unchecked"/>
+      <classpath refid="target.hfsxlib.classpath"/>
+    </javac>
+  </target>
+
+  <target name="jar-hfsxlib" depends="compile-hfsxlib">
+    <jar destfile="${target.hfsxlib.outjar}" basedir="${builddir}" level="9"/>
+  </target>
+
+
+  <!-- TARGET: javadoc -->
+
+  <path id="javadoc.classpath">
+    <!--<fileset dir="${java.build.library.dir}">
+      <include name="**/*.jar"/>
+    </fileset>-->
+    <fileset dir="${java.runtime.library.dir}">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
+
+  <target name="javadoc">
+    <javadoc destdir="javadoc.~"
+	     packagenames="org.catacombae.*"
+	     sourcepath="${java.source.dir}"
+	     access="private"
+             author="true"
+             version="true"
+             use="true"
+             windowtitle="DMGExtractor API">
+
+      <link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
+      <link href="../../CatacombaeFramework/javadoc.~/"/>
+      <classpath>
+	<path refid="javadoc.classpath"/>
+      </classpath>
+    </javadoc>
+  </target>
+</project>

buildall.bat

@@ -1,33 +1,28 @@
-@echo off
-:begin
-setlocal
-
-set SOURCES_DIR=src
-set CLASSFILES_DIR=build.~
-set LIBRARY_PATH=lib
-set JARFILE=dmgextractor.jar
-set MANIFEST=meta\metafile.txt
-
-pushd %~dp0
-echo Removing all class files...
-if not exist %CLASSFILES_DIR% mkdir %CLASSFILES_DIR%
-del /f /q %CLASSFILES_DIR%\*.*
-echo Incrementing build number...
-java -cp .\buildenumerator BuildEnumerator src\BuildNumber.java
-echo Compiling...
-javac -sourcepath %SOURCES_DIR% -d %CLASSFILES_DIR% -Xlint:unchecked %SOURCES_DIR%\*.java
-set JAVAC_EXIT_CODE=%ERRORLEVEL%
-if not "%JAVAC_EXIT_CODE%"=="0" goto error
-echo Building jar-file...
-if not exist %LIBRARY_PATH% mkdir %LIBRARY_PATH%
-jar cvfm %LIBRARY_PATH%\%JARFILE% %MANIFEST% -C %CLASSFILES_DIR% . >NUL:
-if "%ERRORLEVEL%"=="0" (echo Done!) else echo Problems while building jar-file...
-popd
-goto end
-
-:error
-echo There were errors...
-goto end
-
-:end
-endlocal
+@echo off
+:begin
+setlocal
+
+set SOURCES_DIR=%~dp0src
+set BUILDTOOLS_CP=%~dp0lib\buildenumerator.jar
+
+pushd %~dp0
+
+echo Incrementing build number...
+java -cp "%BUILDTOOLS_CP%" BuildEnumerator "%SOURCES_DIR%\org\catacombae\dmgextractor\BuildNumber.java" 1
+if not "%ERRORLEVEL%"=="0" goto error
+
+echo Building with ant...
+call ant build-application
+if "%ERRORLEVEL%"=="0" (echo Done!) else echo Problems while building with ant... && goto error
+
+popd
+goto end
+
+:error
+echo There were errors...
+echo Decrementing build number...
+java -cp "%BUILDTOOLS_CP%" BuildEnumerator "%SOURCES_DIR%\org\catacombae\dmgextractor\BuildNumber.java" -1
+goto end
+
+:end
+endlocal

buildall.sh

@@ -1,60 +1,45 @@
-#!/bin/sh
+#!/bin/bash
+
+SOURCES_DIR=src
+BUILDTOOLS_CP=lib/buildenumerator.jar
 
 error() {
     echo "There were errors..."
-    echo "Decrementing build number..."
-    java -cp $BUILDTOOLS_CP BuildEnumerator $SOURCES_DIR/org/catacombae/dmgx/BuildNumber.java -1
+    decrement_buildnumber
+    exit 1
+}
+jobCompleted() {
+    echo "Done!"
 }
 
-SOURCES_DIR=src
-CLASSFILES_DIR=build.~
-LIBRARY_PATH=lib
-MANIFEST=meta/metafile.txt
-BUILD_CP=$CLASSFILES_DIR
-#:$LIBRARY_PATH/filedrop.jar
-BUILDTOOLS_CP=buildenumerator/buildenumerator.jar
-JARFILE=dmgextractor.jar
-
-if [ -d "$CLASSFILES_DIR" ]; then # if exists $CLASSFILES_DIR...
-    echo "Removing all class files..."
-    rm -r $CLASSFILES_DIR
-fi
-mkdir $CLASSFILES_DIR
-
-echo "Extracting swing-layout to classfiles directory..."
-cd $CLASSFILES_DIR
-jar xf "../$LIBRARY_PATH/swing-layout-1.0.1-stripped.jar"
-cd ..
+increment_buildnumber() {
+    echo "Incrementing build number..."
+    java -cp $BUILDTOOLS_CP BuildEnumerator $SOURCES_DIR/org/catacombae/dmgextractor/BuildNumber.java 1
+}
 
-echo "Extracting filedrop to classfiles directory..."
-cd $CLASSFILES_DIR
-jar xf "../$LIBRARY_PATH/filedrop.jar"
-cd ..
+decrement_buildnumber() {
+    echo "Decrementing build number..."
+    java -cp $BUILDTOOLS_CP BuildEnumerator $SOURCES_DIR/org/catacombae/dmgextractor/BuildNumber.java -1
+}
 
-#echo "Extracting base64 to classfiles directory..."
-#cd $CLASSFILES_DIR
-#jar xf "../$LIBRARY_PATH/base64.jar"
-#cd ..
+ant_build() {
+    ant build-application
+    return $?
+}
 
-echo "Incrementing build number..."
-java -cp $BUILDTOOLS_CP BuildEnumerator $SOURCES_DIR/org/catacombae/dmgx/BuildNumber.java 1
-echo "Compiling org.catacombae.dmgx..."
-javac -cp $BUILD_CP -sourcepath $SOURCES_DIR -d $CLASSFILES_DIR -Xlint:deprecation -Xlint:unchecked $SOURCES_DIR/org/catacombae/dmgx/*.java
-echo "Compiling org.catacombae.dmgx.gui..."
-javac -cp $BUILD_CP -sourcepath $SOURCES_DIR -d $CLASSFILES_DIR -Xlint:deprecation -Xlint:unchecked $SOURCES_DIR/org/catacombae/dmgx/gui/*.java
-JAVAC_EXIT_CODE=$?
-if [ "$JAVAC_EXIT_CODE" == 0 ]; then
-    echo "Building jar-file..."
-    if [ ! -d "$LIBRARY_PATH" ]; then # if not exists $LIBRARY_PATH...
-	echo "Making library path"
-	mkdir $LIBRARY_PATH
-    fi
-    jar cfm $LIBRARY_PATH/$JARFILE $MANIFEST -C $CLASSFILES_DIR .
+main() {
+    increment_buildnumber
     if [ "$?" == 0 ]; then
-	echo Done!
+	ant_build
+	if [ "$?" == 0 ]; then
+	    jobCompleted
+	else
+	    error
+	fi
     else
 	error
     fi
-else
-    error
-fi
+}
+
+# Entry point
+main

buildhfsxlib.bat

@@ -0,0 +1,21 @@
+@echo off
+:begin
+setlocal
+
+set SOURCES_DIR=%~dp0src
+
+pushd %~dp0
+
+echo Building with ant...
+call ant build-hfsxlib
+if "%ERRORLEVEL%"=="0" (echo Done!) else echo Problems while building with ant... && goto error
+
+popd
+goto end
+
+:error
+echo There were errors...
+goto end
+
+:end
+endlocal