Added Ant build file for Java wrapper project.

diff --git a/.gitignore b/.gitignore
index 7ae59b2..e4789b2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 /bindings/Java/native/bin
 /bindings/Java/native/obj
 /bindings/Java/wrapper/bin
+/bindings/Java/wrapper/out
 /bindings/Microsoft.NET/MHashDotNet384.Example/obj
 /bindings/Microsoft.NET/MHashDotNet384.Wrapper/obj
 /bindings/Microsoft.NET/bin

diff --git a/Make.cmd b/Make.cmd
index 93b57dc..ad97db6 100644 (file)
--- a/Make.cmd
+++ b/Make.cmd
@@ -10,6 +10,50 @@ set "MSVC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC"
 set "PDOC_PATH=C:\Program Files (x86)\Pandoc"
 set "GIT2_PATH=C:\Program Files\Git\bin"
 
+REM Java Paths
+set "JDK_HOME=C:\Program Files\Java\jdk1.8.0_74"
+set "ANT_HOME=C:\Eclipse\apache-ant"
+
+
+REM ///////////////////////////////////////////////////////////////////////////
+REM // Check paths
+REM ///////////////////////////////////////////////////////////////////////////
+
+if not exist "%MSVC_PATH%\vcvarsall.bat" (
+       "%~dp0\tools\cecho.exe" RED "\nMSVC not found\n%MSVC_PATH:\=\\%\\vcvarsall.bat\n"
+       pause & goto:eof
+)
+
+if not exist "%PDOC_PATH%\pandoc.exe" (
+       "%~dp0\tools\cecho.exe" RED "\nMSVC not found\n%PDOC_PATH:\=\\%\\pandoc.exe\n"
+       pause & goto:eof
+)
+
+if not exist "%GIT2_PATH%\git.exe" (
+       "%~dp0\tools\cecho.exe" RED "\nMSVC not found\n%GIT2_PATH:\=\\%\\git.exe\n"
+       pause & goto:eof
+)
+
+if not exist "%JDK_HOME%\lib\tools.jar" (
+       "%~dp0\..\..\tools\cecho.exe" RED "\nJava not found\n%JDK_HOME:\=\\%\\lib\\tools.jar\n"
+       pause & goto:eof
+)
+
+if not exist "%JDK_HOME%\bin\javac.exe" (
+       "%~dp0\..\..\tools\cecho.exe" RED "\nJava not found\n%JDK_HOME:\=\\%\\bin\\javac.exe\n"
+       pause & goto:eof
+)
+
+if not exist "%ANT_HOME%\bin\ant.bat" (
+       "%~dp0\..\..\tools\cecho.exe" RED "\nAnt not found\n%ANT_HOME:\=\\%\\bin\\ant.cmd\n"
+       pause & goto:eof
+)
+
+if not exist "%ANT_HOME%\lib\ant.jar" (
+       "%~dp0\..\..\tools\cecho.exe" RED "\nAnt not found\n%ANT_HOME:\=\\%\\lib\\ant.jar\n"
+       pause & goto:eof
+)
+
 
 REM ///////////////////////////////////////////////////////////////////////////
 REM // Get current date and time (in ISO format)
@@ -29,7 +73,7 @@ REM ///////////////////////////////////////////////////////////////////////////
 REM // Clean up temp files
 REM ///////////////////////////////////////////////////////////////////////////
 
-"%~dp0\tools\cecho" YELLOW "\n========[ CLEAN UP ]========\n"
+"%~dp0\tools\cecho.exe" YELLOW "\n========[ CLEAN UP ]========\n"
 
 for %%i in (bin,obj) do (
        del /Q /S /F "%~dp0\%%i\*.*"
@@ -39,15 +83,22 @@ for %%i in (bin,MHashDotNet384.Example\obj,MHashDotNet384.Wrapper\obj) do (
        del /Q /S /F "%~dp0\bindings\Microsoft.NET\%%i\*.*"
 )
 
+for %%i in (natiove\obj,native\bin,warapper\bin,warapper\out) do (
+       del /Q /S /F "%~dp0\bindings\Java\%%i\*.*"
+)
+
 
 REM ///////////////////////////////////////////////////////////////////////////
 REM // Build the binaries
 REM ///////////////////////////////////////////////////////////////////////////
 
-"%~dp0\tools\cecho" YELLOW "\n========[ COMPILE ]========\n"
+"%~dp0\tools\cecho.exe" YELLOW "\n========[ COMPILE ]========\n"
+
+set "JAVA_HOME=%JDK_HOME%"
+set "ANT_HOME=%ANT_HOME%"
 call "%MSVC_PATH%\vcvarsall.bat"
 
-for %%q in (MHashLib.sln,bindings\Microsoft.NET\MHashDotNet384.sln) do (
+for %%q in (MHashLib.sln,bindings\Microsoft.NET\MHashDotNet384.sln,bindings\Java\native\MHashJava384.sln) do (
        for %%p in (x86,x64) do (
                MSBuild.exe /property:Platform=%%p /property:Configuration=Release /target:Clean   "%~dp0\%%~q"
                if not "!ERRORLEVEL!"=="0" goto BuildHasFailed
@@ -56,6 +107,11 @@ for %%q in (MHashLib.sln,bindings\Microsoft.NET\MHashDotNet384.sln) do (
        )
 )
 
+pushd "%~dp0\bindings\Java\wrapper"
+call "%ANT_HOME%\bin\ant.bat" clean jar
+if not "!ERRORLEVEL!"=="0" goto BuildHasFailed
+popd
+
 
 REM ///////////////////////////////////////////////////////////////////////////
 REM // Generate Docs
@@ -79,6 +135,8 @@ set "OUT_PATH_BIN_X86=%~dp0\out\mhash_384.%ISO_DATE%%REVISON%.bin-msvc-x86.zip"
 set "OUT_PATH_BIN_X64=%~dp0\out\mhash_384.%ISO_DATE%%REVISON%.bin-msvc-x64.zip"
 set "OUT_PATH_NET_X86=%~dp0\out\mhash_384.%ISO_DATE%%REVISON%.dotnet-x86.zip"
 set "OUT_PATH_NET_X64=%~dp0\out\mhash_384.%ISO_DATE%%REVISON%.dotnet-x64.zip"
+set "OUT_PATH_JNI_X86=%~dp0\out\mhash_384.%ISO_DATE%%REVISON%.java-win-x86.zip"
+set "OUT_PATH_JNI_X64=%~dp0\out\mhash_384.%ISO_DATE%%REVISON%.java-win-x64.zip"
 set "OUT_PATH_SRC_GEN=%~dp0\out\mhash_384.%ISO_DATE%%REVISON%.src.tar.gz"
 
 set /a COUNTER=COUNTER+1
@@ -88,6 +146,8 @@ if exist "%OUT_PATH_BIN_X86%" goto GenerateOutfileNameNext
 if exist "%OUT_PATH_BIN_X64%" goto GenerateOutfileNameNext
 if exist "%OUT_PATH_NET_X86%" goto GenerateOutfileNameNext
 if exist "%OUT_PATH_NET_X64%" goto GenerateOutfileNameNext
+if exist "%OUT_PATH_JNI_X86%" goto GenerateOutfileNameNext
+if exist "%OUT_PATH_JNI_X64%" goto GenerateOutfileNameNext
 if exist "%OUT_PATH_SRC_GEN%" goto GenerateOutfileNameNext
 
 
@@ -95,7 +155,7 @@ REM ///////////////////////////////////////////////////////////////////////////
 REM // Build ZIP package
 REM ///////////////////////////////////////////////////////////////////////////
 
-"%~dp0\tools\cecho" YELLOW "\n========[ PACKAGING ]========\n"
+"%~dp0\tools\cecho.exe" YELLOW "\n========[ PACKAGING ]========\n"
 
 "%~dp0\tools\zip.exe" -j -9 -z "%OUT_PATH_BIN_X86%" "%~dp0\bin\Win32\Release\mhash_384.x86.exe" "%~dp0\README.html" "%~dp0\COPYING.txt" < "%~dp0\COPYING.txt"
 "%~dp0\tools\zip.exe" -j -9 -z "%OUT_PATH_BIN_X64%" "%~dp0\bin\x64\.\Release\mhash_384.x64.exe" "%~dp0\README.html" "%~dp0\COPYING.txt" < "%~dp0\COPYING.txt"
@@ -103,6 +163,9 @@ REM ///////////////////////////////////////////////////////////////////////////
 "%~dp0\tools\zip.exe" -j -9 -z "%OUT_PATH_NET_X86%" "%~dp0\bindings\Microsoft.NET\bin\x86\Release\MHashDotNet384.x86.dll" "%~dp0\bindings\Microsoft.NET\bin\x86\Release\MHashDotNet384.Example.exe" "%~dp0\README.html" "%~dp0\COPYING.txt" < "%~dp0\COPYING.txt"
 "%~dp0\tools\zip.exe" -j -9 -z "%OUT_PATH_NET_X64%" "%~dp0\bindings\Microsoft.NET\bin\x64\Release\MHashDotNet384.x64.dll" "%~dp0\bindings\Microsoft.NET\bin\x64\Release\MHashDotNet384.Example.exe" "%~dp0\README.html" "%~dp0\COPYING.txt" < "%~dp0\COPYING.txt"
 
+"%~dp0\tools\zip.exe" -j -9 -z "%OUT_PATH_JNI_X86%" "%~dp0\bindings\Java\native\bin\x86\Release\MHashJava384.x86.dll" "%~dp0\bindings\Java\wrapper\out\MHashJava384.jar" "%~dp0\README.html" "%~dp0\COPYING.txt" < "%~dp0\COPYING.txt"
+"%~dp0\tools\zip.exe" -j -9 -z "%OUT_PATH_JNI_X64%" "%~dp0\bindings\Java\native\bin\x64\Release\MHashJava384.x64.dll" "%~dp0\bindings\Java\wrapper\out\MHashJava384.jar" "%~dp0\README.html" "%~dp0\COPYING.txt" < "%~dp0\COPYING.txt"
+
 "%GIT2_PATH%\git.exe" archive --format tar.gz -9 --verbose --output "%OUT_PATH_SRC_GEN%" HEAD
 
 
@@ -110,7 +173,7 @@ REM ///////////////////////////////////////////////////////////////////////////
 REM // Completed
 REM ///////////////////////////////////////////////////////////////////////////
 
-"%~dp0\tools\cecho" GREEN "\nBUILD COMPLETED.\n"
+"%~dp0\tools\cecho.exe" GREEN "\nBUILD COMPLETED.\n"
 pause
 goto:eof
 
@@ -120,6 +183,6 @@ REM // Failed
 REM ///////////////////////////////////////////////////////////////////////////
 
 :BuildHasFailed
-"%~dp0\tools\cecho" RED "\nBUILD HAS FAILED.\n"
+"%~dp0\tools\cecho.exe" RED "\nBUILD HAS FAILED.\n"
 pause
 goto:eof
\ No newline at end of file

diff --git a/bindings/Java/wrapper/build.xml b/bindings/Java/wrapper/build.xml
new file mode 100644 (file)
index 0000000..3dec39a
--- /dev/null
+++ b/bindings/Java/wrapper/build.xml
@@ -0,0 +1,15 @@
+<project default="jar">
+    <target name="clean">
+        <delete dir="bin"/>
+        <delete dir="out"/>
+    </target>
+    <target name="compile">
+        <mkdir dir="bin"/>
+        <javac srcdir="src" destdir="bin"/>
+    </target>
+    <target name="jar" depends="compile">
+        <mkdir dir="out"/>
+        <delete file="out/MHashJava384.jar"/>
+        <jar destfile="out/MHashJava384.jar" basedir="bin"/>
+    </target>
+</project>