Changeset 4612 for trunk/common.xml


Ignore:
Timestamp:
11/13/08 11:16:45 (11 years ago)
Author:
curtis
Message:
  • Add exec target to each component.
  • Miscellaneous tweaks to build system.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/common.xml

    r4609 r4612  
    3939 
    4040  <!-- Main build targets --> 
    41  
    42   <target name="dev-compile" description="compile classes in-place (no copy)"> 
    43     <javac debug="true" deprecation="true" 
    44       source="${component.java-version}" 
    45       target="${component.java-version}" 
    46       srcdir="${src.dir}" destdir="${src.dir}" 
    47       classpath="${component.classpath}" 
    48       includes="${component.source}"/> 
    49   </target> 
    50  
    51   <target name="dev-clean" description="remove classes in-place (no copy)"> 
    52     <delete> 
    53       <fileset dir="${src.dir}" includes="**/*.class"/> 
    54     </delete> 
    55   </target> 
    5641 
    5742  <target name="compile" depends="copy-source" 
     
    6550  </target> 
    6651 
    67   <!-- CTR TODO FINISH THIS 
    6852  <target name="exec" depends="compile" description="execute package"> 
    69      <java classname="component.manifest-main" 
    70        classpath="${}" 
    71   </target> 
    72   --> 
     53    <java fork="true" classname="${component.main-class}" 
     54      classpath="${classes.dir}:${component.runtime-cp}"/> 
     55  </target> 
    7356 
    7457  <target name="findbugs" depends="compile" 
     
    10891    <jar jarfile="${artifact.dir}/${component.jar}" basedir="${classes.dir}"> 
    10992      <manifest> 
    110         <attribute name="Main-Class" value="${component.manifest-main}"/> 
     93        <attribute name="Main-Class" value="${component.main-class}"/> 
    11194        <attribute name="Class-Path" value="${component.manifest-cp}"/> 
    11295      </manifest> 
     
    175158            getting-subversion-revision-in-ant/ 
    176159        --> 
    177         <property name="revision" value="HEAD"/> 
    178160        <exec executable="svn" outputproperty="svn.log" 
    179161          failifexecutionfails="false"> 
    180           <arg line="info ${base.dir} -r ${revision}"/> 
     162          <arg line="info ${base.dir}"/> 
    181163        </exec> 
    182164        <if> 
    183165          <isset property="svn.log"/> 
    184166          <then> 
    185             <!--<echo>${svn.log}</echo>--> 
    186167            <propertyregex property="svn.revision" 
    187168              input="${svn.log}" select="\1"> 
    188169              <regexp pattern="Revision: ([0-9]*)"/> 
    189170            </propertyregex> 
    190             <echo>SVN revision: ${svn.revision}</echo> 
     171            <!--<echo>SVN revision: ${svn.revision}</echo>--> 
    191172          </then> 
    192173        </if> 
    193174      </else> 
    194175    </if> 
     176    <!-- construct manifest classpath --> 
     177    <propertyregex property="component.manifest-cp-temp" 
     178      input="${component.runtime-cp}" replace="" 
     179      defaultValue="${component.runtime-cp}"> 
     180      <regexp pattern="[^\:]*\/"/> 
     181    </propertyregex> 
     182    <propertyregex property="component.manifest-cp" 
     183      input="${component.manifest-cp-temp}" replace=" " 
     184      defaultValue="${component.manifest-cp-temp}"> 
     185      <regexp pattern=":"/> 
     186    </propertyregex> 
     187    <!--<echo>Manifest-Classpath: ${component.manifest-cp}</echo>--> 
    195188  </target> 
    196189 
Note: See TracChangeset for help on using the changeset viewer.