[Unicore-cvs-commits] SF.net SVN: unicore:[11622] tools/packaging_tools/trunk/packman/main.xml

[<go...@us...>]

Revision: 11622
          http://unicore.svn.sourceforge.net/unicore/?rev=11622&view=rev
Author:   golbi
Date:     2011-10-30 11:33:21 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
fixed bug: skip.copy.jars was not fully honored, added a new feature: libraries prefix is configurable

Modified Paths:
--------------
    tools/packaging_tools/trunk/packman/main.xml

Modified: tools/packaging_tools/trunk/packman/main.xml
===================================================================
--- tools/packaging_tools/trunk/packman/main.xml	2011-10-30 10:36:13 UTC (rev 11621)
+++ tools/packaging_tools/trunk/packman/main.xml	2011-10-30 11:33:21 UTC (rev 11622)
@@ -13,6 +13,7 @@
 	<!--default properties if not set from cmd or property file-->
 	<property name="dependency.type" value="jar" />
 	<property name="package.prefix" value="unicore-" />
+	<property name="libraries.base" value="/usr/share/unicore/" />
 	<property name="src.tar.gz.main.dir" value="" />
 	<property name="exclude.dependency" value="" />
 	<property name="maven.version" value="2.2.1" />
@@ -137,7 +138,7 @@
 	<target name="set-distribution-dir">
 		<property name="src.distribution.selected" value="${main.dir}/src/main/package/distributions/${distribution}/src" />
 		<property name="distribution.base" value="${main.dir}/target/${distribution}/RPMS/builddir" />
-		<property name="distribution.libs" value="${distribution.base}/usr/share/unicore/${component.package.name}/lib" />
+		<property name="distribution.libs" value="${distribution.base}${libraries.base}${component.package.name}/lib" />
 	</target>
 
 	<target name="prepare-distribution-structure">
@@ -201,7 +202,10 @@
 		</copy>
 	</target>
 
-	<target name="update-jars" depends="copy-main-artifact,copy-endorsed-jars" unless="skip.copy.jars">
+	<target name="update-jars" unless="skip.copy.jars">
+                <!-- not as dependencies, as we want to skip them if skip.copy.jars is set -->
+                <antCall target="copy-main-artifact"/>
+                <antCall target="copy-endorsed-jars"/>
                 <echo message="Updating jar files,download from maven repo" />
                 <mkdir dir="${libs}" />
                 <mvn:remoteRepository id="vsgc-public" url="${maven.repo.url}" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.