Changeset 70f9cb1 for build.xml


Ignore:
Timestamp:
May 6, 2016 3:56:54 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
62296222
Parents:
ecafcdd
Message:

Build:

  • Add DTG to updater
  • Fix and bundle DTG license info
  • Remove jstl.jar and standard.jar from updater, last changed in 0.9
  • Fix bundling of Tomcat license info

Console:

  • Change to new DTG constructor
  • Don't attempt to start systray or DTG when running as a service
File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    recafcdd r70f9cb1  
    12581258        </copy>
    12591259        <copy file="apps/imagegen/identicon/README.md" tofile="pkg-temp/licenses/LICENSE-Identicon.txt" />
    1260     </target>
    1261 
    1262     <target name="preplicenses-unlesspkg" unless="${with-libjetty8-java}" >
     1260        <copy file="apps/desktopgui/LICENSE" tofile="pkg-temp/licenses/LICENSE-DesktopGUI.txt" />
     1261    </target>
     1262
     1263    <target name="preplicenses-unlesspkg" unless="${with-libtomcat7-java}" >
    12631264        <copy file="apps/jetty/apache-tomcat-deployer/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
    12641265    </target>
     
    14771478        <!-- include systray changes in 0.7.5 -->
    14781479        <copy file="build/systray.jar" todir="pkg-temp/lib/" />
    1479        <!-- removed from updater in 0.9
     1480       <!-- removed from updater in 0.9, added back in 0.9.26 -->
    14801481        <copy file="build/desktopgui.jar" todir="pkg-temp/lib/" />
    1481        -->
    14821482        <copy file="build/susimail.war" todir="pkg-temp/webapps/" />
    14831483        <copy file="build/susidns.war" todir="pkg-temp/webapps/" />
    14841484        <copy file="build/imagegen.war" todir="pkg-temp/webapps/" />
    1485         <!-- as of 0.7.12; someday, we can remove these from the updater -->
     1485        <!-- as of 0.7.12; last changed in 0.9; removed from update in 0.9.26 -->
     1486      <!--
    14861487        <copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
    14871488        <copy file="apps/susidns/src/lib/standard.jar" todir="pkg-temp/lib/" />
     1489       -->
    14881490        <copy file="build/i2psnark.war" todir="pkg-temp/webapps/" />
    14891491        <copy file="history.txt" todir="pkg-temp/" />
Note: See TracChangeset for help on using the changeset viewer.