Changeset 49325d4 for build.xml


Ignore:
Timestamp:
Nov 19, 2010 10:46:27 PM (10 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d23fdd6
Parents:
1a8406e (diff), 635b53c (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 '50335c064a9992f4ba8707d62d35bbbbe752d231'

and 'b93c1c7b2b01fc43af5bc07470d9997f3edba6da'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r1a8406e r49325d4  
    159159    </target>
    160160    <target name="javadoc">
     161        <ant dir="apps/jetty" target="ensureJettylib" />
    161162        <mkdir dir="./build" />
    162163        <mkdir dir="./build/javadoc" />
     
    582583            <arg value="EARLIER HISTORY IS AVAILABLE IN THE SOURCE PACKAGE" />
    583584        </exec>
    584         <!-- may be pointless now, people with split directories will never see this -->
     585      <!-- May be pointless now, people with split directories will never see this,
     586           and for flat installs we don't want to overwrite news more recent than the update package.
    585587        <copy file="installer/resources/news.xml" todir="pkg-temp/docs/" />
     588       -->
    586589    </target>
    587590    <target name="prepupdateSmall" depends="buildSmall, prepupdateRouter, prepthemeupdates">
Note: See TracChangeset for help on using the changeset viewer.