* Build: Add standard manifest to jbigi.jar

    * Update wrapper license

LICENSE.txt

@@ -127,8 +127,8 @@ Installer:
 
 
 
-Wrapper 3.1.1:
-   Copyright (c) 1999, 2004 Tanuki Software
+Java Service Wrapper Community Edition 32-bit 3.5.9:
+   Copyright (C) 1999-2011 Tanuki Software, Ltd. All Rights Reserved.
    See licenses/LICENSE-Wrapper.txt
 
 

build.xml

@@ -240,21 +240,50 @@
         <copy file="apps/addressbook/dist/addressbook.war" todir="build/" />
     </target>
 
-    <target name="jbigi">
+    <target name="jbigi-list-changes">
+        <exec executable="mtn" outputproperty="workspace.changes.jbigi" errorproperty="mtn.error.jbigi" failifexecutionfails="false" >
+            <arg value="list" />
+            <arg value="changed" />
+            <arg value="installer/lib/jbigi" />
+        </exec>
+        <!-- \n in an attribute value generates an invalid manifest -->
+        <exec executable="tr" inputstring="${workspace.changes.jbigi}" outputproperty="workspace.changes.jbigi.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
+            <arg value="-s" />
+            <arg value="[:space:]" />
+            <arg value="," />
+        </exec>
+    </target>
+
+    <target name="jbigi" depends="buildProperties, jbigi-list-changes" >
         <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
             <fileset dir="installer/lib/jbigi" includes="*.so *.dll *.jnilib" />
+            <manifest>
+                <attribute name="Build-Date" value="${build.timestamp}" />
+                <attribute name="Base-Revision" value="${workspace.version}" />
+                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
+            </manifest>
         </jar>
     </target>
 
-    <target name="jbigi-windows-only" >
+    <target name="jbigi-windows-only" depends="buildProperties, jbigi-list-changes" >
         <jar destfile="build/jbigi.jar" whenmanifestonly="fail" >
             <fileset dir="installer/lib/jbigi" includes="*windows*.dll" />
+            <manifest>
+                <attribute name="Build-Date" value="${build.timestamp}" />
+                <attribute name="Base-Revision" value="${workspace.version}" />
+                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
+            </manifest>
         </jar>
     </target>
 
-    <target name="jbigi-linux-only">
+    <target name="jbigi-linux-only"  depends="buildProperties, jbigi-list-changes" >
         <jar destfile="build/jbigi.jar"  whenmanifestonly="fail" >
             <fileset dir="installer/lib/jbigi" includes="*linux*.so" />
+            <manifest>
+                <attribute name="Build-Date" value="${build.timestamp}" />
+                <attribute name="Base-Revision" value="${workspace.version}" />
+                <attribute name="Workspace-Changes" value="${workspace.changes.jbigi.tr}" />
+            </manifest>
         </jar>
     </target>
 
@@ -460,7 +489,7 @@
         <copy file="installer/resources/postinstall.bat" todir="pkg-temp/" />
         <copy file="installer/resources/set_config_dir_for_nt_service.bat" todir="pkg-temp/" />
         <copy file="installer/resources/uninstall_i2p_service_winnt.bat" todir="pkg-temp/" />
-	<copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
+        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
         <copy todir="pkg-temp/lib/wrapper/win32/">
             <fileset dir="installer/lib/wrapper/win32/" />
         </copy>
@@ -469,6 +498,7 @@
     <!-- only what is needed for debian, etc. -->
     <target name="preppkg-linux-only" depends="preppkg-linux, jbigi-linux-only" >
         <copy file="build/jbigi.jar" todir="pkg-temp/lib" />
+        <copy file="installer/lib/wrapper/all/wrapper.jar" todir="pkg-temp/lib" />
     </target>
 
     <target name="preppkg-linux" depends="preppkg-base">

history.txt

+2011-06-08 zzz
+    * Build: Add standard manifest to jbigi.jar
+
+2011-06-06 zzz
+    * Drop andorid/ directory; further development will happen in
+      an android-only branch.
+
 2011-06-05 zzz
     * Console: Tag stat descriptions at declaration rather than in Strings.java
     * Data: Remove duplicate signature verification code
@@ -13,7 +20,7 @@
         The 4.3.2 files are half the size of those built with GMP 5.0.2, and there was
         little or no performance difference between the two versions for 32 bit processors.
         See http://zzz.i2p/topics/306 for discussion and test results.
-      - Replace old non-PIC 62-bit linux libs (GMP 4.1.4 built in 2005)
+      - Replace old non-PIC 64-bit linux libs (GMP 4.1.4 built in 2005)
         with PIC libs built with GMP 5.0.2. License is LGPLv3.
         Built by sponge with GCC 4.4.4, downloaded from
         http://sponge.i2p/files/jbigi/gmp-5.0.2/