Changeset 106af99 for build.xml

Timestamp:

Nov 21, 2010 8:37:49 PM (10 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

9e8af73

Parents:

c8cad6a

Message:

• SSLEepGet, Reseeder:
  • Implement additional CA loading
  • Provide facility to reuse SSL state for speed
  • Provide facility to store previously untrusted certificates
  • Add SSL reseed hosts, prefer them by default
  • Reseed message cleanup
• build.xml:
  • Add www.cacert.org cert to the installer and updater so SSL on a.netdb.i2p2.de and c.netdb.i2p2.de will work
  • Cleanup, fix distclean error in older ants.

File:

• build.xml (modified) (9 diffs)

build.xml

@@ -246 +246 @@
     </target>
     <target name="distclean" depends="clean">
-        <delete includeemptydirs="true" removeNotFollowedSymlinks="true" failonerror="false" >
+        <delete includeemptydirs="true" failonerror="false" >
             <fileset dir="debian/packages" followSymlinks="false" />
         </delete>
@@ -369 +369 @@
     </target>
 
-    <target name="preppkg-base" depends="build, preplicenses, prepconsoleDocs">
+    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates">
         <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
         <delete>
@@ -420 +420 @@
         <copy file="installer/resources/console.ico" todir="pkg-temp/docs/" />
         <copy file="installer/resources/uninstall.ico" todir="pkg-temp/docs/" />
-        <mkdir dir="pkg-temp/docs/themes/" />
-        <copy todir="pkg-temp/docs/themes/" >
-          <fileset dir="installer/resources/themes/" />
-        </copy>
         <!-- Eepsite stuff here -->
         <mkdir dir="pkg-temp/eepsite" />
@@ -456 +452 @@
         <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
     </target>
+
     <target name="prepthemeupdates">
-        <!-- Migrated all Snark content to its own dir. Need to ensure snark dir excluded from console theme choices!! -->
-        <!-- Snark's visible Assets -->
-        <copy todir="pkg-temp/docs/themes/snark/ubergine/" >
-            <fileset dir="installer/resources/themes/snark/ubergine/" />
-        </copy>
-        <!-- No need to copy these individually, we're copying the whole dir below.. 
-        <copy file="installer/resources/themes/console/images/favicon.ico" todir="pkg-temp/docs/themes/console/images/" />
-        <copy file="installer/resources/themes/console/images/i2plogo.png" todir="pkg-temp/docs/themes/console/images/" />
-        -->
-        <!-- Since the logo moved, we have to update the error pages -->
-        <copy todir="pkg-temp/docs/" >
-          <fileset dir="installer/resources/proxy" />
-        </copy>
-        <!-- make a "classic" theme -->
-        <copy todir="pkg-temp/docs/themes/console/classic/" >
-            <fileset  dir="installer/resources/themes/console/classic/" />
-        </copy>
-        <!-- Add dark theme -->
-        <copy todir="pkg-temp/docs/themes/console/dark/" >
-            <fileset  dir="installer/resources/themes/console/dark/" />
-        </copy>
-        <!-- Add light theme -->
-        <copy todir="pkg-temp/docs/themes/console/light/" >
-            <fileset  dir="installer/resources/themes/console/light/" />
-        </copy>
-         <!-- Add midnight theme -->
-        <copy todir="pkg-temp/docs/themes/console/midnight/" >
-            <fileset  dir="installer/resources/themes/console/midnight/" />
-        </copy>        
-        <!-- Add shared images.. these are subject to flux and change! -->
-        <copy todir="pkg-temp/docs/themes/console/images/" >
-            <fileset  dir="installer/resources/themes/console/images/" />
-        </copy>          
-        <copy todir="pkg-temp/docs/" >
-          <fileset dir="installer/resources/readme/" includes="readme*.html" />
+        <copy todir="pkg-temp/docs/themes/" >
+            <fileset dir="installer/resources/themes/" />
+        </copy>
+    </target>
+
+    <!-- SSL Certs -->
+    <target name="prepCertificates">
+        <copy todir="pkg-temp/certificates/" >
+          <fileset dir="installer/resources/certificates/" />
         </copy>
     </target>
@@ -501 +472 @@
         </tar>
     </target>
+
     <target name="deletepkg-temp">
         <delete dir="pkg-temp" />
     </target>
-    <target name="prepconsoleDocs" depends="prepgeoupdate">
+
+    <!-- readme and proxy error page files, GeoIP files, and flag icons -->
+    <target name="prepConsoleDocs" depends="prepConsoleDocUpdates, prepgeoupdate" />
+
+    <!-- readme and proxy error page files -->
+    <target name="prepConsoleDocUpdates">
         <copy todir="pkg-temp/docs/" >
           <fileset dir="installer/resources/readme/" includes="readme*.html" />
-          <fileset dir="installer/resources/proxy" />
-        </copy>
-    </target>
-    <target name="consoleDocs" depends="deletepkg-temp, prepconsoleDocs">
+          <fileset dir="installer/resources/proxy/" includes="*.ht" />
+        </copy>
+    </target>
+
+    <target name="consoleDocs" depends="deletepkg-temp, prepConsoleDocs">
         <zip destfile="docs.zip" basedir="pkg-temp" whenempty="fail" />
     </target>
@@ -561 +539 @@
         <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
     </target>
-    <target name="prepupdate" depends="build2, prepupdateSmall">
+
+    <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates">
         <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
         <copy file="build/sam.jar" todir="pkg-temp/lib/" />
@@ -588 +567 @@
        -->
     </target>
+
     <target name="prepupdateSmall" depends="buildSmall, prepupdateRouter, prepthemeupdates">
         <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
@@ -602 +582 @@
        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
     </target>
+
     <target name="prepupdateRouter" depends="buildrouter, deletepkg-temp">
         <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
         <copy file="build/router.jar" todir="pkg-temp/lib/" />
     </target>
+
+    <!-- GeoIP files and flag icons -->
     <target name="prepgeoupdate">
         <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
@@ -613 +596 @@
         </copy>
     </target>
+
     <target name="prepjupdate" depends="prepupdate, buildWEB">
         <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />