ZOOKEEPER-1190. ant package is not including many of the bin scripts in the package (zkServer.sh for example) (Eric Yang via phunt). Part 2.

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1180217 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -676,6 +676,7 @@
             distribution directory so contribs know where to install to.-->
         <property name="version" value="${version}"/>
         <property name="dist.dir" value="${dist.dir}"/>
+        <property name="package.share" value=""/>
         <fileset file="${contrib.dir}/build.xml"/>
         <fileset file="${recipes.dir}/build.xml"/>
       </subant>  	
@@ -790,6 +791,7 @@
             distribution directory so contribs know where to install to.-->
         <property name="version" value="${version}"/>
         <property name="dist.dir" value="${dist.dir}"/>
+        <property name="package.share" value="/share/zookeeper"/>
         <fileset file="${contrib.dir}/build.xml"/>
         <fileset file="${recipes.dir}/build.xml"/>
       </subant>  	

src/contrib/build-contrib.xml

@@ -144,8 +144,8 @@
   <target name="package" depends="jar" unless="skip.contrib"> 
     <echo message="contrib: ${name}"/>
 
-    <mkdir dir="${dist.dir}/contrib/${name}"/>
-    <copy todir="${dist.dir}/contrib/${name}" includeEmptyDirs="false"
+    <mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
+    <copy todir="${dist.dir}${package.share}/contrib/${name}" includeEmptyDirs="false"
           flatten="true">
       <fileset dir="${build.dir}">
         <include name="zookeeper-${version}-${name}.jar" />

src/recipes/build-recipes.xml

@@ -122,8 +122,8 @@
   <target name="package" depends="jar" unless="skip.recipes"> 
     <echo message="recipes: ${name}"/>
 
-    <mkdir dir="${dist.dir}/share/zookeeper/recipes/${name}"/>
-    <copy todir="${dist.dir}/share/zookeeper/recipes/${name}" includeEmptyDirs="false"
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}" includeEmptyDirs="false"
           flatten="true">
       <fileset dir="${build.dir}">
         <include name="zookeeper-${version}-${name}.jar" />

src/recipes/lock/build.xml

@@ -112,14 +112,14 @@
   <target name="package" depends="jar, zookeeperbuildrecipes.package"
           unless="skip.recipes">
 
-    <copy file="${basedir}/build.xml" todir="${dist.dir}/share/zookeeper/recipes/${name}"/>
+    <copy file="${basedir}/build.xml" todir="${dist.dir}${package.share}/recipes/${name}"/>
 
-    <mkdir dir="${dist.dir}/share/zookeeper/recipes/${name}/test"/>
-    <copy todir="${dist.dir}/share/zookeeper/recipes/${name}/test">
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/test"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/test">
       <fileset dir="${basedir}/test"/>
     </copy>
-    <mkdir dir="${dist.dir}/share/zookeeper/recipes/${name}/src"/>
-    <copy todir="${dist.dir}/share/zookeeper/recipes/${name}/src">
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/src">
       <fileset dir="${basedir}/src"/>
     </copy>
   </target>

src/recipes/queue/build.xml

@@ -112,14 +112,14 @@
   <target name="package" depends="jar, zookeeperbuildrecipes.package"
           unless="skip.recipes">
 
-    <copy file="${basedir}/build.xml" todir="${dist.dir}/share/zookeeper/recipes/${name}"/>
+    <copy file="${basedir}/build.xml" todir="${dist.dir}${package.share}/recipes/${name}"/>
 
-    <mkdir dir="${dist.dir}/share/zookeeper/recipes/${name}/test"/>
-    <copy todir="${dist.dir}/share/zookeeper/recipes/${name}/test">
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/test"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/test">
       <fileset dir="${basedir}/test"/>
     </copy>
-    <mkdir dir="${dist.dir}/share/zookeeper/recipes/${name}/src"/>
-    <copy todir="${dist.dir}/share/zookeeper/recipes/${name}/src">
+    <mkdir dir="${dist.dir}${package.share}/recipes/${name}/src"/>
+    <copy todir="${dist.dir}${package.share}/recipes/${name}/src">
       <fileset dir="${basedir}/src"/>
     </copy>
   </target>