incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1309020 - in /incubator/lcf/trunk: CHANGES.txt DEPENDENCIES.txt README.txt build.xml site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
Date Tue, 03 Apr 2012 16:27:56 GMT
Author: kwright
Date: Tue Apr  3 16:27:56 2012
New Revision: 1309020

URL: http://svn.apache.org/viewvc?rev=1309020&view=rev
Log:
Fix for CONNECTORS-444.

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/DEPENDENCIES.txt
    incubator/lcf/trunk/README.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1309020&r1=1309019&r2=1309020&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Tue Apr  3 16:27:56 2012
@@ -24,6 +24,10 @@ CONNECTORS-431: Update pom.xml versions.
 
 ======================= Release 0.5 =========================
 
+CONNECTORS-444: Update documentation to reflect new process for
+building from source.
+(Karl Wright)
+
 CONNECTORS-443: Build all patched jars we distribute; do not rely on svn
 for any binaries.
 (Karl Wright)

Modified: incubator/lcf/trunk/DEPENDENCIES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/DEPENDENCIES.txt?rev=1309020&r1=1309019&r2=1309020&view=diff
==============================================================================
--- incubator/lcf/trunk/DEPENDENCIES.txt (original)
+++ incubator/lcf/trunk/DEPENDENCIES.txt Tue Apr  3 16:27:56 2012
@@ -1,7 +1,8 @@
 ManifoldCF requires
 ------------------
 * JRE 1.5 or above
-* All other libraries checked in under lib
+* Many other libraries, available from the ManifoldCF XXX-lib distribution, or by running
+  the "make-core-deps" ant target
 
 For building ManifoldCF:
 ----------------------

Modified: incubator/lcf/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/README.txt?rev=1309020&r1=1309019&r2=1309020&view=diff
==============================================================================
--- incubator/lcf/trunk/README.txt (original)
+++ incubator/lcf/trunk/README.txt Tue Apr  3 16:27:56 2012
@@ -72,22 +72,27 @@ dist/multiprocess-example
 Instructions for Building Apache ManifoldCF from Source
 -----------------------------------------------------
 
-1. Download a source distribution of ManifoldCF.
+1. Download a source distribution of ManifoldCF, and unpack it.
 
-2. Download the Java SE 5 JDK (Java Development Kit), or greater, from http://java.sun.com.
+2. Download the corresponding lib distribution of ManifoldCF, containing the binary
+   dependencies, and unpack it.
+   
+3. Copy the lib folder in the lib distribution into the source distribution.
+
+4. Download the Java SE 5 JDK (Java Development Kit), or greater, from http://java.sun.com.
    You will need the JDK installed, and the %JAVA_HOME%\bin directory included
    on your command path.  To test this, issue a "java -version" command from your
    shell and verify that the Java version is 1.5 or greater.
 
-3. Download the Apache Ant binary distribution (1.7.0 or greater) from http://ant.apache.org.
+5. Download the Apache Ant binary distribution (1.7.0 or greater) from http://ant.apache.org.
    You will need Ant installed and the %ANT_HOME%\bin directory included on your
    command path.  To test this, issue a "ant -version" command from your
    shell and verify that Ant is available.
 
-4. If you want to build the site documents, check out, build, and install Apache Forrest
+6. If you want to build the site documents, check out, build, and install Apache Forrest
    version 0.9-dev or higher.
    
-5. In a shell, change to the root directory of the source (where you find the outermost
+7. In a shell, change to the root directory of the source (where you find the outermost
    build.xml file), and type "ant" for directions.
 
 

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1309020&r1=1309019&r2=1309020&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Tue Apr  3 16:27:56 2012
@@ -2498,6 +2498,7 @@
           <exclude name="/target/"/>
           <exclude name="/lib/"/>
           <exclude name="/lib-proprietary/"/>
+          <exclude name="/upstream-diffs/"/>
           <exclude name="/json/"/>
           <exclude name="/site/"/>
           <exclude name="/connectors/"/>
@@ -2536,6 +2537,7 @@
           <exclude name="/target/"/>
           <exclude name="/lib/"/>
           <exclude name="/lib-proprietary/"/>
+          <exclude name="/upstream-diffs/"/>
           <exclude name="/json/"/>
           <exclude name="/site/"/>
           <exclude name="/connectors/"/>

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1309020&r1=1309019&r2=1309020&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
(original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
Tue Apr  3 16:27:56 2012
@@ -39,13 +39,15 @@
         <p>To build the ManifoldCF framework code, and the particular connectors you
are interested in, you currently need to do the following:</p>
         <p></p>
         <ol>
-          <li>Check out https://svn.apache.org/repos/asf/incubator/lcf/trunk, or unpack
the source or binary distribution.  (The binary distribution includes sources).</li>
-          <li>Install desired dependent LGPL and proprietary libraries, wsdls, and
xsds.  See below for details.</li>
-          <li>cd to "trunk".</li>
+          <li>Check out the desired release from https://svn.apache.org/repos/asf/incubator/lcf/tags,
or unpack the desired source distribution.</li>
+          <li>cd to the top-level directory.</li>
+          <li>EITHER: overlay the lib directory from the corresponding lib distribution
(preferred), OR run "ant make-core-deps" to build the code dependencies.</li>
+          <li>Run "ant make-deps", to download LGPL and other open source but non-Apache
compatible libraries.</li>
+          <li>Install desired dependent proprietary libraries, wsdls, and xsds.  See
below for details.</li>
           <li>Run "ant build".</li>
         </ol>
         <p></p>
-        <p>If you supply <strong>no</strong> LGPL or proprietary libraries,
the framework itself and only the following repository connectors will be built:</p>
+        <p>If you do not run the ant "make-deps" target, and you supply <strong>no</strong>
LGPL or proprietary libraries, the framework itself and only the following repository connectors
will be built:</p>
         <p></p>
         <ul>
           <li>CMIS connector</li>
@@ -53,6 +55,7 @@
           <li>JDBC connector, with just the PostgreSQL jdbc driver</li>
           <li>RSS connector</li>
           <li>Webcrawler connector</li>
+          <li>Wiki connector</li>
         </ul>
         <p></p>
         <p>In addition, the following authority connectors will be built:</p>



Mime
View raw message