Update launch4j to 3.0.2

3rdparty/launch4j/LICENSE.txt

@@ -1,7 +1,7 @@
 Launch4j (http://launch4j.sourceforge.net/)
 Cross-platform Java application wrapper for creating Windows native executables.
 
-Copyright (c) 2004, 2008 Grzegorz Kowal
+Copyright (c) 2004, 2011 Grzegorz Kowal
 
 All rights reserved.
 

3rdparty/launch4j/current_version.txt

@@ -1 +1 @@
-The current version is 3.0.1
+The current version is 3.0.2

3rdparty/launch4j/head_src/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2004, 2008 Grzegorz Kowal
+Copyright (c) 2004, 2011 Grzegorz Kowal
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

3rdparty/launch4j/head_src/head.c

@@ -446,7 +446,7 @@ BOOL expandVars(char *dst, const char *src, const char *exePath, const int pathL
             *varName = 0;
             strncat(varName, start + 1, end - start - 1);
             // Remember value start for logging
-            char *varValue = dst + strlen(dst);
+            char *currentVarValue = dst + strlen(dst);
             if (strcmp(varName, "EXEDIR") == 0) {
                 strncat(dst, exePath, pathLen);
             } else if (strcmp(varName, "EXEFILE") == 0) {
@@ -460,7 +460,7 @@ BOOL expandVars(char *dst, const char *src, const char *exePath, const int pathL
             } else if (GetEnvironmentVariable(varName, varValue, MAX_VAR_SIZE) > 0) {
                 strcat(dst, varValue);
             }
-            debug("Substitute:\t%s = %s\n", varName, varValue);
+            debug("Substitute:\t%s = %s\n", varName, currentVarValue);
             src = end + 1;
         } else {
             // Copy remaining content
@@ -485,12 +485,19 @@ void appendHeapSizes(char *dst) {
 void appendHeapSize(char *dst, const int absID, const int percentID,
 		const DWORD freeMemory, const char *option) {
 	
-	const int mb = 1048576;		// 1 MB
+	const int mb = 1048576;			// 1 MB
+	const int mbLimit32 = 1500;  	// Max heap size in MB on 32-bit JREs
 	int abs = loadInt(absID);
 	int percent = loadInt(percentID);
 	int free = (long long) freeMemory * percent / (100 * mb);	// 100% * 1 MB
 	int size = free > abs ? free : abs;
 	if (size > 0) {
+		if (!(foundJava & KEY_WOW64_64KEY) && size > mbLimit32) {
+			debug("Heap limit:\tReduced %d MB heap size to 32-bit maximum %d MB\n",
+					size, mbLimit32);
+			size = mbLimit32;
+		}
+
 		debug("Heap %s:\t%d MB / %d%%, Free: %d MB, Heap size: %d MB\n",
 				option, abs, percent, freeMemory / mb, size);
 		strcat(dst, option);

3rdparty/launch4j/src/launch4j.properties

@@ -1,2 +1,2 @@
-versionNumber=3.0.1.0
-version=3.0.1
+versionNumber=3.0.2.0
+version=3.0.2

3rdparty/launch4j/src/net/sf/launch4j/Main.java

@@ -2,7 +2,7 @@
 	Launch4j (http://launch4j.sourceforge.net/)
 	Cross-platform Java application wrapper for creating Windows native executables.
 
-	Copyright (c) 2004, 2008 Grzegorz Kowal
+	Copyright (c) 2004, 2011 Grzegorz Kowal
 
 	All rights reserved.
 
@@ -90,7 +90,7 @@ public class Main {
 				" (http://launch4j.sourceforge.net/)\n" +
 				"Cross-platform Java application wrapper" +
 						" for creating Windows native executables.\n\n" +
-				"Copyright (C) 2004, 2008 Grzegorz Kowal\n\n" +
+				"Copyright (C) 2004, 2011 Grzegorz Kowal\n\n" +
 				"Launch4j comes with ABSOLUTELY NO WARRANTY.\n" +
 				"This is free software, licensed under the BSD License.\n" +
 				"This product includes software developed by the Apache Software Foundation" +

3rdparty/launch4j/src/net/sf/launch4j/Util.java

@@ -135,12 +135,17 @@ public class Util {
 			is.close();
 			p.waitFor();
 			if (errLine != -1) {
-				throw new ExecException(Messages.getString("Util.exec.failed")
-						+ ": " + cmd, errLine);
+				StringBuffer sb = new StringBuffer(Messages.getString("Util.exec.failed"));
+				AppendCommandLine(sb, cmd);
+				throw new ExecException(sb.toString(), errLine);
 			}
 			if (p.exitValue() != 0) {
-				throw new ExecException(Messages.getString("Util.exec.failed")
-						+ "(" + p.exitValue() + "): " + cmd);
+				StringBuffer sb = new StringBuffer(Messages.getString("Util.exec.failed"));
+				sb.append(" (");
+				sb.append(p.exitValue());
+				sb.append(')');
+				AppendCommandLine(sb, cmd);
+				throw new ExecException(sb.toString());
 			}
 		} catch (IOException e) {
 			close(is);
@@ -151,6 +156,16 @@ public class Util {
 		}
 	}
 	
+	private static void AppendCommandLine(StringBuffer sb, String[] cmd) {
+		sb.append(": ");
+		for (int i = 0; i < cmd.length; i++) {
+			sb.append(cmd[i]);
+			if (i < cmd.length - 1) {
+				sb.append(' ');
+			}
+		}
+	}
+
 	public static void close(final InputStream o) {
 		if (o != null) {
 			try {

3rdparty/launch4j/src/net/sf/launch4j/formimpl/MainFrame.java

@@ -333,7 +333,7 @@ public class MainFrame extends JFrame {
 						String path = _outfile.getPath();
 						if (Util.WINDOWS_OS) {
 							log.append(Messages.getString("MainFrame.executing") + path);
-							Util.exec(new String[] { path }, log);
+							Util.exec(new String[] { path, "--l4j-debug" }, log);
 						} else {
 							log.append(Messages.getString("MainFrame.jar.integrity.test")
 									+ path);

3rdparty/launch4j/web/changelog.html

@@ -11,7 +11,7 @@
 	<body>
 		<div id="container">
 			<div id="top">
-				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.0.1</span>
+				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.0.2</span>
 			</div>
 			<div id="leftnav">
 				<ul>
@@ -19,8 +19,8 @@
 					<li><a href="docs.html">Docs</a></li>
 					<li><a href="changelog.html">Changelog</a></li>
 					<li><a href="http://sourceforge.net/project/screenshots.php?group_id=95944">Screenshots</a></li>
-					<li><a href="http://sourceforge.net/project/showfiles.php?group_id=95944&amp;package_id=192323">Download</a></li>
-					<li><a href="http://sourceforge.net/forum/?group_id=95944">Support</a></li>
+					<li><a href="http://sourceforge.net/projects/launch4j/files/launch4j-3/3.0.2">Download</a></li>
+					<li><a href="http://sourceforge.net/projects/launch4j/support">Support</a></li>
 					<li><a href="http://sourceforge.net/projects/launch4j">Project summary</a></li>
 					<li><a href="http://sourceforge.net/tracker/?atid=613100&amp;group_id=95944">Bug tracker</a></li>
 					<li><a href="links.html">Links</a></li>
@@ -36,6 +36,14 @@
 			<div id="content">
 <h2>Changelog</h2>
 
+<h4>Changes in version 3.0.2 (02-01-2011)</h4>
+<ul class="changes">
+	<li>Fixed the command line in Exec error message.</li>
+	<li>Fixed set environment variable bug.</li>
+	<li>Added wrapper logging to launch4j GUI.</li>
+	<li>Fixed critical bug: heap size over the limit.</li>
+</ul>
+
 <h4>Changes in version 3.0.1 (20-07-2008)</h4>
 <ul class="changes">
 	<li>Enhanced the runtime logging (--l4j-debug).</li>
@@ -344,7 +352,7 @@
 			</div>
 			<div class="footer">
 			    All trademarks mentioned are properties of their respective owners.<br />
-            	Copyright &copy; 2005-2008 Grzegorz Kowal
+            	Copyright &copy; 2005-2011 Grzegorz Kowal
             	<p style="margin-top: 2em">
             		<a href="http://sourceforge.net"><img style="width: 125px; height: 37px; border: none" src="http://sourceforge.net/sflogo.php?group_id=95944&amp;type=4" alt="sf.net"></a>
             		<a href="http://www.nosoftwarepatents.com"><img style="width: 90px; height: 40px; border: none; margin-left: 5%" src="http://www.nosoftwarepatents.com/banners/90x40_3.jpg" alt=""></a>

3rdparty/launch4j/web/docs.html

@@ -11,7 +11,7 @@
 	<body>
 		<div id="container">
 			<div id="top">
-				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.0.1</span>
+				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.0.2</span>
 			</div>
 			<div id="leftnav">
 				<ul>
@@ -19,8 +19,8 @@
 					<li><a href="docs.html">Docs</a></li>
 					<li><a href="changelog.html">Changelog</a></li>
 					<li><a href="http://sourceforge.net/project/screenshots.php?group_id=95944">Screenshots</a></li>
-					<li><a href="http://sourceforge.net/project/showfiles.php?group_id=95944&amp;package_id=192323">Download</a></li>
-					<li><a href="http://sourceforge.net/forum/?group_id=95944">Support</a></li>
+					<li><a href="http://sourceforge.net/projects/launch4j/files/launch4j-3/3.0.2">Download</a></li>
+					<li><a href="http://sourceforge.net/projects/launch4j/support">Support</a></li>
 					<li><a href="http://sourceforge.net/projects/launch4j">Project summary</a></li>
 					<li><a href="http://sourceforge.net/tracker/?atid=613100&amp;group_id=95944">Bug tracker</a></li>
 					<li><a href="links.html">Links</a></li>
@@ -573,7 +573,7 @@ expansion is supported, for example:
 			</div>
 			<div class="footer">
 			    All trademarks mentioned are properties of their respective owners.<br />
-            	Copyright &copy; 2005-2008 Grzegorz Kowal
+            	Copyright &copy; 2005-2011 Grzegorz Kowal
             	<p style="margin-top: 2em">
             		<a href="http://sourceforge.net"><img style="width: 125px; height: 37px; border: none" src="http://sourceforge.net/sflogo.php?group_id=95944&amp;type=4" alt="sf.net"></a>
             		<a href="http://www.nosoftwarepatents.com"><img style="width: 90px; height: 40px; border: none; margin-left: 5%" src="http://www.nosoftwarepatents.com/banners/90x40_3.jpg" alt=""></a>

3rdparty/launch4j/web/index.html

@@ -11,7 +11,7 @@
 	<body>
 		<div id="container">
 			<div id="top">
-				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.0.1</span>
+				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.0.2</span>
 			</div>
 			<div id="leftnav">
 				<ul>
@@ -19,8 +19,8 @@
 					<li><a href="docs.html">Docs</a></li>
 					<li><a href="changelog.html">Changelog</a></li>
 					<li><a href="http://sourceforge.net/project/screenshots.php?group_id=95944">Screenshots</a></li>
-					<li><a href="http://sourceforge.net/project/showfiles.php?group_id=95944&amp;package_id=192323">Download</a></li>
-					<li><a href="http://sourceforge.net/forum/?group_id=95944">Support</a></li>
+					<li><a href="http://sourceforge.net/projects/launch4j/files/launch4j-3/3.0.2">Download</a></li>
+					<li><a href="http://sourceforge.net/projects/launch4j/support">Support</a></li>
 					<li><a href="http://sourceforge.net/projects/launch4j">Project summary</a></li>
 					<li><a href="http://sourceforge.net/tracker/?atid=613100&amp;group_id=95944">Bug tracker</a></li>
 					<li><a href="links.html">Links</a></li>
@@ -116,7 +116,7 @@
 			</div>
 			<div class="footer">
 			    All trademarks mentioned are properties of their respective owners.<br />
-            	Copyright &copy; 2005-2008 Grzegorz Kowal
+            	Copyright &copy; 2005-2011 Grzegorz Kowal
             	<p style="margin-top: 2em">
             		<a href="http://sourceforge.net"><img style="width: 125px; height: 37px; border: none" src="http://sourceforge.net/sflogo.php?group_id=95944&amp;type=4" alt="sf.net"></a>
             		<a href="http://www.nosoftwarepatents.com"><img style="width: 90px; height: 40px; border: none; margin-left: 5%" src="http://www.nosoftwarepatents.com/banners/90x40_3.jpg" alt=""></a>

3rdparty/launch4j/web/links.html

@@ -11,7 +11,7 @@
 	<body>
 		<div id="container">
 			<div id="top">
-				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.0.1</span>
+				<img style="width: 249px; height: 58px;" src="launch4j.gif" alt="launch4j"> <span class="version">3.0.2</span>
 			</div>
 			<div id="leftnav">
 				<ul>
@@ -19,8 +19,8 @@
 					<li><a href="docs.html">Docs</a></li>
 					<li><a href="changelog.html">Changelog</a></li>
 					<li><a href="http://sourceforge.net/project/screenshots.php?group_id=95944">Screenshots</a></li>
-					<li><a href="http://sourceforge.net/project/showfiles.php?group_id=95944&amp;package_id=192323">Download</a></li>
-					<li><a href="http://sourceforge.net/forum/?group_id=95944">Support</a></li>
+					<li><a href="http://sourceforge.net/projects/launch4j/files/launch4j-3/3.0.2">Download</a></li>
+					<li><a href="http://sourceforge.net/projects/launch4j/support">Support</a></li>
 					<li><a href="http://sourceforge.net/projects/launch4j">Project summary</a></li>
 					<li><a href="http://sourceforge.net/tracker/?atid=613100&amp;group_id=95944">Bug tracker</a></li>
 					<li><a href="links.html">Links</a></li>
@@ -61,7 +61,7 @@
 			</div>
 			<div class="footer">
 			    All trademarks mentioned are properties of their respective owners.<br />
-            	Copyright &copy; 2005-2008 Grzegorz Kowal
+            	Copyright &copy; 2005-2011 Grzegorz Kowal
             	<p style="margin-top: 2em">
             		<a href="http://sourceforge.net"><img style="width: 125px; height: 37px; border: none" src="http://sourceforge.net/sflogo.php?group_id=95944&amp;type=4" alt="sf.net"></a>
             		<a href="http://www.nosoftwarepatents.com"><img style="width: 90px; height: 40px; border: none; margin-left: 5%" src="http://www.nosoftwarepatents.com/banners/90x40_3.jpg" alt=""></a>