|
@@ -171,17 +171,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
|
<property name="cppunit.lib" value="/usr/lib"/>
|
|
|
<property name="cppunit.m4" value="/usr/share/aclocal"/>
|
|
|
|
|
|
- <!-- packaging property set -->
|
|
|
- <property name="package.release" value="1"/>
|
|
|
- <property name="package.prefix" value="/usr"/>
|
|
|
- <property name="package.conf.dir" value="/etc/zookeeper"/>
|
|
|
- <property name="package.log.dir" value="/var/log/zookeeper"/>
|
|
|
- <property name="package.pid.dir" value="/var/run/zookeeper"/>
|
|
|
- <property name="package.var.dir" value="/var/lib/zookeeper"/>
|
|
|
- <property name="package.share.dir" value="/share/zookeeper"/>
|
|
|
- <property name="package.buildroot" value="/tmp/zookeeper_package_build_${user.name}"/>
|
|
|
- <property name="package.build.dir" value="/tmp/zookeeper_package_build_${user.name}/BUILD"/>
|
|
|
-
|
|
|
<!-- artifact publishing property set -->
|
|
|
<property name="staging_repo_id" value="apache.staging.https"/>
|
|
|
<property name="wagon-http.version" value="2.4"/>
|
|
@@ -250,11 +239,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
|
</fileset>
|
|
|
<path refid="java.classpath"/>
|
|
|
</path>
|
|
|
- <path id="package.classpath">
|
|
|
- <fileset dir="${ivy.package.lib}">
|
|
|
- <include name="**/jdeb*.jar" />
|
|
|
- </fileset>
|
|
|
- </path>
|
|
|
|
|
|
<!-- ====================================================== -->
|
|
|
<!-- Generate and compile the Java files -->
|
|
@@ -836,12 +820,10 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
|
<copy todir="${dist.dir}/share/zookeeper" includeEmptyDirs="false">
|
|
|
<fileset dir="${lib.dir}">
|
|
|
<exclude name="**/ivy*.jar" />
|
|
|
- <exclude name="**/deb*.jar" />
|
|
|
</fileset>
|
|
|
<fileset dir="${ivy.lib}"/>
|
|
|
</copy>
|
|
|
|
|
|
- <copy file="${basedir}/src/packages/update-zookeeper-env.sh" tofile="${dist.dir}/sbin/update-zookeeper-env.sh"/>
|
|
|
<subant target="package">
|
|
|
<!--Pass down the version in case its needed again and the target
|
|
|
distribution directory so contribs know where to install to.-->
|
|
@@ -925,16 +907,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
|
<copy todir="${dist.dir}/src" includeEmptyDirs="true">
|
|
|
<fileset dir="src" excludes="**/*.template **/docs/build/**/* **/ivy*.jar"/>
|
|
|
</copy>
|
|
|
-
|
|
|
- <copy todir="${dist.dir}/${package.share.dir}/templates/conf">
|
|
|
- <fileset dir="src/packages/templates/conf"/>
|
|
|
- </copy>
|
|
|
-
|
|
|
- <copy file="${basedir}/conf/zoo_sample.cfg" tofile="${dist.dir}/${package.share.dir}/templates/conf/zoo.cfg" />
|
|
|
- <replace file="${dist.dir}/${package.share.dir}/templates/conf/zoo.cfg">
|
|
|
- <replacetoken>/tmp/zookeeper</replacetoken>
|
|
|
- <replacevalue>${VAR_DIR}/data</replacevalue>
|
|
|
- </replace>
|
|
|
|
|
|
<chmod perm="ugo+x" type="file" parallel="false">
|
|
|
<fileset dir="${dist.dir}/bin"/>
|
|
@@ -1030,151 +1002,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
|
</subant>
|
|
|
</target>
|
|
|
|
|
|
- <target name="rpm" depends="package-native, tar" description="Make rpm package">
|
|
|
- <!--The RPM spec file format disallows hyphen in the version. Replace with
|
|
|
- underscore to support version tags like -alpha or -SNAPSHOT.-->
|
|
|
- <loadresource property="rpm.version">
|
|
|
- <propertyresource name="version" />
|
|
|
- <filterchain>
|
|
|
- <tokenfilter>
|
|
|
- <replacestring from="-" to="_" />
|
|
|
- </tokenfilter>
|
|
|
- </filterchain>
|
|
|
- </loadresource>
|
|
|
- <subant target="rpm">
|
|
|
- <!--Pass down the version in case its needed again and the target
|
|
|
- distribution directory so contribs know where to install to.-->
|
|
|
- <property name="version" value="${version}"/>
|
|
|
- <property name="rpm.version" value="${rpm.version}"/>
|
|
|
- <property name="dist.dir" value="${dist.dir}"/>
|
|
|
- <fileset file="${contrib.dir}/build.xml"/>
|
|
|
- <fileset file="${recipes.dir}/build.xml"/>
|
|
|
- </subant>
|
|
|
- <path id="c.lib">
|
|
|
- <fileset dir="${build.dir}">
|
|
|
- <include name="${final.name}-lib.tar.gz"/>
|
|
|
- </fileset>
|
|
|
- </path>
|
|
|
- <property name="c.lib" refid="c.lib"/>
|
|
|
- <mkdir dir="${package.buildroot}/BUILD" />
|
|
|
- <mkdir dir="${package.buildroot}/RPMS" />
|
|
|
- <mkdir dir="${package.buildroot}/SRPMS" />
|
|
|
- <mkdir dir="${package.buildroot}/SOURCES" />
|
|
|
- <mkdir dir="${package.buildroot}/SPECS" />
|
|
|
- <copy todir="${package.buildroot}/SOURCES">
|
|
|
- <fileset dir="${build.dir}">
|
|
|
- <include name="${final.name}.tar.gz" />
|
|
|
- </fileset>
|
|
|
- <fileset file="${c.lib}" />
|
|
|
- </copy>
|
|
|
- <copy file="${src.dir}/packages/rpm/spec/zookeeper.spec" todir="${package.buildroot}/SPECS">
|
|
|
- <filterchain>
|
|
|
- <replacetokens>
|
|
|
- <token key="final.name" value="${final.name}" />
|
|
|
- <token key="version" value="${rpm.version}" />
|
|
|
- <token key="package.release" value="${package.release}" />
|
|
|
- <token key="package.build.dir" value="${package.build.dir}" />
|
|
|
- <token key="package.prefix" value="${package.prefix}" />
|
|
|
- <token key="package.conf.dir" value="${package.conf.dir}" />
|
|
|
- <token key="package.log.dir" value="${package.log.dir}" />
|
|
|
- <token key="package.pid.dir" value="${package.pid.dir}" />
|
|
|
- <token key="package.var.dir" value="${package.var.dir}" />
|
|
|
- <token key="c.lib" value="${c.lib}" />
|
|
|
- </replacetokens>
|
|
|
- </filterchain>
|
|
|
- </copy>
|
|
|
- <rpm specFile="zookeeper.spec" command="-ba --buildroot=${package.buildroot}/BUILD" topDir="${package.buildroot}" cleanBuildDir="true" failOnError="true"
|
|
|
-/>
|
|
|
- <copy todir="${build.dir}/" flatten="true">
|
|
|
- <fileset dir="${package.buildroot}/RPMS">
|
|
|
- <include name="**/${name}*.rpm" />
|
|
|
- </fileset>
|
|
|
- <fileset dir="${package.buildroot}/SRPMS">
|
|
|
- <include name="**/${name}*.rpm" />
|
|
|
- </fileset>
|
|
|
- </copy>
|
|
|
- <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
|
|
|
- </target>
|
|
|
-
|
|
|
- <target name="deb" depends="ivy-retrieve-package, package-native, tar" description="Make deb package">
|
|
|
- <subant target="deb">
|
|
|
- <!--Pass down the version in case its needed again and the target
|
|
|
- distribution directory so contribs know where to install to.-->
|
|
|
- <property name="version" value="${version}"/>
|
|
|
- <property name="dist.dir" value="${dist.dir}"/>
|
|
|
- <fileset file="${contrib.dir}/build.xml"/>
|
|
|
- <fileset file="${recipes.dir}/build.xml"/>
|
|
|
- </subant>
|
|
|
- <taskdef name="deb" classname="org.vafer.jdeb.ant.DebAntTask">
|
|
|
- <classpath refid="java.classpath"/>
|
|
|
- <classpath refid="package.classpath"/>
|
|
|
- </taskdef>
|
|
|
-
|
|
|
- <mkdir dir="${package.build.dir}/zookeeper.control" />
|
|
|
- <copy todir="${package.buildroot}/${package.prefix}">
|
|
|
- <fileset dir="${build.dir}/${final.name}">
|
|
|
- <include name="bin/**" />
|
|
|
- <include name="conf/**" />
|
|
|
- <include name="sbin/**" />
|
|
|
- <include name="share/**" />
|
|
|
- </fileset>
|
|
|
- </copy>
|
|
|
- <copy todir="${package.build.dir}/zookeeper.control">
|
|
|
- <fileset dir="${src.dir}/packages/deb/zookeeper.control">
|
|
|
- <exclude name="control" />
|
|
|
- </fileset>
|
|
|
- </copy>
|
|
|
- <copy file="${src.dir}/packages/deb/zookeeper.control/control" todir="${package.build.dir}/zookeeper.control">
|
|
|
- <filterchain>
|
|
|
- <replacetokens>
|
|
|
- <token key="final.name" value="${final.name}" />
|
|
|
- <token key="version" value="${version}" />
|
|
|
- <token key="package.release" value="${package.release}" />
|
|
|
- <token key="package.build.dir" value="${package.build.dir}" />
|
|
|
- <token key="package.prefix" value="${package.prefix}" />
|
|
|
- <token key="package.conf.dir" value="${package.conf.dir}" />
|
|
|
- <token key="package.log.dir" value="${package.log.dir}" />
|
|
|
- <token key="package.pid.dir" value="${package.pid.dir}" />
|
|
|
- <token key="package.var.dir" value="${package.var.dir}" />
|
|
|
- </replacetokens>
|
|
|
- </filterchain>
|
|
|
- </copy>
|
|
|
- <deb destfile="${package.buildroot}/${name}_${version}-${package.release}_${os.arch}.deb" control="${package.build.dir}/zookeeper.control">
|
|
|
- <tarfileset dir="${build.dir}/${final.name}/share/zookeeper" filemode="644" prefix="${package.prefix}/share/zookeeper">
|
|
|
- <include name="**" />
|
|
|
- </tarfileset>
|
|
|
- <tarfileset dir="${build.dir}/${final.name}/bin" filemode="755" prefix="${package.prefix}/bin">
|
|
|
- <include name="zkCli.sh" />
|
|
|
- </tarfileset>
|
|
|
- <tarfileset dir="${build.dir}/${final.name}/sbin" filemode="755" prefix="${package.prefix}/sbin">
|
|
|
- <include name="**.sh" />
|
|
|
- </tarfileset>
|
|
|
- <tarfileset dir="${build.dir}/${final.name}/libexec" filemode="755" prefix="${package.prefix}/libexec">
|
|
|
- <include name="zkEnv.sh" />
|
|
|
- </tarfileset>
|
|
|
- <tarfileset dir="${build.dir}/c/build/${package.prefix}/include" prefix="${package.prefix}/include">
|
|
|
- <include name="**" />
|
|
|
- </tarfileset>
|
|
|
- <tarfileset dir="${build.dir}/c/build/${package.prefix}/lib" filemode="755" prefix="${package.prefix}/lib">
|
|
|
- <include name="**" />
|
|
|
- </tarfileset>
|
|
|
- <tarfileset dir="${build.dir}/${final.name}/conf" filemode="644" prefix="${package.conf.dir}">
|
|
|
- <include name="**" />
|
|
|
- </tarfileset>
|
|
|
- <tarfileset dir="${build.dir}/${final.name}/src/packages/deb/init.d" filemode="755" prefix="/etc/init.d">
|
|
|
- <include name="**" />
|
|
|
- </tarfileset>
|
|
|
- </deb>
|
|
|
-
|
|
|
- <copy todir="${build.dir}/" flatten="true">
|
|
|
- <fileset dir="${package.buildroot}">
|
|
|
- <include name="**/${name}*.deb" />
|
|
|
- </fileset>
|
|
|
- </copy>
|
|
|
- <delete dir="${package.buildroot}" quiet="true" verbose="false"/>
|
|
|
-
|
|
|
- </target>
|
|
|
-
|
|
|
<!-- ====================================================== -->
|
|
|
<!-- mvn-deploy. Publishing jars to nexus -->
|
|
|
<!-- ====================================================== -->
|
|
@@ -1262,7 +1089,6 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
|
<delete>
|
|
|
<fileset dir="${basedir}" includes="*.jar,*.tar.gz"/>
|
|
|
</delete>
|
|
|
- <delete dir="${package.buildroot}" />
|
|
|
</target>
|
|
|
|
|
|
<target name="clean-contrib">
|