cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cdami...@apache.org
Subject svn commit: r1415331 - in /cocoon/branches/BRANCH_2_1_X/tools/targets: dist-build.xml init-build.xml
Date Thu, 29 Nov 2012 19:31:06 GMT
Author: cdamioli
Date: Thu Nov 29 19:31:05 2012
New Revision: 1415331

URL: http://svn.apache.org/viewvc?rev=1415331&view=rev
Log:
COCOON-2330 Release separate source and dependencies packages
First proposal

Modified:
    cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml
    cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml?rev=1415331&r1=1415330&r2=1415331&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/dist-build.xml Thu Nov 29 19:31:05 2012
@@ -76,6 +76,9 @@
     <zip zipfile="${dist.target}/${dist.name}-src.zip"
          basedir="${dist.root}"
          includes="${dist.name}/**">
+        <exclude name="${dist.name}/lib/**"/>
+        <exclude name="${dist.name}/tools/lib/**"/>
+        <exclude name="${dist.name}/tools/jetty/lib/**"/>
     </zip>
 
     <tar tarfile="${dist.target}/${dist.name}-src.tar"
@@ -85,6 +88,9 @@
              <exclude name="${dist.name}/cocoon.sh"/>
              <exclude name="${dist.name}/build.sh"/>
              <exclude name="${dist.name}/tools/bin/antRun"/>
+             <exclude name="${dist.name}/lib/**"/>
+             <exclude name="${dist.name}/tools/lib/**"/>
+             <exclude name="${dist.name}/tools/jetty/lib/**"/>
          </tarfileset>
          <tarfileset dir="${dist.root}" mode="755">
              <include name="${dist.name}/cocoon.sh"/>
@@ -94,6 +100,24 @@
     </tar>
     <gzip zipfile="${dist.target}/${dist.name}-src.tar.gz" src="${dist.target}/${dist.name}-src.tar"/>
     <delete file="${dist.target}/${dist.name}-src.tar"/>
+  	
+    <zip zipfile="${dist.target}/${dist.name}-deps.zip"
+         basedir="${dist.root}">
+        <include name="${dist.name}/lib/**"/>
+        <include name="${dist.name}/tools/lib/**"/>
+        <include name="${dist.name}/tools/jetty/lib/**"/>
+    </zip>
+
+    <tar tarfile="${dist.target}/${dist.name}-deps.tar"
+         longfile="gnu">
+         <tarfileset dir="${dist.root}">
+            <include name="${dist.name}/lib/**"/>
+            <include name="${dist.name}/tools/lib/**"/>
+            <include name="${dist.name}/tools/jetty/lib/**"/>
+         </tarfileset>
+    </tar>
+    <gzip zipfile="${dist.target}/${dist.name}-deps.tar.gz" src="${dist.target}/${dist.name}-deps.tar"/>
+    <delete file="${dist.target}/${dist.name}-deps.tar"/>
   </target>
 
   <target name="clean-dist" depends="clean" description="Cleans everything and brings
back to original 'SVN checkout' state">

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml?rev=1415331&r1=1415330&r2=1415331&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/init-build.xml Thu Nov 29 19:31:05 2012
@@ -105,7 +105,7 @@
 
     <!-- Alias for the loglevel -->
     <property name="loglevel" value="${build.webapp.loglevel}"/>
-
+  	
     <!-- Set classpath -->
     <path id="classpath">
       <fileset dir="${lib.local}">
@@ -187,6 +187,26 @@
 
   <!-- Prepare the build directory -->
   <target name="prepare" depends="init-tasks">
+  	
+    <!-- Test presence of libs -->
+  	
+    <if>
+        <not>
+            <available file="${lib}2"/>
+  	    </not>
+  		<then>
+      	    <echo>====================================================================
+      	          WARNING : dependencies not found
+====================================================================
+      	 Third party librairies needs to be present in order to
+      	 build Cocoon.
+      	 You may download the cocoon-${version}-deps.jar and unzip
+      	 its content in this directory to get these librairies.
+====================================================================</echo>
+  			<fail message="dependencies not found"/>
+  	      </then>
+  	</if>
+
     <echo>====================================================================
                  ${fullname} ${version} [${year}]
 ====================================================================



Mime
View raw message