ZOOKEEPER-3275. Fixed path of contrib and docs project

anmolnar · Feb 12, 2019 · 5abf3b4 · 5abf3b4
1 parent 4e97ae8
commit 5abf3b4
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 36 deletions.
diff --git a/build.xml b/build.xml
@@ -794,9 +794,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       <mkdir dir="${dist.dir}"/>
       <mkdir dir="${dist.dir}/lib"/>
       <mkdir dir="${dist.dir}/bin"/>
-      <mkdir dir="${dist.dir}/docs"/>
-      <mkdir dir="${dist.dir}/docs/jdiff"/>
-      <mkdir dir="${dist.dir}/docs/api"/>
 
       <copy todir="${dist.dir}/lib" includeEmptyDirs="false">
         <fileset dir="${lib.dir}">
@@ -909,9 +906,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       <mkdir dir="${dist.dir}/share/zookeeper/contrib"/>
       <mkdir dir="${dist.dir}/share/zookeeper/recipes"/>
       <mkdir dir="${dist.dir}/bin"/>
-      <mkdir dir="${dist.dir}/docs"/>
-      <mkdir dir="${dist.dir}/docs/jdiff"/>
-      <mkdir dir="${dist.dir}/docs/api"/>
       <mkdir dir="${dist.dir}/share/zookeeper/templates/conf"/>
       <mkdir dir="${dist.dir}/sbin"/>
 

diff --git a/zookeeper-contrib/build-contrib.xml b/zookeeper-contrib/build-contrib.xml
@@ -32,7 +32,7 @@
 
   <property name="lib.dir"  location="${zk.root}/zookeeper-server/src/main/resources/lib"/>
 
-  <property name="build.dir" location="${zk.root}/build/contrib/${name}"/>
+  <property name="build.dir" location="${zk.root}/build/zookeeper-contrib/zookeeper-contrib-${name}"/>
   <property name="build.classes" location="${build.dir}/classes"/>
   <property name="build.test" location="${build.dir}/test"/>
 
@@ -144,8 +144,8 @@
   <target name="package" depends="jar" unless="skip.contrib"> 
     <echo message="contrib: ${name}"/>
 
-    <mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
-    <copy todir="${dist.dir}${package.share}/contrib/${name}" includeEmptyDirs="false"
+    <mkdir dir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+    <copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}" includeEmptyDirs="false"
           flatten="true">
       <fileset dir="${build.dir}">
         <include name="zookeeper-${version}-${name}.jar" />

diff --git a/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml b/zookeeper-contrib/zookeeper-contrib-fatjar/build.xml
@@ -54,15 +54,15 @@
   <target name="package" depends="jar, zookeeperbuildcontrib.package"
           unless="skip.contrib">
 
-    <copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
+    <copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
 
-    <mkdir dir="${dist.dir}/contrib/${name}/conf"/>
-    <copy todir="${dist.dir}/contrib/${name}/conf">
+    <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/conf"/>
+    <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/conf">
       <fileset dir="${basedir}/src/main/resources"/>
     </copy>
 
-    <mkdir dir="${dist.dir}/contrib/${name}/src"/>
-    <copy todir="${dist.dir}/contrib/${name}/src">
+    <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src"/>
+    <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
       <fileset dir="${basedir}/src"/>
     </copy>
   </target>

diff --git a/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml b/zookeeper-contrib/zookeeper-contrib-loggraph/build.xml
@@ -58,10 +58,10 @@
   <target name="package" depends="compile, zookeeperbuildcontrib.package" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
 
-    <copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
+    <copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
 
-    <mkdir dir="${dist.dir}/contrib/${name}/src"/>
-    <copy todir="${dist.dir}/contrib/${name}/src">
+    <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src"/>
+    <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
       <fileset dir="${basedir}/src/main"/>
     </copy>
 

diff --git a/zookeeper-contrib/zookeeper-contrib-rest/build.xml b/zookeeper-contrib/zookeeper-contrib-rest/build.xml
@@ -50,16 +50,16 @@
 
   <target name="package" depends="jar" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
-    <mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
-    <copy todir="${dist.dir}${package.share}/contrib/${name}">
+    <mkdir dir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+    <copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}">
       <fileset dir="${build.dir}">
         <include name="zookeeper-${version}-${name}.jar" />
       </fileset>
     </copy>
-    <copy todir="${dist.dir}${package.share}/contrib/${name}/lib">
+    <copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}/lib">
       <fileset dir="${build.dir}/lib" />
     </copy>
-    <copy todir="${dist.dir}${package.share}/contrib/${name}/conf">
+    <copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}/conf">
       <fileset dir="conf" />
     </copy>
   </target>

diff --git a/zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml b/zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml
@@ -52,8 +52,8 @@
   <target name="package" depends="compile" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
 
-    <mkdir dir="${dist.dir}/contrib/${name}"/>
-    <copy todir="${dist.dir}/contrib/${name}">
+    <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+    <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
       <fileset dir="${build.dir}"/>
     </copy>
   </target>

diff --git a/zookeeper-contrib/zookeeper-contrib-zkperl/build.xml b/zookeeper-contrib/zookeeper-contrib-zkperl/build.xml
@@ -52,8 +52,8 @@
   <target name="package" depends="compile" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
 
-    <mkdir dir="${dist.dir}/contrib/${name}"/>
-    <copy todir="${dist.dir}/contrib/${name}">
+    <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+    <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
       <fileset dir="${build.dir}"/>
     </copy>
   </target>

diff --git a/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml b/zookeeper-contrib/zookeeper-contrib-zkpython/build.xml
@@ -87,8 +87,8 @@
         <arg line="${version}" />
       </exec>
 
-      <mkdir dir="${dist.dir}/contrib/${name}"/>
-      <copy todir="${dist.dir}/contrib/${name}">
+      <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+      <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
         <fileset dir="${build.dir}">
           <exclude name="**/temp*"/>
         </fileset>

diff --git a/zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml b/zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml
@@ -52,8 +52,8 @@
   <target name="package" depends="compile" unless="skip.contrib">
     <echo message="contrib: ${name}"/>
 
-    <mkdir dir="${dist.dir}/contrib/${name}"/>
-    <copy todir="${dist.dir}/contrib/${name}">
+    <mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
+    <copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
       <fileset dir="${build.dir}"/>
     </copy>
   </target>

diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
@@ -127,18 +127,18 @@
 
 	<target name="package" depends="jar, zookeeperbuildcontrib.package" unless="skip.contrib">
 
-		<copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}" />
+		<copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}" />
 
-		<mkdir dir="${dist.dir}/contrib/${name}/src" />
-		<copy todir="${dist.dir}/contrib/${name}/src">
+		<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src" />
+		<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
 			<fileset dir="${basedir}/src" />
 		</copy>
-		<mkdir dir="${dist.dir}/contrib/${name}/licences" />
-		<copy todir="${dist.dir}/contrib/${name}/licences">
+		<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/licences" />
+		<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/licences">
 			<fileset dir="${basedir}/licences" />
 		</copy>
-		<mkdir dir="${dist.dir}/contrib/${name}/config" />
-		<copy todir="${dist.dir}/contrib/${name}/config">
+		<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/config" />
+		<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/config">
 			<fileset dir="${basedir}/src/main/resources">
 				<include name="defaultConnectionSettings.cfg" />
 				<include name="defaultNodeViewers.cfg" />