Changeset 11579b9 for build.xml


Ignore:
Timestamp:
Nov 20, 2016 6:08:40 AM (3 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
97af7d0
Parents:
01cfb7b (diff), b0bba18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '8bf9850eb3fe4fcfb63053838a188969b7ba9c5b'

and 'a40ea9b5f7545281195f00a80e31ae879197e76b'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r01cfb7b r11579b9  
    401401    </target>
    402402
    403     <target name="buildJrobin" depends="buildProperties" >
     403    <target name="buildJrobin" depends="buildCore" >
    404404        <ant dir="apps/jrobin/java/" target="jar" />
    405405        <copy file="apps/jrobin/java/build/jrobin.jar" todir="build/" />
     
    11851185
    11861186    <!-- see targets below for conditional copying -->
    1187     <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg">
     1187    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, truncatehistory">
    11881188        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    11891189        <!-- Also remove deletelist.txt used for updater only -->
     
    12191219        <copy file="installer/resources/hosts.txt" todir="pkg-temp/" />
    12201220        <copy file="INSTALL-headless.txt" todir="pkg-temp/" />
    1221         <!-- overwrite the truncated history put in by the updater -->
    1222         <copy file="history.txt" todir="pkg-temp/" overwrite="true" />
    12231221        <mkdir dir="pkg-temp/scripts" />
    12241222        <copy file="apps/proxyscript/i2pProxy.pac" todir="pkg-temp/scripts/" />
     
    15071505    </target>
    15081506
    1509     <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation">
     1507    <target name="prepupdate" depends="build2, prepupdateSmall, prepConsoleDocUpdates, prepCertificates, prep-script-translation, truncatehistory">
    15101508        <copy file="build/BOB.jar" todir="pkg-temp/lib/" />
    15111509        <copy file="build/sam.jar" todir="pkg-temp/lib/" />
     
    15241522       -->
    15251523        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
     1524        <copy file="installer/resources/deletelist.txt" todir="pkg-temp/" />
     1525        <copy file="installer/resources/blocklist.txt" todir="pkg-temp/" />
     1526        <copy todir="pkg-temp/man/">
     1527            <fileset dir="installer/resources/man/" />
     1528        </copy>
     1529    </target>
     1530
     1531    <target name="truncatehistory">
    15261532        <copy file="history.txt" todir="pkg-temp/" />
    15271533        <!-- the following overwrites history.txt on unix to shrink the update file -->
     
    15311537            </filterchain>
    15321538        </copy>
    1533         <concat append="true" destfile="pkg-temp/history.txt">&#10;&#10;----------------&#10;&#10;EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE"</concat>
    1534         <copy file="installer/resources/deletelist.txt" todir="pkg-temp/" />
    1535         <copy file="installer/resources/blocklist.txt" todir="pkg-temp/" />
    1536         <copy todir="pkg-temp/man/">
    1537             <fileset dir="installer/resources/man/" />
    1538         </copy>
     1539        <concat append="true" destfile="pkg-temp/history.txt">&#10;&#10;----------------&#10;&#10;EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE</concat>
    15391540    </target>
    15401541
Note: See TracChangeset for help on using the changeset viewer.