From 910f60031ae7f8631eea4773563d6192857cf329 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Mon, 5 Mar 2012 01:46:41 +0000
Subject: [PATCH 1/3] html fix

---
 .../routerconsole/java/src/net/i2p/router/web/SearchHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java
index 29afd1592..a556e6cf0 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java
@@ -76,7 +76,7 @@ public class SearchHelper extends HelperBase {
         for (String name : _engines.keySet()) {
             buf.append("<option value=\"").append(name).append('\"');
             if (name.equals(dflt))
-                buf.append(" selected=\"true\"");
+                buf.append(" selected=\"selected\"");
             buf.append('>').append(name).append("</option>\n");
         }
         buf.append("</select>\n");

From 53768581759e59982d9dcd4d84bf8660ae108e9b Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Mon, 5 Mar 2012 13:39:54 +0000
Subject: [PATCH 2/3] Add WithJavadoc targets that also include Jetty

---
 build.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.xml b/build.xml
index 2d4f85cae..933295fcb 100644
--- a/build.xml
+++ b/build.xml
@@ -35,6 +35,8 @@
         <echo message="  updater200: Updater compressed with pack200 (creates i2pupdate200.zip, 60% smaller)" />
         <echo message="  updaterWithJavadoc: updater including the javadocs, for display in the console" />
         <echo message="  updater200WithJavadoc: updater including the javadocs, for display in the console (creates i2pupdate200.zip)" />
+        <echo message="  updaterWithJavadocAndJetty: updater including the javadocs, for display in the console, and Jetty " />
+        <echo message="  updater200WithJavadocAndJetty: updater including the javadocs, for display in the console, and Jetty (creates i2pupdate200.zip)" />
         <echo message="  updaterWithJetty: Updater including Jetty" />
         <echo message="  updater200withJetty: Updater including Jetty" />
         <echo message="  updaterWithJettyFixes: updater including local jetty patches" />
@@ -953,6 +955,8 @@
     <target name="updaterRepack" depends="prepupdate, preplicenses, repack200, zipit" />
     <target name="updaterWithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, zipit" />
     <target name="updater200WithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, pack200, zipit200" />
+    <target name="updaterWithJavadocAndJetty" depends="prepjupdate, preplicenses, copyJavadoc, zipit" />
+    <target name="updater200WithJavadocAndJetty" depends="prepjupdate, preplicenses, copyJavadoc, pack200, zipit200" />
     <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
     <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
     <target name="updaterWithJettyRepack" depends="prepjupdate, preplicenses, repack200, zipit" />

From 224405d7371d73d4ac9224149300454babfbc5e5 Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Mon, 5 Mar 2012 15:07:04 +0000
Subject: [PATCH 3/3] Allow EXEs to be built on AMD64

Enabling this should be safe since we will ship separate installers for
Win/non-Win. Those that don't want to build the EXEs can set noEXE in build.properties,
Even better might be to run one of
* ant installer-freebsd
* ant installer-linux
* ant installer-nowindows
* ant installer-osx
---
 build.properties |  2 ++
 build.xml        | 24 ++++++++++--------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/build.properties b/build.properties
index f9d91fde5..53d8f9643 100644
--- a/build.properties
+++ b/build.properties
@@ -18,3 +18,5 @@ i2pdocs.url=http://docs.i2p-projekt.de/javadoc/
 junitdocs.url=http://junit.org/apidocs/
 # This will go in the jar manifests
 build.built-by=unknown	
+# Uncomment the next line to prevent building EXEs (changing it to false will have no impact)
+#noExe=true
diff --git a/build.xml b/build.xml
index 933295fcb..25a818c2e 100644
--- a/build.xml
+++ b/build.xml
@@ -212,16 +212,10 @@
     <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup, if possible -->
     <target name="buildexe">
         <condition property="noExe">
-	    <os arch="x86_64" />
-	</condition>
-        <condition property="noExe">
-	    <os arch="ppc" />
-	</condition>
-	<condition property="noExe">
-	    <os arch="armv5tejl" />
-        </condition>
-        <condition property="noExe">
-	    <os arch="amd64" />
+	    <or>
+	        <os arch="ppc" />
+	        <os arch="armv5tejl" />
+	    </or>
 	</condition>
 	<condition property="noExe">
 	   <not>
@@ -240,6 +234,7 @@
 
     <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
     <target name="doBuildEXE" depends="buildProperties" unless="noExe">
+        <echo message="See the file &quot;build.properties&quot; if this step fails." />
         <jar destfile="./build/launchi2p.jar">
             <manifest>
 	     <attribute name="Main-Class" value="net.i2p.router.RouterLaunch" />
@@ -1192,10 +1187,10 @@
 
     <target name="installerexe">
         <condition property="noExe">
-	    <os arch="x86_64" />
-	</condition>
-        <condition property="noExe">
-	    <os arch="amd64" />
+	    <or>
+	        <os arch="ppc" />
+	        <os arch="armv5tejl" />
+	    </or>
 	</condition>
 	<condition property="noExe">
 	   <not>
@@ -1210,6 +1205,7 @@
 
     <!-- this makes i2pinstall.exe from install.jar -->
     <target name="doInstallerEXE" unless="noExe">
+        <echo message="See the file &quot;build.properties&quot; if this step fails." />
 	<!-- now the installer exe -->
         <launch4j configFile="./installer/i2pinstaller.xml" />
 	<!-- thazzit -->