Changeset 162c5bc

Timestamp:

Jun 9, 2011 8:38:01 PM (9 years ago)

Author:

kytv <kytv@…>

Branches:

master

Children:

2c0e6a3

Parents:

3d9f68a

Message:

New: 64-bit wrapper for Windows.

The Tanuki Software website states "64-bit Windows versions of the Java Service Wrapper
are not currently being made available in the Community Edition." The Makefile
for x86_64 is missing from the upstream tarball as well.

Well…included in this checkin is a diff against
$WRAPPER-3.5.9-SRC/src/c/Makefile-windows-x86-32.nmake (see the README in
installer/libs/wrapper/win64.

Files:

• build.xml (modified) (1 diff)
• history.txt (modified) (1 diff)
• installer/install.xml (modified) (1 diff)
• installer/lib/wrapper/win64/I2Psvc.exe (added)
• installer/lib/wrapper/win64/README-x64-win.txt (added)
• installer/lib/wrapper/win64/wrapper.dll (added)
• installer/lib/wrapper/win64/x64-win.patch (added)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

build.xml

@@ -507 +507 @@
         <copy todir="pkg-temp/lib/wrapper/win32/">
             <fileset dir="installer/lib/wrapper/win32/" />
+        </copy>
+        <copy todir="pkg-temp/lib/wrapper/win64/">
+            <fileset dir="installer/lib/wrapper/win64/" />
         </copy>
     </target>

history.txt

@@ +1 @@
+2011-06-09 kytv
+   * Added an x64 wrapper for Windows. This is needed because a 32bit wrapper
+     cannot start a 64bit JVM.
+
 2011-06-08 zzz
     * Build:

installer/install.xml

@@ -131 +131 @@
             <parsable targetfile="$INSTALL_PATH/runplain.sh" type="shell" os="unix|mac" />
             
+            <conditions>
+                <condition type="variable" id="is64bit">
+                    <name>SYSTEM_sun_arch_data_model</name>
+                    <value>64</value>
+                </condition> 
+            </conditions>
             <!-- postinstall stuff for windows -->
+            <!-- Wrapper for 32bit Windows JVM -->
             <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH\lib\wrapper\win32\I2Psvc.exe" /><arg value="$INSTALL_PATH" /></args></executable>
             <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" /><arg value="$INSTALL_PATH\lib" /></args></executable>
+            <!-- wrapper for 64bit Windows JVM -->
+            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"
+                condition="is64bit" > <os family="windows" />
+                <args><arg value="$INSTALL_PATH\lib\wrapper\win64\I2Psvc.exe" /><arg value="$INSTALL_PATH" /></args></executable>
+            <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"
+                condition="is64bit" > <os family="windows" />
+                <args><arg value="$INSTALL_PATH\lib\wrapper\win64\wrapper.dll" /><arg value="$INSTALL_PATH\lib" /></args></executable>
+            <!-- Arch-indep wrapper.jar on Windows -->
             <executable targetfile="$INSTALL_PATH/installer/copy.jar" type="jar" stage="postinstall" keep="true" failure="warn"> <os family="windows" />
                 <args><arg value="$INSTALL_PATH\lib\wrapper\all\wrapper.jar" /><arg value="$INSTALL_PATH\lib" /></args></executable>

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 20;
+    public final static long BUILD = 21;
 
     /** for example "-test" */