Changeset 106af99 for build.xml


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rc8cad6a r106af99  
    246246    </target>
    247247    <target name="distclean" depends="clean">
    248         <delete includeemptydirs="true" removeNotFollowedSymlinks="true" failonerror="false" >
     248        <delete includeemptydirs="true" failonerror="false" >
    249249            <fileset dir="debian/packages" followSymlinks="false" />
    250250        </delete>
     
    369369    </target>
    370370
    371     <target name="preppkg-base" depends="build, preplicenses, prepconsoleDocs">
     371    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates">
    372372        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    373373        <delete>
     
    420420        <copy file="installer/resources/console.ico" todir="pkg-temp/docs/" />
    421421        <copy file="installer/resources/uninstall.ico" todir="pkg-temp/docs/" />
    422         <mkdir dir="pkg-temp/docs/themes/" />
    423         <copy todir="pkg-temp/docs/themes/" >
    424           <fileset dir="installer/resources/themes/" />
    425         </copy>
    426422        <!-- Eepsite stuff here -->
    427423        <mkdir dir="pkg-temp/eepsite" />
     
    456452        <copy file="installer/lib/launch4j/lib/XStream.LICENSE.txt" tofile="pkg-temp/licenses/LICENSE-XStream.txt" />
    457453    </target>
     454
    458455    <target name="prepthemeupdates">
    459         <!-- Migrated all Snark content to its own dir. Need to ensure snark dir excluded from console theme choices!! -->
    460         <!-- Snark's visible Assets -->
    461         <copy todir="pkg-temp/docs/themes/snark/ubergine/" >
    462             <fileset dir="installer/resources/themes/snark/ubergine/" />
    463         </copy>
    464         <!-- No need to copy these individually, we're copying the whole dir below..
    465         <copy file="installer/resources/themes/console/images/favicon.ico" todir="pkg-temp/docs/themes/console/images/" />
    466         <copy file="installer/resources/themes/console/images/i2plogo.png" todir="pkg-temp/docs/themes/console/images/" />
    467         -->
    468         <!-- Since the logo moved, we have to update the error pages -->
    469         <copy todir="pkg-temp/docs/" >
    470           <fileset dir="installer/resources/proxy" />
    471         </copy>
    472         <!-- make a "classic" theme -->
    473         <copy todir="pkg-temp/docs/themes/console/classic/" >
    474             <fileset  dir="installer/resources/themes/console/classic/" />
    475         </copy>
    476         <!-- Add dark theme -->
    477         <copy todir="pkg-temp/docs/themes/console/dark/" >
    478             <fileset  dir="installer/resources/themes/console/dark/" />
    479         </copy>
    480         <!-- Add light theme -->
    481         <copy todir="pkg-temp/docs/themes/console/light/" >
    482             <fileset  dir="installer/resources/themes/console/light/" />
    483         </copy>
    484          <!-- Add midnight theme -->
    485         <copy todir="pkg-temp/docs/themes/console/midnight/" >
    486             <fileset  dir="installer/resources/themes/console/midnight/" />
    487         </copy>       
    488         <!-- Add shared images.. these are subject to flux and change! -->
    489         <copy todir="pkg-temp/docs/themes/console/images/" >
    490             <fileset  dir="installer/resources/themes/console/images/" />
    491         </copy>         
    492         <copy todir="pkg-temp/docs/" >
    493           <fileset dir="installer/resources/readme/" includes="readme*.html" />
     456        <copy todir="pkg-temp/docs/themes/" >
     457            <fileset dir="installer/resources/themes/" />
     458        </copy>
     459    </target>
     460
     461    <!-- SSL Certs -->
     462    <target name="prepCertificates">
     463        <copy todir="pkg-temp/certificates/" >
     464          <fileset dir="installer/resources/certificates/" />
    494465        </copy>
    495466    </target>
     
    501472        </tar>
    502473    </target>
     474
    503475    <target name="deletepkg-temp">
    504476        <delete dir="pkg-temp" />
    505477    </target>
    506     <target name="prepconsoleDocs" depends="prepgeoupdate">
     478
     479    <!-- readme and proxy error page files, GeoIP files, and flag icons -->
     480    <target name="prepConsoleDocs" depends="prepConsoleDocUpdates, prepgeoupdate" />
     481
     482    <!-- readme and proxy error page files -->
     483    <target name="prepConsoleDocUpdates">
    507484        <copy todir="pkg-temp/docs/" >
    508485          <fileset dir="installer/resources/readme/" includes="readme*.html" />
    509           <fileset dir="installer/resources/proxy" />
    510         </copy>
    511     </target>
    512     <target name="consoleDocs" depends="deletepkg-temp, prepconsoleDocs">
     486          <fileset dir="installer/resources/proxy/" includes="*.ht" />
     487        </copy>
     488    </target>
     489
     490    <target name="consoleDocs" depends="deletepkg-temp, prepConsoleDocs">
    513491        <zip destfile="docs.zip" basedir="pkg-temp" whenempty="fail" />
    514492    </target>
     
    561539        <zip destfile="i2pupdate.zip" basedir="pkg-temp" />
    562540    </target>
    563     <target name="prepupdate" depends="build2, prepupdateSmall">
     541
     542    <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates">
    564543        <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
    565544        <copy file="build/sam.jar" todir="pkg-temp/lib/" />
     
    588567       -->
    589568    </target>
     569
    590570    <target name="prepupdateSmall" depends="buildSmall, prepupdateRouter, prepthemeupdates">
    591571        <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
     
    602582       <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    603583    </target>
     584
    604585    <target name="prepupdateRouter" depends="buildrouter, deletepkg-temp">
    605586        <copy file="build/i2p.jar" todir="pkg-temp/lib/" />
    606587        <copy file="build/router.jar" todir="pkg-temp/lib/" />
    607588    </target>
     589
     590    <!-- GeoIP files and flag icons -->
    608591    <target name="prepgeoupdate">
    609592        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     
    613596        </copy>
    614597    </target>
     598
    615599    <target name="prepjupdate" depends="prepupdate, buildWEB">
    616600        <copy file="build/jasper-compiler.jar" todir="pkg-temp/lib/" />
Note: See TracChangeset for help on using the changeset viewer.