Revision: 121
http://ant-contrib.svn.sourceforge.net/ant-contrib/?rev=121&view=rev
Author: carnold
Date: 2007-07-25 16:13:31 -0700 (Wed, 25 Jul 2007)
Log Message:
-----------
Bug 1760649: Rearrge to Maven 2 Standard Directory Layout
Modified Paths:
--------------
cpptasks/trunk/build.xml
cpptasks/trunk/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java
cpptasks/trunk/src/test/java/net/sf/antcontrib/cpptasks/TestTargetHistoryTable.java
Added Paths:
-----------
cpptasks/trunk/src/main/
cpptasks/trunk/src/main/java/
cpptasks/trunk/src/main/java/net/
cpptasks/trunk/src/main/resources/
cpptasks/trunk/src/main/resources/cpptasks.mf
cpptasks/trunk/src/main/resources/cpptasks.tasks
cpptasks/trunk/src/main/resources/cpptasks.types
cpptasks/trunk/src/main/resources/net/
cpptasks/trunk/src/main/resources/net/sf/
cpptasks/trunk/src/main/resources/net/sf/antcontrib/
cpptasks/trunk/src/main/resources/net/sf/antcontrib/cpptasks/
cpptasks/trunk/src/samples/
cpptasks/trunk/src/test/
cpptasks/trunk/src/test/java/
cpptasks/trunk/src/test/java/net/
cpptasks/trunk/src/test/resources/
Removed Paths:
-------------
cpptasks/trunk/samples/
cpptasks/trunk/src/cpptasks.mf
cpptasks/trunk/src/cpptasks.tasks
cpptasks/trunk/src/cpptasks.types
cpptasks/trunk/src/net/
cpptasks/trunk/test/
Modified: cpptasks/trunk/build.xml
===================================================================
--- cpptasks/trunk/build.xml 2007-07-25 22:03:25 UTC (rev 120)
+++ cpptasks/trunk/build.xml 2007-07-25 23:13:31 UTC (rev 121)
@@ -41,16 +41,18 @@
Set the properties related to the source tree
===================================================================
-->
- <property name="src.dir" value="src"/>
- <property name="java.dir" value="src"/>
- <property name="tests.java.dir" value="test/junit"/>
+ <property name="src.dir" value="src/main/java"/>
+ <property name="resources.dir" value="src/main/resources"/>
+ <property name="java.dir" value="src/main/java"/>
+ <property name="tests.java.dir" value="src/test/java"/>
+ <property name="tests.resources.dir" value="src/test/resources"/>
<!--
===================================================================
Set the properties for the build area
===================================================================
-->
- <property name="build.dir" value="build"/>
+ <property name="build.dir" value="target"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="tests.build.classes" value="${build.dir}/tests"/>
<property name="tests.build.lib" value="${build.dir}/lib"/>
@@ -65,7 +67,7 @@
===================================================================
-->
<property name="dist.name" value="${name}-${version}"/>
- <property name="dist.base" value="dist"/>
+ <property name="dist.base" value="target"/>
<property name="dist.dir" value="${dist.base}/${dist.name}"/>
<property name="dist.javadocs" value="${dist.dir}/docs/manual/api"/>
@@ -145,10 +147,10 @@
depends="build"
description="--> creates the jar">
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/${name}.jar" manifest="${src.dir}/cpptasks.mf">
+ <jar jarfile="${build.lib}/${name}.jar" manifest="${resources.dir}/cpptasks.mf">
<fileset dir="." includes="LICENSE NOTICE"/>
<fileset dir="${build.classes}"/>
- <fileset dir="${src.dir}" includes="cpptasks.tasks,cpptasks.types,net/sf/antcontrib/cpptasks/antlib.xml"/>
+ <fileset dir="${resources.dir}" includes="cpptasks.tasks,cpptasks.types,net/sf/antcontrib/cpptasks/antlib.xml"/>
</jar>
</target>
@@ -177,8 +179,9 @@
<target name="run-tests" depends="build-tests" description="Run tests">
<junit printsummary="false"
fork="true"
- dir="${tests.java.dir}">
+ dir="${tests.resources.dir}">
<classpath>
+ <pathelement location="${java.dir}"/>
<pathelement location="${tests.build.lib}/${name}_test.jar" />
<pathelement location="${build.lib}/${name}.jar" />
</classpath>
@@ -194,7 +197,7 @@
<target name="run-coverage-tests" depends="build-tests">
<junit printsummary="false"
fork="true"
- dir="${tests.java.dir}">
+ dir="${tests.resources.dir}">
<classpath>
<pathelement location="${tests.build.lib}/${name}_test.jar" />
<pathelement location="${build.lib}/${name}.jar" />
Deleted: cpptasks/trunk/src/cpptasks.mf
===================================================================
--- cpptasks/trunk/src/cpptasks.mf 2007-07-25 22:03:25 UTC (rev 120)
+++ cpptasks/trunk/src/cpptasks.mf 2007-07-25 23:13:31 UTC (rev 121)
@@ -1,7 +0,0 @@
-Manifest-Version: 2.0
-Main-Class: net.sf.antcontrib.cpptasks.AboutCCTask
-
-Name: CCTask
-Implementation-Vendor: Ant-Contrib project
-Implementation-Version: 1.0
-Implementation-Title: Compile and link tasks for Apache Ant
Deleted: cpptasks/trunk/src/cpptasks.tasks
===================================================================
--- cpptasks/trunk/src/cpptasks.tasks 2007-07-25 22:03:25 UTC (rev 120)
+++ cpptasks/trunk/src/cpptasks.tasks 2007-07-25 23:13:31 UTC (rev 121)
@@ -1 +0,0 @@
-cc=net.sf.antcontrib.cpptasks.CCTask
Deleted: cpptasks/trunk/src/cpptasks.types
===================================================================
--- cpptasks/trunk/src/cpptasks.types 2007-07-25 22:03:25 UTC (rev 120)
+++ cpptasks/trunk/src/cpptasks.types 2007-07-25 23:13:31 UTC (rev 121)
@@ -1,8 +0,0 @@
-defineset=net.sf.antcontrib.cpptasks.types.DefineSet
-compiler=net.sf.antcontrib.cpptasks.CompilerDef
-linker=net.sf.antcontrib.cpptasks.LinkerDef
-targetplatform=net.sf.antcontrib.cpptasks.TargetDef
-versioninfo=net.sf.antcontrib.cpptasks.VersionInfo
-distributer=net.sf.antcontrib.cpptasks.DistributerDef
-syslibset=net.sf.antcontrib.cpptasks.types.SystemLibrarySet
-libset=net.sf.antcontrib.cpptasks.types.LibrarySet
\ No newline at end of file
Copied: cpptasks/trunk/src/main/java/net (from rev 120, cpptasks/trunk/src/net)
Copied: cpptasks/trunk/src/main/resources/cpptasks.mf (from rev 120, cpptasks/trunk/src/cpptasks.mf)
===================================================================
--- cpptasks/trunk/src/main/resources/cpptasks.mf (rev 0)
+++ cpptasks/trunk/src/main/resources/cpptasks.mf 2007-07-25 23:13:31 UTC (rev 121)
@@ -0,0 +1,7 @@
+Manifest-Version: 2.0
+Main-Class: net.sf.antcontrib.cpptasks.AboutCCTask
+
+Name: CCTask
+Implementation-Vendor: Ant-Contrib project
+Implementation-Version: 1.0
+Implementation-Title: Compile and link tasks for Apache Ant
Copied: cpptasks/trunk/src/main/resources/cpptasks.tasks (from rev 120, cpptasks/trunk/src/cpptasks.tasks)
===================================================================
--- cpptasks/trunk/src/main/resources/cpptasks.tasks (rev 0)
+++ cpptasks/trunk/src/main/resources/cpptasks.tasks 2007-07-25 23:13:31 UTC (rev 121)
@@ -0,0 +1 @@
+cc=net.sf.antcontrib.cpptasks.CCTask
Copied: cpptasks/trunk/src/main/resources/cpptasks.types (from rev 120, cpptasks/trunk/src/cpptasks.types)
===================================================================
--- cpptasks/trunk/src/main/resources/cpptasks.types (rev 0)
+++ cpptasks/trunk/src/main/resources/cpptasks.types 2007-07-25 23:13:31 UTC (rev 121)
@@ -0,0 +1,8 @@
+defineset=net.sf.antcontrib.cpptasks.types.DefineSet
+compiler=net.sf.antcontrib.cpptasks.CompilerDef
+linker=net.sf.antcontrib.cpptasks.LinkerDef
+targetplatform=net.sf.antcontrib.cpptasks.TargetDef
+versioninfo=net.sf.antcontrib.cpptasks.VersionInfo
+distributer=net.sf.antcontrib.cpptasks.DistributerDef
+syslibset=net.sf.antcontrib.cpptasks.types.SystemLibrarySet
+libset=net.sf.antcontrib.cpptasks.types.LibrarySet
\ No newline at end of file
Copied: cpptasks/trunk/src/samples (from rev 120, cpptasks/trunk/samples)
Copied: cpptasks/trunk/src/test/java/net (from rev 120, cpptasks/trunk/test/junit/net)
Modified: cpptasks/trunk/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java
===================================================================
--- cpptasks/trunk/test/junit/net/sf/antcontrib/cpptasks/TestDependencyTable.java 2007-07-25 22:03:25 UTC (rev 120)
+++ cpptasks/trunk/src/test/java/net/sf/antcontrib/cpptasks/TestDependencyTable.java 2007-07-25 23:13:31 UTC (rev 121)
@@ -51,7 +51,7 @@
ParserConfigurationException, SAXException {
String tmpDir = System.getProperty("java.io.tmpdir");
try {
- copyResourceToTmpDir("files/openshore/dependencies.xml",
+ copyResourceToTmpDir("openshore/dependencies.xml",
"dependencies.xml");
DependencyTable dependencies = new DependencyTable(new File(tmpDir));
dependencies.load();
@@ -68,7 +68,7 @@
ParserConfigurationException, SAXException {
String tmpDir = System.getProperty("java.io.tmpdir");
try {
- copyResourceToTmpDir("files/xerces-c/dependencies.xml",
+ copyResourceToTmpDir("xerces-c/dependencies.xml",
"dependencies.xml");
DependencyTable dependencies = new DependencyTable(new File(tmpDir));
dependencies.load();
Modified: cpptasks/trunk/src/test/java/net/sf/antcontrib/cpptasks/TestTargetHistoryTable.java
===================================================================
--- cpptasks/trunk/test/junit/net/sf/antcontrib/cpptasks/TestTargetHistoryTable.java 2007-07-25 22:03:25 UTC (rev 120)
+++ cpptasks/trunk/src/test/java/net/sf/antcontrib/cpptasks/TestTargetHistoryTable.java 2007-07-25 23:13:31 UTC (rev 121)
@@ -65,7 +65,7 @@
*/
public void testLoadOpenshore() throws IOException {
try {
- copyResourceToTmpDir("files/openshore/history.xml", "history.xml");
+ copyResourceToTmpDir("openshore/history.xml", "history.xml");
CCTask task = new CCTask();
String tmpDir = System.getProperty("java.io.tmpdir");
TargetHistoryTable history = new TargetHistoryTable(task, new File(
@@ -81,7 +81,7 @@
*/
public void testLoadXerces() throws IOException {
try {
- copyResourceToTmpDir("files/xerces-c/history.xml", "history.xml");
+ copyResourceToTmpDir("xerces-c/history.xml", "history.xml");
CCTask task = new CCTask();
String tmpDir = System.getProperty("java.io.tmpdir");
TargetHistoryTable history = new TargetHistoryTable(task, new File(
Copied: cpptasks/trunk/src/test/resources (from rev 120, cpptasks/trunk/test/junit/files)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.