You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by io...@apache.org on 2014/04/16 17:53:06 UTC
svn commit: r1587951 - in /manifoldcf/trunk: CHANGES.txt build.xml
Author: iorixxx
Date: Wed Apr 16 15:53:06 2014
New Revision: 1587951
URL: http://svn.apache.org/r1587951
Log:
CONNECTORS-925: Fix ant exclusions for zip/tar distributions on Linux variants
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/build.xml
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1587951&r1=1587950&r2=1587951&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Apr 16 15:53:06 2014
@@ -6,6 +6,9 @@ $Id$
======================= Release 1.6 =====================
+CONNECTORS-925: Fix ant exclusions for zip/tar distributions on Linux variants.
+(Ahmet Arslan)
+
CONNECTORS-923: Fix bandwidth throttling.
(Karl Wright)
Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1587951&r1=1587950&r2=1587951&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Wed Apr 16 15:53:06 2014
@@ -21,6 +21,10 @@
<import file="common-build.xml"/>
+ <defaultexcludes add="**/*.patch"/>
+ <defaultexcludes add="**/*.iml"/>
+ <defaultexcludes add="**/.idea/**"/>
+
<target name="downloaded-condition">
<!-- Spot check a few of the dependent jars; no point including ALL of them here... -->
<available file="lib/derby.jar" property="derby-found"/>
@@ -378,15 +382,15 @@
<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="/lib/"/>
- <exclude name="/connectors/*/lib/"/>
- <exclude name="/framework/lib/"/>
+ <exclude name="lib/"/>
+ <exclude name="connectors/*/lib/"/>
+ <exclude name="framework/lib/"/>
<exclude name="**/build/"/>
<exclude name="**/tmp/"/>
- <exclude name="/site/fonts/"/>
- <exclude name="/dist/"/>
- <exclude name="/connectors/*/dist/"/>
- <exclude name="/framework/dist/"/>
+ <exclude name="site/fonts/"/>
+ <exclude name="dist/"/>
+ <exclude name="connectors/*/dist/"/>
+ <exclude name="framework/dist/"/>
<exclude name="**/target/"/>
<exclude name="**/test-output/"/>
<exclude name="**/test-derby-output/"/>
@@ -403,8 +407,8 @@
<exclude name="**/lib-proprietary/*.xsd"/>
<exclude name="**/test-materials-proprietary/*.xsd"/>
<exclude name="connectors/elasticsearch/test-materials-proprietary/elasticsearch-1.0.1/"/>
- <exclude name="/legacy-*/"/>
- <exclude name="apache-manifoldcf-*"/>
+ <exclude name="legacy-*/"/>
+ <exclude name="apache-manifoldcf-*/"/>
</zipfileset>
</zip>
</target>
@@ -414,19 +418,19 @@
<zipfileset dir="lib" prefix="apache-manifoldcf-${release-version}"/>
</zip>
</target>
-
- <target name="create-source-tar" depends="set-version">
- <tar destfile="apache-manifoldcf-${release-version}-src.tar.gz" compression="gzip" longfile="gnu">
+
+ <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="/lib/"/>
- <exclude name="/connectors/*/lib/"/>
- <exclude name="/framework/lib/"/>
+ <exclude name="lib/"/>
+ <exclude name="connectors/*/lib/"/>
+ <exclude name="framework/lib/"/>
<exclude name="**/build/"/>
<exclude name="**/tmp/"/>
- <exclude name="/site/fonts/"/>
- <exclude name="/dist/"/>
- <exclude name="/connectors/*/dist/"/>
- <exclude name="/framework/dist/"/>
+ <exclude name="site/fonts/"/>
+ <exclude name="dist/"/>
+ <exclude name="connectors/*/dist/"/>
+ <exclude name="framework/dist/"/>
<exclude name="**/target/"/>
<exclude name="**/test-output/"/>
<exclude name="**/test-derby-output/"/>
@@ -443,8 +447,8 @@
<exclude name="**/lib-proprietary/*.xsd"/>
<exclude name="**/test-materials-proprietary/*.xsd"/>
<exclude name="connectors/elasticsearch/test-materials-proprietary/elasticsearch-1.0.1/"/>
- <exclude name="/legacy-*/"/>
- <exclude name="apache-manifoldcf-*"/>
+ <exclude name="legacy-*/"/>
+ <exclude name="apache-manifoldcf-*/"/>
</tarfileset>
</tar>
</target>
@@ -463,10 +467,10 @@
<exclude name="lib-proprietary/*.jar"/>
<exclude name="connector-lib-proprietary/*-PLACEHOLDER.txt"/>
<exclude name="connectors-proprietary.xml"/>
- <exclude name="/example-proprietary/"/>
- <exclude name="/multiprocess-file-example-proprietary/"/>
- <exclude name="/multiprocess-zk-example-proprietary/"/>
- <exclude name="/web-proprietary/"/>
+ <exclude name="example-proprietary/"/>
+ <exclude name="multiprocess-file-example-proprietary/"/>
+ <exclude name="multiprocess-zk-example-proprietary/"/>
+ <exclude name="web-proprietary/"/>
</zipfileset>
</zip>
</target>
@@ -479,10 +483,10 @@
<exclude name="lib-proprietary/*.jar"/>
<exclude name="connector-lib-proprietary/*-PLACEHOLDER.txt"/>
<exclude name="connectors-proprietary.xml"/>
- <exclude name="/example-proprietary/"/>
- <exclude name="/multiprocess-file-example-proprietary/"/>
- <exclude name="/multiprocess-zk-example-proprietary/"/>
- <exclude name="/web-proprietary/"/>
+ <exclude name="example-proprietary/"/>
+ <exclude name="multiprocess-file-example-proprietary/"/>
+ <exclude name="multiprocess-zk-example-proprietary/"/>
+ <exclude name="web-proprietary/"/>
</tarfileset>
</tar>
</target>