Changeset 157b85b


Ignore:
Timestamp:
Apr 26, 2009 3:54:51 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
89f0f09
Parents:
d670d98
Message:

pass compiler args down from top build.xml

Files:
15 edited

Legend:

Unmodified
Added
Removed
  • apps/addressbook/build.xml

    rd670d98 r157b85b  
    77        <property name="jar" value="addressbook.jar"/>
    88        <property name="war" value="addressbook.war"/>
     9        <property name="javac.compilerargs" value="" />
    910       
    1011        <target name="init">
     
    3940                <javac debug="true" deprecation="on" source="1.5" target="1.5"
    4041                       srcdir="${src}" destdir="${build}">
     42            <compilerarg line="${javac.compilerargs}" />
    4143            <classpath>
    4244                <pathelement location="../../core/java/build/i2p.jar" />
  • apps/i2psnark/java/build.xml

    rd670d98 r157b85b  
    2525        </depend>
    2626    </target>
     27    <property name="javac.compilerargs" value="" />
    2728    <target name="compile" depends="depend">
    2829        <mkdir dir="./build" />
     
    3233            debug="true" deprecation="on" source="1.5" target="1.5"
    3334            destdir="./build/obj"
    34             classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" />
     35            classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../ministreaming/java/build/mstreaming.jar" >
     36            <compilerarg line="${javac.compilerargs}" />
     37        </javac>
    3538    </target>
    3639    <target name="jar" depends="builddep, compile">
     
    5659        <javac debug="true" deprecation="on" source="1.5" target="1.5"
    5760               destdir="./build" srcdir="src/" includes="org/klomp/snark/web/RunStandalone.java" >
     61            <compilerarg line="${javac.compilerargs}" />
    5862            <classpath>
    5963                <pathelement location="../../jetty/jettylib/commons-logging.jar" />
  • apps/i2ptunnel/java/build.xml

    rd670d98 r157b85b  
    2323        </depend>
    2424    </target>
     25    <property name="javac.compilerargs" value="" />
    2526    <target name="compile" depends="depend">
    2627        <mkdir dir="./build" />
     
    3031            debug="true" deprecation="on" source="1.5" target="1.5"
    3132            destdir="./build/obj"
    32             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
     33            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
     34            <compilerarg line="${javac.compilerargs}" />
     35        </javac>
    3336    </target>
    3437    <target name="jar" depends="builddep, compile">
     
    7477        <javac debug="true" deprecation="on" source="1.5" target="1.5"
    7578               destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
     79            <compilerarg line="${javac.compilerargs}" />
    7680            <classpath>
    7781                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
  • apps/jetty/build.xml

    rd670d98 r157b85b  
    77    <property name="jetty.filename" value="jetty-5.1.12.zip" />
    88    <property name="verified.filename" value="verified.txt" />
     9    <property name="javac.compilerargs" value="" />
    910
    1011    <target name="all" depends="build" />
     
    9192        <javac
    9293            srcdir="./java/src"
    93             debug="true" deprecation="on" source="1.5" target="1.5"
     94            debug="true" source="1.5" target="1.5"
    9495            destdir="./build/obj"
    95             classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar" />
     96            classpath="./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar" >
     97            <compilerarg line="${javac.compilerargs}" />
     98        </javac>
    9699    </target>
    97100    <target name="jar" depends="compile">
  • apps/ministreaming/java/build.xml

    rd670d98 r157b85b  
    2020        </depend>
    2121    </target>
     22    <property name="javac.compilerargs" value="" />
    2223    <target name="compile" depends="depend">
    2324        <mkdir dir="./build" />
    2425        <mkdir dir="./build/obj" />
    25         <javac srcdir="./src" debug="true" deprecation="on" source="1.5" target="1.5" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" />
     26        <javac srcdir="./src" debug="true" deprecation="on" source="1.5" target="1.5" destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
     27            <compilerarg line="${javac.compilerargs}" />
     28        </javac>
    2629    </target>
    2730    <target name="jar" depends="compile">
  • apps/routerconsole/java/build.xml

    rd670d98 r157b85b  
    4141        </dependset>
    4242    </target>
     43    <property name="javac.compilerargs" value="" />
    4344    <target name="compile" depends="prepare, depend, dependVersion">
    4445        <mkdir dir="./build" />
     
    4849            debug="true" deprecation="on" source="1.5" target="1.5"
    4950            destdir="./build/obj">
     51            <compilerarg line="${javac.compilerargs}" />
    5052            <classpath>
    5153                <pathelement location="../../../core/java/build/i2p.jar" />
     
    115117               destdir="../jsp/WEB-INF/classes/"
    116118               srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
     119            <compilerarg line="${javac.compilerargs}" />
    117120            <classpath>
    118121                <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
  • apps/sam/java/build.xml

    rd670d98 r157b85b  
    2222        </depend>
    2323    </target>
     24    <property name="javac.compilerargs" value="" />
    2425    <target name="compile" depends="depend">
    2526        <mkdir dir="./build" />
     
    2930            debug="true" deprecation="on" source="1.5" target="1.5"
    3031            destdir="./build/obj"
    31             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
     32            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
     33            <compilerarg line="${javac.compilerargs}" />
     34        </javac>
    3235    </target>
    3336    <target name="compileTest" depends="compile">
     
    3639            debug="true" deprecation="on" source="1.5" target="1.5"
    3740            destdir="./build/obj"
    38             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
     41            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
     42            <compilerarg line="${javac.compilerargs}" />
     43        </javac>
    3944    </target>
    4045    <target name="jar" depends="compile">
  • apps/streaming/java/build.xml

    rd670d98 r157b85b  
    2222        </depend>
    2323    </target>
     24    <property name="javac.compilerargs" value="" />
    2425    <target name="compile" depends="depend">
    2526        <mkdir dir="./build" />
     
    2930            debug="true" deprecation="on" source="1.5" target="1.5"
    3031            destdir="./build/obj"
    31             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
     32            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
     33            <compilerarg line="${javac.compilerargs}" />
     34        </javac>
    3235    </target>
    3336    <target name="compileTest" depends="compile">
     
    3639            debug="true" deprecation="on" source="1.5" target="1.5"
    3740            destdir="./build/obj"
    38             classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" />
     41            classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
     42            <compilerarg line="${javac.compilerargs}" />
     43        </javac>
    3944    </target>
    4045    <target name="jar" depends="builddep, compile">
  • apps/susidns/src/build.xml

    rd670d98 r157b85b  
    2323        <pathelement location="../../../core/java/build/i2p.jar" />
    2424        </path>
     25        <property name="javac.compilerargs" value="" />
    2526        <target name="compile">
    2627                <mkdir dir="${bin}" />
    2728                <javac debug="true" deprecation="on" source="1.5" target="1.5"
    28                         classpathref="cp" destdir="${bin}" srcdir="${src}" includes="**/*.java" />
     29                        classpathref="cp" destdir="${bin}" srcdir="${src}" includes="**/*.java" >
     30                        <compilerarg line="${javac.compilerargs}" />
     31                </javac>
    2932        </target>
    3033    <target name="precompilejsp" unless="precompilejsp.uptodate">
     
    4649        <javac debug="true" deprecation="on" source="1.5" target="1.5"
    4750               destdir="${bin}" srcdir="./WEB-INF/classes" includes="**/*.java" classpathref="cp">
     51                <compilerarg line="${javac.compilerargs}" />
    4852         </javac>
    4953        <copy file="WEB-INF/web-template.xml" tofile="WEB-INF/web-out.xml" />
  • apps/susimail/build.xml

    rd670d98 r157b85b  
    66        <ant dir="../jetty/" target="build" />
    77    </target>
     8    <property name="javac.compilerargs" value="" />
    89    <target name="compile">
    910        <javac
     
    1112            debug="true" deprecation="off" source="1.5" target="1.5"
    1213            destdir="./src/WEB-INF/classes">
     14            <compilerarg line="${javac.compilerargs}" />
    1315            <classpath>
    1416                <pathelement location="../jetty/jettylib/javax.servlet.jar" />
  • apps/systray/java/build.xml

    rd670d98 r157b85b  
    66        <ant dir="../../../core/java/" target="build" />
    77    </target>
     8    <property name="javac.compilerargs" value="" />
    89    <target name="compile">
    910        <mkdir dir="./build" />
     
    1718            destdir="./build/obj"
    1819            includes="**/*.java"
    19             classpath="./lib/systray4j.jar:../../../core/java/build/i2p.jar" />
     20            classpath="./lib/systray4j.jar:../../../core/java/build/i2p.jar" >
     21            <compilerarg line="${javac.compilerargs}" />
     22        </javac>
    2023    </target>
    2124    <target name="jar" depends="compile" unless="jar.uptodate">
  • build.xml

    rd670d98 r157b85b  
    22<project basedir="." default="all" name="i2p">
    33   
     4    <!-- Things you might want to change -->
     5    <!-- This keeps gcj a lot quieter -->
     6    <!--
     7        <property name="javac.compilerargs" value="-warn:-unchecked,raw,unused,serial" />
     8    -->
     9
     10    <!-- You probably don't want to change anything from here down -->
    411    <target name="all" >
    512        <echo message="Useful targets: " />
  • core/java/build.xml

    rd670d98 r157b85b  
    1616        </depend>
    1717    </target>
     18    <!-- only used if not set by a higher build.xml -->
     19    <property name="javac.compilerargs" value="" />
    1820    <target name="compile" depends="depend">
    1921        <mkdir dir="./build" />
    2022        <mkdir dir="./build/obj" />
    21         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" />
     23        <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" >
     24            <compilerarg line="${javac.compilerargs}" />
     25        </javac>
    2226    </target>
    2327    <target name="compileTest">
    2428        <mkdir dir="./build" />
    2529        <mkdir dir="./build/obj" />
    26         <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" />
     30        <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" >
     31            <compilerarg line="${javac.compilerargs}" />
     32        </javac>
    2733    </target>
    2834    <target name="jar" depends="compile">
  • installer/lib/launch4j/build.xml

    rd670d98 r157b85b  
    88        <property name="jar" location="./${ant.project.name}.jar" />
    99        <property name="launch4j.dir" location="." />
     10        <property name="javac.compilerargs" value="" />
    1011
    1112        <path id="dist.classpath">
     
    2425        <target name="compile" depends="init" description="compile the source">
    2526                <javac srcdir="${src}" destdir="${build}" classpathref="dist.classpath" source="1.4" debug="on" />
     27                        <compilerarg line="${javac.compilerargs}" />
     28                </javac>
    2629                <copy todir="${build}/images">
    2730                        <fileset dir="${src}/images">
  • router/java/build.xml

    rd670d98 r157b85b  
    2323        </depend>
    2424    </target>
     25    <!-- only used if not set by a higher build.xml -->
     26    <property name="javac.compilerargs" value="" />
    2527    <target name="compile" depends="depend">
    2628        <mkdir dir="./build" />
    2729        <mkdir dir="./build/obj" />
    28         <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" classpath="../../core/java/build/i2p.jar" />
     30        <javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" classpath="../../core/java/build/i2p.jar" >
     31            <compilerarg line="${javac.compilerargs}" />
     32        </javac>
    2933    </target>
    3034    <target name="compileTest" depends="builddeptest">
    3135        <mkdir dir="./build" />
    3236        <mkdir dir="./build/obj" />
    33         <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" />
     37        <javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on" destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
     38            <compilerarg line="${javac.compilerargs}" />
     39        </javac>
    3440    </target>
    3541    <target name="jar" depends="compile">
Note: See TracChangeset for help on using the changeset viewer.