You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/01/07 18:15:25 UTC
svn commit: r1056396 - in
/incubator/lcf/branches/release-0.1-incubating-branch: ./ CHANGES.txt
build.xml
Author: kwright
Date: Fri Jan 7 17:15:24 2011
New Revision: 1056396
URL: http://svn.apache.org/viewvc?rev=1056396&view=rev
Log:
Port changes for CONNECTORS-140 to release branch
Modified:
incubator/lcf/branches/release-0.1-incubating-branch/ (props changed)
incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt
incubator/lcf/branches/release-0.1-incubating-branch/build.xml
Propchange: incubator/lcf/branches/release-0.1-incubating-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 7 17:15:24 2011
@@ -1,2 +1,2 @@
/incubator/lcf/branches/release-0.1-branch:1056045
-/incubator/lcf/trunk:1039159,1041674,1041679,1041763,1041885,1041968,1042383,1042836-1042837,1042896,1042898,1043728,1044276,1044287,1044294,1044641,1049834,1050183,1050605,1056045,1056054,1056104,1056116,1056131-1056139,1056157,1056170-1056173,1056195,1056245
+/incubator/lcf/trunk:1039159,1041674,1041679,1041763,1041885,1041968,1042383,1042836-1042837,1042896,1042898,1043728,1044276,1044287,1044294,1044641,1049834,1050183,1050605,1056045,1056054,1056104,1056116,1056131-1056139,1056157,1056170-1056173,1056195,1056245,1056382-1056385
Modified: incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt?rev=1056396&r1=1056395&r2=1056396&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.1-incubating-branch/CHANGES.txt Fri Jan 7 17:15:24 2011
@@ -4,6 +4,9 @@ $Id$
======================= Release 0.1 =======================
Release Date: See http://incubator.apache.org/connectors for the official release date.
+CONNECTORS-140: Change build to generate both a -src and a -bin distribution.
+(Grant Ingersoll, Karl Wright)
+
CONNECTORS-139: Change download area to www.apache.org/dist/incubator/manifoldcf,
as according to incubator rules.
(Karl Wright)
Modified: incubator/lcf/branches/release-0.1-incubating-branch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.1-incubating-branch/build.xml?rev=1056396&r1=1056395&r2=1056396&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.1-incubating-branch/build.xml (original)
+++ incubator/lcf/branches/release-0.1-incubating-branch/build.xml Fri Jan 7 17:15:24 2011
@@ -1532,52 +1532,72 @@
<property name="release-version" value="0.1-incubating"/>
</target>
- <target name="create-zip" depends="doc,javadoc,set-version">
- <zip destfile="apache-manifoldcf-${release-version}.zip" update="false">
+ <target name="create-source-zip" depends="set-version">
+ <zip destfile="apache-manifoldcf-${release-version}-src.zip" update="false">
+ <zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
+ <exclude name="/connectors/*/lib/"/>
+ <exclude name="/framework/lib/"/>
+ <exclude name="**/build/"/>
+ <exclude name="/dist/"/>
+ <exclude name="/connectors/*/dist/"/>
+ <exclude name="/framework/dist/"/>
+ <exclude name="**/test-output/"/>
+ <exclude name="/legacy-*/"/>
+ <exclude name="/apache-manifoldcf-*"/>
+ </zipfileset>
+ </zip>
+ </target>
+
+ <target name="create-source-tar" depends="set-version">
+ <tar destfile="apache-manifoldcf-${release-version}-src.tar.gz" compression="gzip" longfile="gnu">
+ <tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
+ <exclude name="/connectors/*/lib/"/>
+ <exclude name="/framework/lib/"/>
+ <exclude name="**/build/"/>
+ <exclude name="/dist/"/>
+ <exclude name="/connectors/*/dist/"/>
+ <exclude name="/framework/dist/"/>
+ <exclude name="**/test-output/"/>
+ <exclude name="/legacy-*/"/>
+ <exclude name="/apache-manifoldcf-*"/>
+ </tarfileset>
+ </tar>
+ </target>
+
+ <target name="create-bin-zip" depends="build,doc,javadoc,set-version">
+ <zip destfile="apache-manifoldcf-${release-version}-bin.zip" update="false">
<zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
- <include name="/"/>
<exclude name="/connectors/*/lib/"/>
<exclude name="/framework/lib/"/>
<exclude name="**/build/"/>
- <exclude name="/dist/example/"/>
- <exclude name="/dist/processes/"/>
- <exclude name="/dist/web/"/>
- <exclude name="/dist/lib/"/>
- <exclude name="/dist/*-process/"/>
<exclude name="/connectors/*/dist/"/>
<exclude name="/framework/dist/"/>
<exclude name="**/test-output/"/>
<exclude name="/legacy-*/"/>
<exclude name="**/*.pdf"/>
- <exclude name="/apache-manifoldcf-*.zip"/>
- <exclude name="/apache-manifoldcf-*.tar.gz"/>
+ <exclude name="/apache-manifoldcf-*"/>
</zipfileset>
</zip>
</target>
- <target name="create-tar" depends="doc,javadoc,set-version">
- <tar destfile="apache-manifoldcf-${release-version}.tar.gz" compression="gzip" longfile="gnu">
+ <target name="create-bin-tar" depends="build,doc,javadoc,set-version">
+ <tar destfile="apache-manifoldcf-${release-version}-bin.tar.gz" compression="gzip" longfile="gnu">
<tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
<exclude name="/connectors/*/lib/"/>
<exclude name="/framework/lib/"/>
<exclude name="**/build/"/>
- <exclude name="/dist/example/"/>
- <exclude name="/dist/processes/"/>
- <exclude name="/dist/web/"/>
- <exclude name="/dist/lib/"/>
- <exclude name="/dist/*-process/"/>
<exclude name="/connectors/*/dist/"/>
<exclude name="/framework/dist/"/>
<exclude name="**/test-output/"/>
<exclude name="/legacy-*/"/>
<exclude name="**/*.pdf"/>
- <exclude name="/apache-manifoldcf-*.zip"/>
- <exclude name="/apache-manifoldcf-*.tar.gz"/>
+ <exclude name="/apache-manifoldcf-*"/>
</tarfileset>
</tar>
</target>
- <target name="image" depends="create-zip,create-tar"/>
+ <target name="image" depends="create-source-zip,create-source-tar,create-bin-zip,create-bin-tar"/>
+
<target name="test" depends="run-tests-framework,run-tests-open-connectors,run-tests-lgpl-connectors,run-tests-proprietary-connectors,end-to-end-tests"/>
<target name="all" depends="build,javadoc,doc,image,test"/>