Author: cdamioli
Date: Mon Feb 4 11:40:39 2013
New Revision: 1442082
URL: http://svn.apache.org/viewvc?rev=1442082&view=rev
Log:
COCOON-2330 Release separate source and dependencies packages
Modified:
cocoon/branches/BRANCH_2_1_X/build.bat
cocoon/branches/BRANCH_2_1_X/build.sh
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/build.bat
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/build.bat?rev=1442082&r1=1442081&r2=1442082&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.bat (original)
+++ cocoon/branches/BRANCH_2_1_X/build.bat Mon Feb 4 11:40:39 2013
@@ -29,6 +29,8 @@ rem ----- Use Ant shipped with Cocoon. I
set OLD_ANT_HOME=%ANT_HOME%
set ANT_HOME=tools
+if not exist "%ANT_HOME%\lib\ant.jar" goto noAntLib
+
call %ANT_HOME%\bin\ant -Djava.endorsed.dirs=lib\endorsed -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8 %9
rem ----- Restore ANT_HOME and ANT_OPTS
@@ -38,3 +40,15 @@ set OLD_ANT_HOME=
rem ----- Restore CLASSPATH
set CLASSPATH=%OLD_CLASSPATH%
set OLD_CLASSPATH=
+goto end
+
+:noAntLib
+echo ====================================================================
+echo WARNING : dependencies not found
+echo ====================================================================
+echo Third party libraries must be present in order to build Cocoon.
+echo You may download the cocoon-2.1.12-deps.zip and unzip
+echo its content in this directory to get these libraries.
+echo ====================================================================
+
+:end
Modified: cocoon/branches/BRANCH_2_1_X/build.sh
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/build.sh?rev=1442082&r1=1442081&r2=1442082&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.sh (original)
+++ cocoon/branches/BRANCH_2_1_X/build.sh Mon Feb 4 11:40:39 2013
@@ -38,6 +38,18 @@ OLD_ANT_OPTS="$ANT_OPTS"
ANT_OPTS="-Xms32M -Xmx512M -Djava.endorsed.dirs=lib/endorsed"
export ANT_HOME ANT_OPTS
+if [ ! -f "$ANT_HOME/lib/ant.jar" ]
+then
+ echo ====================================================================
+ echo WARNING : dependencies not found
+ echo ====================================================================
+ echo Third party libraries must be present in order to build Cocoon.
+ echo You may download the cocoon-2.1.12-deps.zip and unzip
+ echo its content in this directory to get these libraries.
+ echo ====================================================================
+ exit
+fi
+
"$ANT_HOME/bin/ant" -logger org.apache.tools.ant.NoBannerLogger --noconfig -emacs "$@"
ERR=$?
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=1442082&r1=1442081&r2=1442082&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 Mon Feb 4 11:40:39 2013
@@ -79,6 +79,7 @@
<exclude name="${dist.name}/lib/**"/>
<exclude name="${dist.name}/tools/lib/**"/>
<exclude name="${dist.name}/tools/jetty/lib/**"/>
+ <exclude name="${dist.name}/legal/**"/>
</zip>
<tar tarfile="${dist.target}/${dist.name}-src.tar"
@@ -91,6 +92,7 @@
<exclude name="${dist.name}/lib/**"/>
<exclude name="${dist.name}/tools/lib/**"/>
<exclude name="${dist.name}/tools/jetty/lib/**"/>
+ <exclude name="${dist.name}/legal/**"/>
</tarfileset>
<tarfileset dir="${dist.root}" mode="755">
<include name="${dist.name}/cocoon.sh"/>
@@ -103,17 +105,21 @@
<zip zipfile="${dist.target}/${dist.name}-deps.zip"
basedir="${dist.root}">
+ <include name="${dist.name}/NOTICE.txt"/>
<include name="${dist.name}/lib/**"/>
<include name="${dist.name}/tools/lib/**"/>
<include name="${dist.name}/tools/jetty/lib/**"/>
+ <include name="${dist.name}/legal/**"/>
</zip>
<tar tarfile="${dist.target}/${dist.name}-deps.tar"
longfile="gnu">
<tarfileset dir="${dist.root}">
+ <include name="${dist.name}/NOTICE.txt"/>
<include name="${dist.name}/lib/**"/>
<include name="${dist.name}/tools/lib/**"/>
<include name="${dist.name}/tools/jetty/lib/**"/>
+ <include name="${dist.name}/legal/**"/>
</tarfileset>
</tar>
<gzip zipfile="${dist.target}/${dist.name}-deps.tar.gz" src="${dist.target}/${dist.name}-deps.tar"/>
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=1442082&r1=1442081&r2=1442082&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 Mon Feb 4 11:40:39 2013
@@ -197,7 +197,7 @@
WARNING : dependencies not found
====================================================================
Third party libraries must be present in order to build Cocoon.
- You may download the cocoon-${version}-deps.jar and unzip
+ You may download the cocoon-${version}-deps.zip and unzip
its content in this directory to get these libraries.
====================================================================</echo>
<fail message="dependencies not found"/>
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.