Changeset f8d323b for build.xml


Ignore:
Timestamp:
Apr 7, 2013 1:20:34 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
56eba28a
Parents:
7b753c9d (diff), 18e369b (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:

propagate from branch 'i2p.i2p' (head 5737078c5993e2fcf73520cc610a71125b12520b)

to branch 'i2p.i2p.zzz.jetty7' (head a93a47d79b1db119ec8c62b46a4a4e226043bd17)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r7b753c9d rf8d323b  
    10411041        <exec executable="sh" osfamily="unix" failonerror="true">
    10421042            <arg value="-c" />
    1043             <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
     1043            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
    10441044        </exec>
    10451045        <exec executable="sh" osfamily="mac" failonerror="true">
    10461046            <arg value="-c" />
    1047             <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
     1047            <arg value="for i in pkg-temp/lib/*.jar pkg-temp/webapps/*war; do if [ $i = pkg-temp/lib/jasper-compiler.jar -o $i = pkg-temp/lib/jbigi.jar -o $i = pkg-temp/lib/jetty-java5-threadpool.jar -o $i = pkg-temp/lib/jetty-sslengine.jar ]; then continue; fi; echo pack200 $i; mv $i $i.jar; pack200 -g $i.pack $i.jar; rm -f $i.jar; done" />
    10481048        </exec>
    10491049        <!-- windoz here : i admit, i hate escaped symbols in xml, indeed = =! -->
     
    11541154              can't overwrite an existing eepsite dir in a non-split configuration.
    11551155          -->
    1156         <copy todir="pkg-temp/eepsite-jetty6" >
     1156        <copy todir="pkg-temp/eepsite-jetty7" >
    11571157            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
    11581158        </copy>
     
    11601160
    11611161    <target name="delete-j6-update">
    1162         <delete dir="pkg-temp/eepsite-jetty6" />
     1162        <delete dir="pkg-temp/eepsite-jetty7" />
    11631163    </target>
    11641164
Note: See TracChangeset for help on using the changeset viewer.