[Title] Fixed build script for windows

diff --git a/javacheck.bat b/javacheck.bat
new file mode 100644 (file)
index 0000000..22d814a
--- /dev/null
+++ b/javacheck.bat
@@ -0,0 +1,22 @@
+@echo off\r
+java -version 2> version.txt\r
+findstr /c:"1.7.0" version.txt\r
+if ERRORLEVEL 1 (\r
+    goto :1.6\r
+) else (\r
+    goto :Good\r
+)\r
+\r
+:1.6\r
+findstr /c:"1.6.0" version.txt\r
+if ERRORLEVEL 1 (\r
+    goto :Bad\r
+) else (\r
+    goto :Good\r
+)\r
+\r
+:Good\r
+@exit /b 0\r
+\r
+:Bad\r
+@exit /b 1
\ No newline at end of file

diff --git a/package/build.windows b/package/build.windows
index 711b030..56e1e50 100755 (executable)
--- a/package/build.windows
+++ b/package/build.windows
@@ -47,13 +47,13 @@ makeExecutable() {
        case ${TARGET_OS} in
         windows-32)
                        cp -rf $SRCDIR/InstallManager_java/dist/windows32/InstallManager.jar ${buildDir}/
-                       cp -rf $SRCDIR/windows-32/InstManager.exe ${buildDir}/
-                       cp -rf $SRCDIR/windows-32/InstManagerC.exe ${buildDir}/
+                       cp -rf $SRCDIR/binaries/windows-32/InstManager.exe ${buildDir}/
+                       cp -rf $SRCDIR/binaries/windows-32/InstManagerC.exe ${buildDir}/
                ;;
         windows-64)
                        cp -rf $SRCDIR/InstallManager_java/dist/windows64/InstallManager.jar ${buildDir}/
-                       cp -rf $SRCDIR/windows-32/InstManager.exe ${buildDir}/
-                       cp -rf $SRCDIR/windows-32/InstManagerC.exe ${buildDir}/
+                       cp -rf $SRCDIR/binaries/windows-64/InstManager.exe ${buildDir}/
+                       cp -rf $SRCDIR/binaries/windows-64/InstManagerC.exe ${buildDir}/
         ;;
         *)
                        echo "The OS \"${TARGET_OS}\" is not supported yet!"