tfischer 2005/07/19 09:11:52
Modified: src/maven-plugin project.properties project.xml
Added: src/maven-plugin maven.xml
src/maven-plugin/src/conf build-src.properties
Log:
let maven dist build a working source distribution. Same hack as in generator
for extending project.base.xml
Revision Changes Path
1.8 +15 -1 db-torque/src/maven-plugin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/db-torque/src/maven-plugin/project.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.properties 31 Jan 2005 19:43:58 -0000 1.7
+++ project.properties 19 Jul 2005 16:11:51 -0000 1.8
@@ -34,3 +34,17 @@
maven.xdoc.date=left
maven.xdoc.version=${pom.currentVersion}
+
+# -------------------------------------------------------------------
+# Workaround to allow building from the source distribution.
+# In cvs, the extends path is ../../project-base.xml,
+# whereas in the source distribution, the extends path is
+# project-base.xml
+# The property in this file controls the path for the cvs version.
+# The property can be removed as soon as maven distributes a
+# project.xml where the <extends> is already resolved.
+# Outside building from the source distribution, this property has
+# no effect.
+# -------------------------------------------------------------------
+torque.project.base.path = ../../project-base.xml
+
1.26 +1 -1 db-torque/src/maven-plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/db-torque/src/maven-plugin/project.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- project.xml 19 Jul 2005 13:31:59 -0000 1.25
+++ project.xml 19 Jul 2005 16:11:51 -0000 1.26
@@ -18,7 +18,7 @@
-->
<project>
- <extend>../../project-base.xml</extend>
+ <extend>${torque.project.base.path}</extend>
<pomVersion>3</pomVersion>
<id>maven-torque-plugin</id>
<groupId>torque</groupId>
1.5 +58 -64 db-torque/src/maven-plugin/maven.xml
1.1 db-torque/src/maven-plugin/src/conf/build-src.properties
Index: build-src.properties
===================================================================
# -------------------------------------------------------------------
# Workaround to allow building from the source distribution.
# In cvs, the extends path is ../../project-base.xml,
# whereas in the source distribution, the extends is project-base.xml
# This file gets copied into the project root of the source
# distribution and the definition of ${torque.project.base.path}
# overwrites the definition in project.properties.
# The property can be removed as soon as maven distributes a
# project.xml where the <extends> is already resolved.
# Outside building from the source distribution, this property has
# no effect.
# -------------------------------------------------------------------
torque.project.base.path = ./project-base.xml
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
