You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@depot.apache.org by aj...@apache.org on 2004/05/01 17:28:49 UTC
svn commit: rev 10480 - incubator/depot/trunk/common
Author: ajack
Date: Sat May 1 10:28:47 2004
New Revision: 10480
Modified:
incubator/depot/trunk/common/build.xml
Log:
Resolve merge problem.
Modified: incubator/depot/trunk/common/build.xml
==============================================================================
--- incubator/depot/trunk/common/build.xml (original)
+++ incubator/depot/trunk/common/build.xml Sat May 1 10:28:47 2004
@@ -1,67 +1,3 @@
-<<<<<<< .mine
-<?xml version="1.0"?>
-<!-- $HeadURL: https://svn.apache.org/repos/asf/incubator/depot/trunk/version/build_antlet.xml $ -->
-<!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project name="depot-common" default="all">
- <description>
- Depot Version
- </description>
- <tstamp/>
- <typedef
- resource="org/krysalis/antworks/importer/antlib.xml"
- classpath="${user.home}/.antworks/lib/antworks-importer.jar"/>
- <property name="project.name" value="depot-common"/>
- <property name="project.version" value="0.1-dev-${DSTAMP}"/>
-
-
- <property name="apache.antlet.svn.www.url" value="https://svn.apache.org/repos/asf/incubator/depot/trunk/www/version"/>
-
-
- <property name="project.src.dir" value="src/java" />
- <!--
- To much work to write these again.
- REQUIRES ant 1.6
-
- But this is not gump friendly need to think about it .
- -->
- <importer name="init-0.1"
- href="http://metamorphosis.krysalis.org/antlet/"/>
- <importer name="java-0.1"
- href="http://metamorphosis.krysalis.org/antlet/"/>
- <importer name="junit-0.1"
- href="http://metamorphosis.krysalis.org/antlet/"/>
- <importer name="forrest-0.1"
- href="http://metamorphosis.krysalis.org/antlet/"/>
- <importer name="apache-0.1"
- href="http://metamorphosis.krysalis.org/antlet/"/>
-
-
- <path id="depot-common.classpath">
- <fileset dir=".">
- <include name="lib/*.jar"/>
- </fileset>
- </path>
-
- <target name="all" depends="compile"/>
-
- <target name="gump" depends="dist-jar"/>
-
-</project>
-=======
<?xml version="1.0"?>
<!-- $HeadURL: https://svn.apache.org/repos/asf/incubator/depot/trunk/version/build_antlet.xml $ -->
<!--
@@ -81,11 +17,13 @@
-->
<project name="depot-common" default="all">
<description>
- Depot version is a Repository versionr
+ Depot Common -- common code.
</description>
<tstamp />
+
<typedef resource="org/krysalis/antworks/importer/antlib.xml"
classpath="${user.home}/.antworks/lib/antworks-importer.jar" />
+
<property name="project.name" value="depot-common" />
<property name="project.version" value="0.1-dev-${DSTAMP}" />
@@ -93,7 +31,6 @@
<property name="apache.antlet.svn.www.url"
value="https://svn.apache.org/repos/asf/incubator/depot/trunk/www/version" />
-
<property name="project.src.dir" value="src/java" />
<property name="project.test.dir" value="src/test" />
@@ -106,7 +43,6 @@
<importer name="forrest_0_6-0.1" href="${antlets.repo}" />
<importer name="apache-0.1" href="${antlets.repo}" />
-
<path id="depot-common.classpath">
<fileset dir=".">
<include name="lib/*.jar" />
@@ -121,5 +57,4 @@
</target>
<target name="test" depends="junit.test" description="Run junit tests" />
-</project>
->>>>>>> .r10364
+</project>
\ No newline at end of file