cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r410948 - /incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml
Date Thu, 01 Jun 2006 20:57:50 GMT
Author: aadamchik
Date: Thu Jun  1 13:57:50 2006
New Revision: 410948

URL: http://svn.apache.org/viewvc?rev=410948&view=rev
Log:
fixing Modeler maven bundle build script to nclude the right sources

Modified:
    incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml

Modified: incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml?rev=410948&r1=410947&r2=410948&view=diff
==============================================================================
--- incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml (original)
+++ incubator/cayenne/main/trunk/cayenne/cayenne-ant/maven/build.xml Thu Jun  1 13:57:50 2006
@@ -34,10 +34,9 @@
 		</antcall>
 		
 		<antcall target="install">
-			<param name="stage-target" value="stage"/>
+			<param name="stage-target" value="stage-modeler"/>
 			<param name="m2.groupDir" value="${m2.repo}/org/objectstyle/cayenne"/>
 			<param name="m2.artifactId" value="${project.name}-modeler"/>
-			<param name="jar.prefix" value="modeler/"/>
 		</antcall>
 		
 <!-- Ignore Ashwood - it is deployed on ibiblio and never changes 
@@ -68,9 +67,8 @@
 		</antcall>
 		
 		<antcall target="bundle">
-			<param name="stage-target" value="stage"/>
+			<param name="stage-target" value="stage-modeler"/>
 			<param name="m2.artifactId" value="${project.name}-modeler"/>
-			<param name="jar.prefix" value="modeler/"/>
 		</antcall>
 		
 <!-- Ignore Ashwood - it is deployed on ibiblio and never changes 
@@ -146,7 +144,6 @@
 	-->
 	<target name="stage" depends="validate-pom">
 		<property name="stage" value="${build}/${m2.artifactId}"/>
-		<property name="jar.prefix" value=""/>
 		<mkdir dir="${stage}"/>
 		
 		<copy file="maven/${m2.artifactId}-pom.xml" tofile="${stage}/pom.xml">
@@ -159,7 +156,7 @@
 			tofile="${stage}/LICENSE.txt"/>
 		
 		<copy
-			file="${dist.base}/${project.name}-${project.version}/lib/${jar.prefix}${m2.artifactId}.jar"
+			file="${dist.base}/${project.name}-${project.version}/lib/${m2.artifactId}.jar"
 			tofile="${stage}/${m2.artifactId}-${project.version}.jar"/>
 		
 		<jar jarfile="${stage}/${m2.artifactId}-${project.version}-sources.jar">
@@ -169,6 +166,29 @@
 		</jar>
 	</target>
 	
+	<target name="stage-modeler" depends="validate-pom">
+		<property name="stage" value="${build}/${m2.artifactId}"/>
+		<mkdir dir="${stage}"/>
+		
+		<copy file="maven/${m2.artifactId}-pom.xml" tofile="${stage}/pom.xml">
+			<filterset>
+				<filter token="PROJECT-VERSION" value="${project.version}"/>
+			</filterset>
+		</copy>
+		
+		<copy file="${cayenne.other}/licenses/LICENSE.txt"
+			tofile="${stage}/LICENSE.txt"/>
+		
+		<copy
+			file="${dist.base}/${project.name}-${project.version}/lib/modeler/${m2.artifactId}.jar"
+			tofile="${stage}/${m2.artifactId}-${project.version}.jar"/>
+		
+		<jar jarfile="${stage}/${m2.artifactId}-${project.version}-sources.jar">
+			<fileset dir="${cayenne.java}/src/modeler/java" includes="**/*.java"/>
+		</jar>
+	</target>
+	
+<!-- related to ashwood
 	<target name="stage-lib" depends="validate-pom">
 		<property name="stage" value="${build}/${m2.artifactId}"/>
 		<mkdir dir="${stage}"/>
@@ -185,6 +205,7 @@
 			file="${cayenne.java}/lib-src/${m2.artifactId}-${project.version}-src.jar"
 			tofile="${stage}/${m2.artifactId}-${project.version}-sources.jar"/>
 	</target>
+-->
 	
 	<!-- 
 		Performs POM Schema validation.



Mime
View raw message