Skip to content

Commit f3f7c79

Browse files
anmolnaranmolnar
committed
ZOOKEEPER-3275: Fix release targets: package, tar, mvn-deploy
Fixed recipes and contrib path names for package and tar targets. Author: Andor Molnar <[email protected]> Reviewers: [email protected] Closes apache#817 from anmolnar/ZOOKEEPER-3275 and squashes the following commits: 64db892 [Andor Molnar] ZOOKEEPER-3275. Fixed bin-package target e8ad3d4 [Andor Molnar] ZOOKEEPER-3275. Added pom.xml to tar file, fixed mvn-deploy task 6667c2f [Andor Molnar] ZOOKEEPER-3275. Updated release audit warnings exlcudes 5abf3b4 [Andor Molnar] ZOOKEEPER-3275. Fixed path of contrib and docs project 4e97ae8 [Andor Molnar] ZOOKEEPER-3275. Fixed recipes folders in ant package target
1 parent bc5083f commit f3f7c79

File tree

14 files changed

+106
-106
lines changed

14 files changed

+106
-106
lines changed

‎build.xml

+55-55
Original file line numberDiff line numberDiff line change
@@ -793,12 +793,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
793793
description="Build distribution">
794794
<mkdir dir="${dist.dir}"/>
795795
<mkdir dir="${dist.dir}/lib"/>
796-
<mkdir dir="${dist.dir}/contrib"/>
797-
<mkdir dir="${dist.dir}/recipes"/>
798796
<mkdir dir="${dist.dir}/bin"/>
799-
<mkdir dir="${dist.dir}/docs"/>
800-
<mkdir dir="${dist.dir}/docs/jdiff"/>
801-
<mkdir dir="${dist.dir}/docs/api"/>
802797

803798
<copy todir="${dist.dir}/lib" includeEmptyDirs="false">
804799
<fileset dir="${lib.dir}">
@@ -862,7 +857,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
862857
<fileset dir="${conf.dir}" excludes="**/*.template"/>
863858
</copy>
864859

865-
<copy todir="${dist.dir}/docs">
860+
<copy todir="${dist.dir}/zookeeper-docs">
866861
<fileset dir="zookeeper-docs/src/main/resources/markdown/" includes="**">
867862
<exclude name="html/**" />
868863
</fileset>
@@ -878,23 +873,25 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
878873
<fileset file="ivysettings.xml"/>
879874
<fileset file="${java.server.resources.dir}/NOTICE.txt"/>
880875
<fileset file="${java.server.resources.dir}/LICENSE.txt"/>
876+
<fileset file="pom.xml"/>
881877
</copy>
882878

883-
<copy todir="${dist.dir}/src" includeEmptyDirs="true">
879+
<copy todir="${dist.dir}" includeEmptyDirs="true">
884880
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
885881
<include name="zookeeper-recipes/**"/>
886882
<include name="zookeeper-docs/**"/>
887883
<include name="zookeeper-contrib/**"/>
888884
<include name="zookeeper-client/**"/>
889885
<include name="zookeeper-jute/**"/>
890886
<include name="zookeeper-server/**"/>
887+
<include name="zookeeper-it/**"/>
891888
</fileset>
892889
<fileset file="${java.server.resources.dir}/pom.template"/>
893890
</copy>
894891

895892
<chmod perm="ugo+x" type="file" parallel="false">
896893
<fileset dir="${dist.dir}/bin"/>
897-
<fileset dir="${dist.dir}/src/zookeeper-contrib/">
894+
<fileset dir="${dist.dir}/zookeeper-contrib/">
898895
<include name="*/bin/*" />
899896
</fileset>
900897
</chmod>
@@ -910,9 +907,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
910907
<mkdir dir="${dist.dir}/share/zookeeper/contrib"/>
911908
<mkdir dir="${dist.dir}/share/zookeeper/recipes"/>
912909
<mkdir dir="${dist.dir}/bin"/>
913-
<mkdir dir="${dist.dir}/docs"/>
914-
<mkdir dir="${dist.dir}/docs/jdiff"/>
915-
<mkdir dir="${dist.dir}/docs/api"/>
916910
<mkdir dir="${dist.dir}/share/zookeeper/templates/conf"/>
917911
<mkdir dir="${dist.dir}/sbin"/>
918912

@@ -1006,15 +1000,23 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
10061000
<fileset file="${java.server.resources.dir}/LICENSE.txt"/>
10071001
</copy>
10081002

1009-
<copy todir="${dist.dir}/src" includeEmptyDirs="true">
1010-
<fileset dir="src" excludes="**/*.template **/docs/build/**/* **/ivy*.jar"/>
1003+
<copy todir="${dist.dir}" includeEmptyDirs="true">
1004+
<fileset dir="${basedir}" excludes="**/*.template **/docs/build/**/* **/ivy*.jar">
1005+
<include name="zookeeper-recipes/**"/>
1006+
<include name="zookeeper-docs/**"/>
1007+
<include name="zookeeper-contrib/**"/>
1008+
<include name="zookeeper-client/**"/>
1009+
<include name="zookeeper-jute/**"/>
1010+
<include name="zookeeper-server/**"/>
1011+
<include name="zookeeper-it/**"/>
1012+
</fileset>
10111013
<fileset file="${java.server.resources.dir}/pom.template"/>
10121014
</copy>
1013-
1015+
10141016
<chmod perm="ugo+x" type="file" parallel="false">
10151017
<fileset dir="${dist.dir}/bin"/>
10161018
<fileset dir="${dist.dir}/sbin"/>
1017-
<fileset dir="${dist.dir}/contrib/">
1019+
<fileset dir="${dist.dir}/zookeeper-contrib/">
10181020
<include name="**/*.sh" />
10191021
<include name="**/*.py" />
10201022
</fileset>
@@ -1031,7 +1033,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
10311033
however that's the only way ant currently supports afaik -->
10321034
<tarfileset dir="${build.dir}" mode="664">
10331035
<exclude name="${final.name}/bin/*" />
1034-
<exclude name="${final.name}/contrib/*/bin/*" />
1036+
<exclude name="${final.name}/zookeeper-contrib/*/bin/*" />
10351037

10361038
<exclude name="${final.name}/**/compile" />
10371039
<exclude name="${final.name}/**/config.guess" />
@@ -1049,7 +1051,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
10491051
<tarfileset dir="${build.dir}" mode="755">
10501052
<!-- be sure to add to exclude list above if you add here -->
10511053
<include name="${final.name}/bin/*" />
1052-
<include name="${final.name}/contrib/*/bin/*" />
1054+
<include name="${final.name}/zookeeper-contrib/*/bin/*" />
10531055

10541056
<!-- autotools related commands -->
10551057
<include name="${final.name}/**/compile" />
@@ -1747,48 +1749,46 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
17471749
<exclude name="**/VERSION"/>
17481750
<exclude name="**/ChangeLog"/>
17491751
<exclude name="**/Changes"/>
1750-
<exclude name="**/contrib/zkperl/MANIFEST"/>
17511752
<exclude name="**/zookeeper-contrib/zookeeper-contrib-zkperl/MANIFEST"/>
17521753
<exclude name="**/conf/*"/>
1753-
<exclude name="**/docs/"/>
17541754
<exclude name="**/zookeeper-docs/"/>
17551755
<exclude name="**/lib/jdiff/"/>
1756-
<exclude name="contrib/ZooInspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
1757-
<exclude name="src/zookeeper-client/zookeeper-client-c/*.la"/>
1758-
<exclude name="src/zookeeper-client/zookeeper-client-c/*.lo"/>
1759-
<exclude name="src/zookeeper-client/zookeeper-client-c/.libs/"/>
1760-
<exclude name="src/zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
1761-
<exclude name="src/zookeeper-client/zookeeper-client-c/config**"/>
1762-
<exclude name="src/zookeeper-client/zookeeper-client-c/include/winstdint.h"/>
1763-
<exclude name="src/zookeeper-client/zookeeper-client-c/src/hashtable/"/>
1764-
<exclude name="src/zookeeper-client/zookeeper-client-c/test-driver"/>
1765-
<exclude name="src/zookeeper-client/zookeeper-client-c/tests/quorum.cfg"/>
1766-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
1767-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
1768-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
1769-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
1770-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
1771-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
1772-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
1773-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
1774-
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
1775-
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
1776-
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
1777-
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
1778-
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
1779-
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
1780-
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
1781-
<exclude name="contrib/loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
1782-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES"/>
1783-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
1784-
<exclude name="src/zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses"/>
1785-
<exclude name="src/zookeeper-jute/target/main/java/.generated/"/>
1786-
<exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xml"/>
1787-
<exclude name="src/zookeeper-server/src/test/resources/checkstyle*.xsl"/>
1788-
<exclude name="src/zookeeper-server/src/test/resources/findbugs*.xml"/>
1789-
<exclude name="src/**/*.vcproj"/>
1790-
<exclude name="src/**/*.vcxproj*"/>
1791-
<exclude name="src/**/*.sln"/>
1756+
<exclude name="zookeeper-contrib/zookeeper-contrib-ZooInspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
1757+
<exclude name="zookeeper-client/zookeeper-client-c/*.la"/>
1758+
<exclude name="zookeeper-client/zookeeper-client-c/*.lo"/>
1759+
<exclude name="zookeeper-client/zookeeper-client-c/.libs/"/>
1760+
<exclude name="zookeeper-client/zookeeper-client-c/autom4te.cache/**"/>
1761+
<exclude name="zookeeper-client/zookeeper-client-c/config**"/>
1762+
<exclude name="zookeeper-client/zookeeper-client-c/include/winstdint.h"/>
1763+
<exclude name="zookeeper-client/zookeeper-client-c/src/hashtable/"/>
1764+
<exclude name="zookeeper-client/zookeeper-client-c/test-driver"/>
1765+
<exclude name="zookeeper-client/zookeeper-client-c/tests/quorum.cfg"/>
1766+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
1767+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
1768+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
1769+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
1770+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
1771+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
1772+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
1773+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/main/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
1774+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/date.format.js"/>
1775+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.bar.js"/>
1776+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.dot.js"/>
1777+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.line.js"/>
1778+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.pie.js"/>
1779+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/g.raphael.js"/>
1780+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/raphael.js"/>
1781+
<exclude name="zookeeper-contrib/zookeeper-contrib-loggraph/src/resources/webapp/org/apache/zookeeper/graph/resources/yui-min.js"/>
1782+
<exclude name="zookeeper-contrib/zookeeper-contrib-monitoring/JMX-RESOURCES"/>
1783+
<exclude name="zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java"/>
1784+
<exclude name="zookeeper-contrib/zookeeper-contrib-fatjar/src/main/resources/mainClasses"/>
1785+
<exclude name="zookeeper-jute/target/main/java/.generated/"/>
1786+
<exclude name="zookeeper-server/src/test/resources/checkstyle*.xml"/>
1787+
<exclude name="zookeeper-server/src/test/resources/checkstyle*.xsl"/>
1788+
<exclude name="zookeeper-server/src/test/resources/findbugs*.xml"/>
1789+
<exclude name="**/*.vcproj"/>
1790+
<exclude name="**/*.vcxproj*"/>
1791+
<exclude name="**/*.sln"/>
17921792
</fileset>
17931793
</rat:report>
17941794
</target>

‎zookeeper-contrib/build-contrib.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<property name="lib.dir" location="${zk.root}/zookeeper-server/src/main/resources/lib"/>
3434

35-
<property name="build.dir" location="${zk.root}/build/contrib/${name}"/>
35+
<property name="build.dir" location="${zk.root}/build/zookeeper-contrib/zookeeper-contrib-${name}"/>
3636
<property name="build.classes" location="${build.dir}/classes"/>
3737
<property name="build.test" location="${build.dir}/test"/>
3838

@@ -144,8 +144,8 @@
144144
<target name="package" depends="jar" unless="skip.contrib">
145145
<echo message="contrib: ${name}"/>
146146

147-
<mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
148-
<copy todir="${dist.dir}${package.share}/contrib/${name}" includeEmptyDirs="false"
147+
<mkdir dir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"/>
148+
<copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}" includeEmptyDirs="false"
149149
flatten="true">
150150
<fileset dir="${build.dir}">
151151
<include name="zookeeper-${version}-${name}.jar" />

‎zookeeper-contrib/zookeeper-contrib-fatjar/build.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@
5454
<target name="package" depends="jar, zookeeperbuildcontrib.package"
5555
unless="skip.contrib">
5656

57-
<copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
57+
<copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
5858

59-
<mkdir dir="${dist.dir}/contrib/${name}/conf"/>
60-
<copy todir="${dist.dir}/contrib/${name}/conf">
59+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/conf"/>
60+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/conf">
6161
<fileset dir="${basedir}/src/main/resources"/>
6262
</copy>
6363

64-
<mkdir dir="${dist.dir}/contrib/${name}/src"/>
65-
<copy todir="${dist.dir}/contrib/${name}/src">
64+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src"/>
65+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
6666
<fileset dir="${basedir}/src"/>
6767
</copy>
6868
</target>

‎zookeeper-contrib/zookeeper-contrib-loggraph/build.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
<target name="package" depends="compile, zookeeperbuildcontrib.package" unless="skip.contrib">
5959
<echo message="contrib: ${name}"/>
6060

61-
<copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}"/>
61+
<copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
6262

63-
<mkdir dir="${dist.dir}/contrib/${name}/src"/>
64-
<copy todir="${dist.dir}/contrib/${name}/src">
63+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src"/>
64+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
6565
<fileset dir="${basedir}/src/main"/>
6666
</copy>
6767

‎zookeeper-contrib/zookeeper-contrib-rest/build.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@
5050

5151
<target name="package" depends="jar" unless="skip.contrib">
5252
<echo message="contrib: ${name}"/>
53-
<mkdir dir="${dist.dir}${package.share}/contrib/${name}"/>
54-
<copy todir="${dist.dir}${package.share}/contrib/${name}">
53+
<mkdir dir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}"/>
54+
<copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}">
5555
<fileset dir="${build.dir}">
5656
<include name="zookeeper-${version}-${name}.jar" />
5757
</fileset>
5858
</copy>
59-
<copy todir="${dist.dir}${package.share}/contrib/${name}/lib">
59+
<copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}/lib">
6060
<fileset dir="${build.dir}/lib" />
6161
</copy>
62-
<copy todir="${dist.dir}${package.share}/contrib/${name}/conf">
62+
<copy todir="${dist.dir}${package.share}/zookeeper-contrib/zookeeper-contrib-${name}/conf">
6363
<fileset dir="conf" />
6464
</copy>
6565
</target>

‎zookeeper-contrib/zookeeper-contrib-zkfuse/build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<target name="package" depends="compile" unless="skip.contrib">
5353
<echo message="contrib: ${name}"/>
5454

55-
<mkdir dir="${dist.dir}/contrib/${name}"/>
56-
<copy todir="${dist.dir}/contrib/${name}">
55+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
56+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
5757
<fileset dir="${build.dir}"/>
5858
</copy>
5959
</target>

‎zookeeper-contrib/zookeeper-contrib-zkperl/build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<target name="package" depends="compile" unless="skip.contrib">
5353
<echo message="contrib: ${name}"/>
5454

55-
<mkdir dir="${dist.dir}/contrib/${name}"/>
56-
<copy todir="${dist.dir}/contrib/${name}">
55+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
56+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
5757
<fileset dir="${build.dir}"/>
5858
</copy>
5959
</target>

‎zookeeper-contrib/zookeeper-contrib-zkpython/build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
<arg line="${version}" />
8888
</exec>
8989

90-
<mkdir dir="${dist.dir}/contrib/${name}"/>
91-
<copy todir="${dist.dir}/contrib/${name}">
90+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
91+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
9292
<fileset dir="${build.dir}">
9393
<exclude name="**/temp*"/>
9494
</fileset>

‎zookeeper-contrib/zookeeper-contrib-zktreeutil/build.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<target name="package" depends="compile" unless="skip.contrib">
5353
<echo message="contrib: ${name}"/>
5454

55-
<mkdir dir="${dist.dir}/contrib/${name}"/>
56-
<copy todir="${dist.dir}/contrib/${name}">
55+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}"/>
56+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}">
5757
<fileset dir="${build.dir}"/>
5858
</copy>
5959
</target>

‎zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,18 @@
127127

128128
<target name="package" depends="jar, zookeeperbuildcontrib.package" unless="skip.contrib">
129129

130-
<copy file="${basedir}/build.xml" todir="${dist.dir}/contrib/${name}" />
130+
<copy file="${basedir}/build.xml" todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}" />
131131

132-
<mkdir dir="${dist.dir}/contrib/${name}/src" />
133-
<copy todir="${dist.dir}/contrib/${name}/src">
132+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src" />
133+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/src">
134134
<fileset dir="${basedir}/src" />
135135
</copy>
136-
<mkdir dir="${dist.dir}/contrib/${name}/licences" />
137-
<copy todir="${dist.dir}/contrib/${name}/licences">
136+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/licences" />
137+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/licences">
138138
<fileset dir="${basedir}/licences" />
139139
</copy>
140-
<mkdir dir="${dist.dir}/contrib/${name}/config" />
141-
<copy todir="${dist.dir}/contrib/${name}/config">
140+
<mkdir dir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/config" />
141+
<copy todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/config">
142142
<fileset dir="${basedir}/src/main/resources">
143143
<include name="defaultConnectionSettings.cfg" />
144144
<include name="defaultNodeViewers.cfg" />

0 commit comments

Comments
 (0)