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/02/12 21:21:40 UTC

svn commit: r1243314 - in /incubator/lcf/trunk: CHANGES.txt build.xml framework/build.xml

Author: kwright
Date: Sun Feb 12 20:21:39 2012
New Revision: 1243314

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

Modified:
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/framework/build.xml

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1243314&r1=1243313&r2=1243314&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Sun Feb 12 20:21:39 2012
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-407: Set the executable bit in the distribution directory
+for .sh files during ant build.
+(Karl Wright)
+
 CONNECTORS-405: Do not include sources in binary distribution.  This
 is no longer essential since we deliver built jars for all the connectors
 now.

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1243314&r1=1243313&r2=1243314&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Sun Feb 12 20:21:39 2012
@@ -966,6 +966,11 @@
         <copy todir="dist/connector-lib-proprietary">
             <fileset dir="framework/dist/connector-lib-proprietary"/>
         </copy>
+        <chmod dir="dist/script-engine" perm="a+x" includes="**/*.sh"/>
+        <chmod dir="dist/example" perm="a+x" includes="**/*.sh"/>
+        <chmod dir="dist/example-proprietary" perm="a+x" includes="**/*.sh"/>
+        <chmod dir="dist/multiprocess-example" perm="a+x" includes="**/*.sh"/>
+        <chmod dir="dist/multiprocess-example-proprietary" perm="a+x" includes="**/*.sh"/>
     </target>
     
     <target name="deliver-framework-doc" depends="doc-framework">

Modified: incubator/lcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/framework/build.xml?rev=1243314&r1=1243313&r2=1243314&view=diff
==============================================================================
--- incubator/lcf/trunk/framework/build.xml (original)
+++ incubator/lcf/trunk/framework/build.xml Sun Feb 12 20:21:39 2012
@@ -690,6 +690,7 @@
             </fileset>
         </copy>
         <mkdir dir="dist/multiprocess-example/logs"/>
+        <chmod dir="dist/multiprocess-example" perm="a+x" includes="**/*.sh"/>
     </target>
   
       <target name="multi-process-example-proprietary" depends="jar-core,jar-agents,jar-pull-agent,jar-jetty-runner,multi-processes-proprietary">
@@ -730,6 +731,7 @@
             </fileset>
         </copy>
         <mkdir dir="dist/multiprocess-example-proprietary/logs"/>
+        <chmod dir="dist/multiprocess-example-proprietary" perm="a+x" includes="**/*.sh"/>
     </target>
 
     <target name="script-engine" depends="jar-script-engine,jar-core">
@@ -757,6 +759,7 @@
         <copy todir="dist/script-engine">
             <fileset dir="script-example"/>
         </copy>
+        <chmod dir="dist/script-engine" perm="a+x" includes="**/*.sh"/>
     </target>
     
     <target name="single-process-example" depends="jar-jetty-runner,jar-core,jar-agents,jar-pull-agent">
@@ -874,6 +877,7 @@
             <attribute name="Class-Path" value="${manifest-cp}"/>
         </manifest>
         <jar destfile="dist/example/start.jar" manifest="build/example/manifest"/>
+        <chmod dir="dist/example" perm="a+x" includes="**/*.sh"/>
 
     </target>
 
@@ -1000,7 +1004,7 @@
             <attribute name="Class-Path" value="${manifest-cp-proprietary}"/>
         </manifest>
         <jar destfile="dist/example-proprietary/start.jar" manifest="build/example-proprietary/manifest"/>
-
+        <chmod dir="dist/example-proprietary" perm="a+x" includes="**/*.sh"/>
     </target>
 
     <target name="compile-core-tests" depends="compile-core">