Changeset d7c1e97


Ignore:
Timestamp:
Mar 5, 2012 3:24:21 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
46438b7, a24937b
Parents:
6c2d4de (diff), 224405d7 (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 'c09b40fe67ffc403c484ac4b14d896de48d37d9c'

and 'c269d35a60d164027bb1d1fbb6d30c06ffd2292d'

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/SearchHelper.java

    r6c2d4de rd7c1e97  
    7777            buf.append("<option value=\"").append(name).append('\"');
    7878            if (name.equals(dflt))
    79                 buf.append(" selected=\"true\"");
     79                buf.append(" selected=\"selected\"");
    8080            buf.append('>').append(name).append("</option>\n");
    8181        }
  • build.properties

    r6c2d4de rd7c1e97  
    1919# This will go in the jar manifests
    2020build.built-by=unknown 
     21# Uncomment the next line to prevent building EXEs (changing it to false will have no impact)
     22#noExe=true
  • build.xml

    r6c2d4de rd7c1e97  
    3636        <echo message="  updaterWithJavadoc: updater including the javadocs, for display in the console" />
    3737        <echo message="  updater200WithJavadoc: updater including the javadocs, for display in the console (creates i2pupdate200.zip)" />
     38        <echo message="  updaterWithJavadocAndJetty: updater including the javadocs, for display in the console, and Jetty " />
     39        <echo message="  updater200WithJavadocAndJetty: updater including the javadocs, for display in the console, and Jetty (creates i2pupdate200.zip)" />
    3840        <echo message="  updaterWithJetty: Updater including Jetty" />
    3941        <echo message="  updater200withJetty: Updater including Jetty" />
     
    211213    <target name="buildexe">
    212214        <condition property="noExe">
    213             <os arch="x86_64" />
    214         </condition>
    215         <condition property="noExe">
    216             <os arch="ppc" />
    217         </condition>
    218         <condition property="noExe">
    219             <os arch="armv5tejl" />
    220         </condition>
    221         <condition property="noExe">
    222             <os arch="amd64" />
     215            <or>
     216                <os arch="ppc" />
     217                <os arch="armv5tejl" />
     218            </or>
    223219        </condition>
    224220        <condition property="noExe">
     
    239235    <!-- this makes an empty build/launchi2p.jar and the build/i2p.exe for the no-wrapper windows startup -->
    240236    <target name="doBuildEXE" depends="buildProperties" unless="noExe">
     237        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    241238        <jar destfile="./build/launchi2p.jar">
    242239            <manifest>
     
    954951    <target name="updaterWithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, zipit" />
    955952    <target name="updater200WithJavadoc" depends="prepupdate, preplicenses, copyJavadoc, pack200, zipit200" />
     953    <target name="updaterWithJavadocAndJetty" depends="prepjupdate, preplicenses, copyJavadoc, zipit" />
     954    <target name="updater200WithJavadocAndJetty" depends="prepjupdate, preplicenses, copyJavadoc, pack200, zipit200" />
    956955    <target name="updaterWithGeoIP" depends="prepupdate, prepgeoupdate, preplicenses, zipit" />
    957956    <target name="updaterWithJetty" depends="prepjupdate, preplicenses, zipit" />
     
    11921191    <target name="installerexe">
    11931192        <condition property="noExe">
    1194             <os arch="x86_64" />
    1195         </condition>
    1196         <condition property="noExe">
    1197             <os arch="amd64" />
     1193            <or>
     1194                <os arch="ppc" />
     1195                <os arch="armv5tejl" />
     1196            </or>
    11981197        </condition>
    11991198        <condition property="noExe">
     
    12101209    <!-- this makes i2pinstall.exe from install.jar -->
    12111210    <target name="doInstallerEXE" unless="noExe">
     1211        <echo message="See the file &quot;build.properties&quot; if this step fails." />
    12121212        <!-- now the installer exe -->
    12131213        <launch4j configFile="./installer/i2pinstaller.xml" />
Note: See TracChangeset for help on using the changeset viewer.