Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /antelope/

antelope
Discussion topic

Back to topic list

CVS update: /antelope/

Author danson
Full name Dale Anson
Date 2004-03-01 22:44:21 PST
Message User: danson
Date: 04/03/01 22:44:21

Modified:
 /antelope/
  build-app.xml

Log:
 fixed merge conflicts.
 

File Changes:

Directory: /antelope/
=====================

File [changed]: build-app.xml
Url: http://antelope.tigr​is.org/source/browse​/antelope/build-app.​xml?r1=1.7&r2=1.​8
Delta lines: +6 -1
-------------------
--- build-app.xml 2 Mar 2004 04:07:39 -0000 1.7
+++ build-app.xml 2 Mar 2004 06:44:19 -0000 1.8
@@ -75,6 +75,7 @@
             <exclude name="testcases/**/*"/>
             <exclude name="**/plugin/**/*"/>
         </javac>
+ <copy file="${src.dir}/ant.dtd" todir="${classes.di​r}/ise/antelope/comm​on/builder"/>
     </target>
     
    <!-- ====================​====================​====================​============
@@ -143,7 +144,7 @@
    ====================​====================​====================​============= -->
    <target name="run"
            description="Runs Antelope as a standalone app."
- depends="setClasspath, compile, copy_resources">
+ depends="setClasspath, copy_resources">
       <java classname="ise.antel​ope.common.builder.P​rojectBuilder" fork="true">
          <classpath refid="classpathref"/>
       </java>
@@ -198,6 +199,10 @@
         <copy todir="${classes.di​r}/images">
             <fileset dir="${src.dir}/images" includes="**/*" />
         </copy>
+ <copy todir="${classes.di​r}/ise/antelope/comm​on/gui">
+ <fileset dir="${src.dir}" includes="ant.dtd"/>
+ </copy>
+
         <copy todir="${classes.di​r}/ise/antelope/task​s">
             <fileset dir="${src.dir}/ise​/antelope/tasks" includes="antelope.t​askdefs"/>
             <fileset dir="${src.dir}/ise​/antelope/tasks" includes="antlib.xml"/>




--------------------​--------------------​--------------------​---------
To unsubscribe, e-mail: cvs-unsubscribe@ante​lope.tigris.org
For additional commands, e-mail: cvs-help at antelope dot tigris dot org

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /antelope/ danson Dale Anson 2004-03-01 22:44:21 PST
Messages per page: