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 2012/09/21 19:31:57 UTC
svn commit: r1388582 - in /manifoldcf/branches/release-1.0-branch: ./
CHANGES.txt build.xml connectors/connector-build.xml
Author: kwright
Date: Fri Sep 21 17:31:56 2012
New Revision: 1388582
URL: http://svn.apache.org/viewvc?rev=1388582&view=rev
Log:
Pull up fix for CONNECTORS-533.
Modified:
manifoldcf/branches/release-1.0-branch/ (props changed)
manifoldcf/branches/release-1.0-branch/CHANGES.txt
manifoldcf/branches/release-1.0-branch/build.xml
manifoldcf/branches/release-1.0-branch/connectors/connector-build.xml
Propchange: manifoldcf/branches/release-1.0-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1388581
Modified: manifoldcf/branches/release-1.0-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/CHANGES.txt?rev=1388582&r1=1388581&r2=1388582&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.0-branch/CHANGES.txt Fri Sep 21 17:31:56 2012
@@ -3,6 +3,9 @@ $Id$
======================= 1.0 =====================
+CONNECTORS-533: Do not forgo xxx-README files in connector-lib-proprietary.
+(Karl Wright)
+
CONNECTORS-532: Update 'incubator' and redirected URLs in various places.
(Ahmet Arslan)
Modified: manifoldcf/branches/release-1.0-branch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/build.xml?rev=1388582&r1=1388581&r2=1388582&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/build.xml (original)
+++ manifoldcf/branches/release-1.0-branch/build.xml Fri Sep 21 17:31:56 2012
@@ -1155,10 +1155,10 @@
</target>
<target name="general-connector-proprietary-runnable-check">
- <available file="connectors/${connector-name}/dist/lib-proprietary-only/${connector-name}-README.txt" property="${connector-name}.has-readme"/>
+ <available file="connectors/${connector-name}/dist/lib-proprietary-only/${connector-name}-PLACEHOLDER.txt" property="${connector-name}.has-placeholder"/>
<condition property="${connector-name}.is-proprietary-runnable">
<not>
- <isset property="${connector-name}.has-readme"/>
+ <isset property="${connector-name}.has-placeholder"/>
</not>
</condition>
</target>
@@ -2609,6 +2609,8 @@
<zip destfile="apache-manifoldcf-${release-version}-bin.zip" update="false">
<zipfileset dir="dist" prefix="apache-manifoldcf-${release-version}">
<exclude name="connector-lib-proprietary/*.jar"/>
+ <exclude name="**/lib-proprietary/*.jar"/>
+ <exclude name="connector-lib-proprietary/*-PLACEHOLDER.txt"/>
<exclude name="connectors-proprietary.xml"/>
<exclude name="/example-proprietary/"/>
<exclude name="/multiprocess-example-proprietary/"/>
@@ -2621,6 +2623,8 @@
<tar destfile="apache-manifoldcf-${release-version}-bin.tar.gz" compression="gzip" longfile="gnu">
<tarfileset dir="dist" prefix="apache-manifoldcf-${release-version}">
<exclude name="connector-lib-proprietary/*.jar"/>
+ <exclude name="**/lib-proprietary/*.jar"/>
+ <exclude name="connector-lib-proprietary/*-PLACEHOLDER.txt"/>
<exclude name="connectors-proprietary.xml"/>
<exclude name="/example-proprietary/"/>
<exclude name="/multiprocess-example-proprietary/"/>
Modified: manifoldcf/branches/release-1.0-branch/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/release-1.0-branch/connectors/connector-build.xml?rev=1388582&r1=1388581&r2=1388582&view=diff
==============================================================================
--- manifoldcf/branches/release-1.0-branch/connectors/connector-build.xml (original)
+++ manifoldcf/branches/release-1.0-branch/connectors/connector-build.xml Fri Sep 21 17:31:56 2012
@@ -120,13 +120,15 @@
more proprietary libraries to build and run. We expect to find a README.txt file in
the directory, which describes what is needed at build time, and that if the required
libraries are not present, the connector's build.xml file will override "calculate-condition"
- and "precompile-check" appropriately.
- (3) If there's a build-stub directory, we presume that the connector requires one or
+ and "precompile-check" appropriately. If there's a "proprietary-library-instructions.txt" file,
+ it will be copied to the connector-lib directory with the name {connector}-README.txt.
+ If the required libraries are not present, the same file will also be copied to {connector}-PLACEHOLDER.txt.
+ (2) If there's a build-stub directory, we presume that the connector requires one or
more proprietary libraries to run, but can be built without proprietary libraries through
the use of stubs. In this case the connector MAY also have a
"proprietary-library-instructions.txt" file, if proprietary libraries are required at
runtime. This file will be copied to the
- connector-lib directory with the name {connector}-README.txt
+ connector-lib directory with the name {connector}-README.txt and to {connector}-PLACEHOLDER.txt,
as a placeholder for the required proprietary libraries.
A connector can have both a build-stub and a lib-proprietary directory. In this case,
@@ -182,6 +184,10 @@
<available file="build-stub/src/main/java" property="hasStubs"/>
</target>
+ <target name="include-README-lib-proprietary-check" depends="precompile-check" if="canBuild">
+ <available file="proprietary-library-instructions.txt" property="includeREADMELibProprietary"/>
+ </target>
+
<target name="include-proprietary-instructions-lib-proprietary-check" depends="prerun-check" unless="canRun">
<available file="proprietary-library-instructions.txt" property="includeProprietaryInstructionsLibProprietary"/>
</target>
@@ -521,11 +527,16 @@
<copy todir="dist/lib" file="build/jar/mcf-${ant.project.name}-connector.jar"/>
</target>
- <target name="lib-proprietary-instructions" depends="include-proprietary-instructions-lib-proprietary-check" if="includeProprietaryInstructionsLibProprietary">
+ <target name="lib-proprietary-README" depends="include-README-lib-proprietary-check" if="includeREADMELibProprietary">
<mkdir dir="dist/lib-proprietary-only"/>
<copy tofile="dist/lib-proprietary-only/${ant.project.name}-README.txt" file="proprietary-library-instructions.txt"/>
</target>
+ <target name="lib-proprietary-instructions" depends="include-proprietary-instructions-lib-proprietary-check" if="includeProprietaryInstructionsLibProprietary">
+ <mkdir dir="dist/lib-proprietary-only"/>
+ <copy tofile="dist/lib-proprietary-only/${ant.project.name}-PLACEHOLDER.txt" file="proprietary-library-instructions.txt"/>
+ </target>
+
<target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,has-RMI-check" if="hasRMI">
<mkdir dir="dist/server-process/lib"/>
<copy todir="dist/server-process/lib">
@@ -562,7 +573,7 @@
<target name="integration"/>
- <target name="build" depends="lib,lib-proprietary-instructions,server-process,registry-process,integration"/>
+ <target name="build" depends="lib,lib-proprietary-instructions,lib-proprietary-README,server-process,registry-process,integration"/>
<target name="build-tests" depends="build,jar-tests"/>