Changeset 9b17b52 for build.xml


Ignore:
Timestamp:
Jun 27, 2018 4:16:08 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
bc4ee0fc, d8cc2a3
Parents:
c02f685
Message:

Debian: Add dependency for famfamfam-flag-png (ticket #2270)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    rc02f685 r9b17b52  
    12801280
    12811281    <!-- see targets below for conditional copying -->
    1282     <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, truncatehistory">
     1282    <target name="preppkg-base" depends="build, preplicenses, prepConsoleDocs, prepthemeupdates, prepCertificates, prepRouterInfos, copyjetty, copytomcat-unlesspkg, copyjstl-unlesspkg, copystandard-unlesspkg, copyflags-unlesspkg, truncatehistory">
    12831283        <!-- if updater200 was run previously, it left *.pack files in pkg-temp -->
    12841284        <!-- Also remove deletelist.txt used for updater only -->
     
    13261326            <fileset dir="installer/resources/eepsite/" excludes="**/.placeholder" />
    13271327        </copy>
     1328        <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
     1329    </target>
     1330
     1331    <target name="copyflags-unlesspkg" unless="${with-famfamfam-flag-png}" >
    13281332        <copy todir="pkg-temp/eepsite/docroot/help/lib/" >
    13291333            <fileset dir="installer/resources/icons/flags/" includes="az.png cn.png de.png es.png fr.png ir.png it.png jp.png nl.png pl.png pt.png ru.png se.png us.png" />
    13301334        </copy>
    1331         <copy file="installer/resources/themes/console/images/favicon.ico" tofile="pkg-temp/eepsite/docroot/favicon.ico" />
    13321335        <copy todir="pkg-temp/docs/icons/flags" >
    13331336          <!-- base flags/ dir only. flags16x11/ and flags48x48/ dirs already copied by prepConsoleDocs target -->
     
    24112414            <!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard -->
    24122415            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2416            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
    24132417            <!-- anything added above, add in debian-release-tarball also -->
    24142418        </delete>
     
    24942498            <!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
    24952499            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2500            <!-- famfamfam-flag-png is in trusty but not precise, so leave them in the source package for both -->
    24962501            <!-- anything added above, add in debian-release-tarball also -->
    24972502        </delete>
     
    25702575           -->
    25712576            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2577            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
    25722578            <!-- anything added above, add in debian-tarball also -->
    25732579        </delete>
     
    26402646            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
    26412647            <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
     2648            <fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />
    26422649            <!-- anything added above, add in debian-tarball also -->
    26432650        </delete>
Note: See TracChangeset for help on using the changeset viewer.