manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1215097 - in /incubator/lcf/branches/release-0.4-incubating-branch: ./ CHANGES.txt build.xml
Date Fri, 16 Dec 2011 11:39:09 GMT
Author: kwright
Date: Fri Dec 16 11:39:08 2011
New Revision: 1215097

URL: http://svn.apache.org/viewvc?rev=1215097&view=rev
Log:
Pull up fix for CONNECTORS-326.

Modified:
    incubator/lcf/branches/release-0.4-incubating-branch/   (props changed)
    incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt
    incubator/lcf/branches/release-0.4-incubating-branch/build.xml

Propchange: incubator/lcf/branches/release-0.4-incubating-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 16 11:39:08 2011
@@ -14,4 +14,4 @@
 /incubator/lcf/branches/CONNECTORS-290:1204836-1205502
 /incubator/lcf/branches/CONNECTORS-313:1213173-1214848
 /incubator/lcf/branches/CONNECTORS-32:1092556-1094216
-/incubator/lcf/trunk:1214045,1214707,1214850,1214893,1215025,1215091
+/incubator/lcf/trunk:1214045,1214707,1214850,1214893,1215025,1215091,1215096

Modified: incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt?rev=1215097&r1=1215096&r2=1215097&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/CHANGES.txt Fri Dec 16 11:39:08 2011
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.4-dev =====================
 
+CONNECTORS-326: Fix the ant image build target to not use build-dev.
+(Karl Wright)
+
 CONNECTORS-315: Include the latest distributed versions of the plugin
 jars.
 (Karl Wright)

Modified: incubator/lcf/branches/release-0.4-incubating-branch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/release-0.4-incubating-branch/build.xml?rev=1215097&r1=1215096&r2=1215097&view=diff
==============================================================================
--- incubator/lcf/branches/release-0.4-incubating-branch/build.xml (original)
+++ incubator/lcf/branches/release-0.4-incubating-branch/build.xml Fri Dec 16 11:39:08 2011
@@ -3530,7 +3530,7 @@
       </tar>
     </target>
 
-    <target name="create-bin-zip" depends="build,doc,javadoc,set-version">
+    <target name="create-bin-zip" depends="build-dev,doc,javadoc,set-version">
       <zip destfile="apache-manifoldcf-${release-version}-bin.zip" update="false">
         <zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
           <exclude name="/connectors/*/lib/"/>
@@ -3546,7 +3546,7 @@
       </zip>
     </target>
     
-    <target name="create-bin-tar" depends="build,doc,javadoc,set-version">
+    <target name="create-bin-tar" depends="build-dev,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/"/>
@@ -3580,7 +3580,7 @@
 
     <target name="load" depends="load-dr,load-hs"/>
 
-    <target name="all" depends="build,javadoc,doc,image,test-dr,test-pg,test-hs"/>
+    <target name="all" depends="build-dev,javadoc,doc,image,test-dr,test-pg,test-hs"/>
 
     <target name="help">
       <echo level="info">



Mime
View raw message