Author: phunt
Date: Thu Aug 11 22:06:44 2011
New Revision: 1156845
URL: http://svn.apache.org/viewvc?rev=1156845&view=rev
Log:
Reverted ZOOKEEPER-999, small build issue on jenkins
Removed:
zookeeper/trunk/README_packaging.txt
zookeeper/trunk/src/contrib/zkpython/ivy.xml
zookeeper/trunk/src/contrib/zkpython/src/packages/
zookeeper/trunk/src/packages/
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/bin/zkCleanup.sh
zookeeper/trunk/bin/zkCli.sh
zookeeper/trunk/bin/zkEnv.sh
zookeeper/trunk/bin/zkServer.sh
zookeeper/trunk/build.xml
zookeeper/trunk/ivy.xml
zookeeper/trunk/src/contrib/build-contrib.xml
zookeeper/trunk/src/contrib/build.xml
zookeeper/trunk/src/contrib/zkpython/build.xml
zookeeper/trunk/src/contrib/zkpython/src/python/setup.py
zookeeper/trunk/src/recipes/build-recipes.xml
zookeeper/trunk/src/recipes/build.xml
zookeeper/trunk/src/recipes/lock/build.xml
zookeeper/trunk/src/recipes/queue/build.xml
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Thu Aug 11 22:06:44 2011
@@ -399,9 +399,6 @@ NEW FEATURES:
ZOOKEEPER-992. MT Native Version of Windows C Client (Dheeraj Agrawal via michim)
- ZOOKEEPER-999. Create an package integration project
- (Eric Yang via phunt)
-
Release 3.3.0 - 2010-03-24
Non-backward compatible changes:
Modified: zookeeper/trunk/bin/zkCleanup.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkCleanup.sh?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkCleanup.sh (original)
+++ zookeeper/trunk/bin/zkCleanup.sh Thu Aug 11 22:06:44 2011
@@ -25,16 +25,16 @@
# relative to the canonical path of this script.
#
-# use POSTIX interface, symlink is followed automatically
-ZOOBIN="${BASH_SOURCE-$0}"
-ZOOBIN=`dirname ${ZOOBIN}`
-ZOOBINDIR=`cd ${ZOOBIN}; pwd`
-
-if [ -e "$ZOOBIN/../libexec/zkEnv.sh" ]; then
- . "$ZOOBINDIR"/../libexec/zkEnv.sh
+# Only follow symlinks if readlink supports it
+if readlink -f "$0" > /dev/null 2>&1
+then
+ ZOOBIN=`readlink -f "$0"`
else
- . "$ZOOBINDIR"/zkEnv.sh
+ ZOOBIN="$0"
fi
+ZOOBINDIR=`dirname "$ZOOBIN"`
+
+. "$ZOOBINDIR"/zkEnv.sh
ZOODATADIR=$(grep "^[[:space:]]*dataDir=" "$ZOOCFG" | sed -e 's/.*=//')
ZOODATALOGDIR=$(grep "^[[:space:]]*dataLogDir=" "$ZOOCFG" | sed -e 's/.*=//')
Modified: zookeeper/trunk/bin/zkCli.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkCli.sh?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkCli.sh (original)
+++ zookeeper/trunk/bin/zkCli.sh Thu Aug 11 22:06:44 2011
@@ -25,16 +25,16 @@
# relative to the canonical path of this script.
#
-# use POSTIX interface, symlink is followed automatically
-ZOOBIN="${BASH_SOURCE-$0}"
-ZOOBIN=`dirname ${ZOOBIN}`
-ZOOBINDIR=`cd ${ZOOBIN}; pwd`
-
-if [ -e "$ZOOBIN/../libexec/zkEnv.sh" ]; then
- . "$ZOOBINDIR"/../libexec/zkEnv.sh
+# Only follow symlinks if readlink supports it
+if readlink -f "$0" > /dev/null 2>&1
+then
+ ZOOBIN=`readlink -f "$0"`
else
- . "$ZOOBINDIR"/zkEnv.sh
+ ZOOBIN="$0"
fi
+ZOOBINDIR=`dirname "$ZOOBIN"`
+
+. "$ZOOBINDIR"/zkEnv.sh
$JAVA "-Dzookeeper.log.dir=${ZOO_LOG_DIR}" "-Dzookeeper.root.logger=${ZOO_LOG4J_PROP}" \
-cp "$CLASSPATH" $CLIENT_JVMFLAGS $JVMFLAGS \
Modified: zookeeper/trunk/bin/zkEnv.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkEnv.sh?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkEnv.sh (original)
+++ zookeeper/trunk/bin/zkEnv.sh Thu Aug 11 22:06:44 2011
@@ -22,21 +22,9 @@
# otherwise we use /etc/zookeeper
# or the conf directory that is
# a sibling of this script's directory
-
-ZOOBINDIR=${ZOOBINDIR:-/usr/bin}
-ZOOKEEPER_PREFIX=${ZOOBINDIR}/..
-
if [ "x$ZOOCFGDIR" = "x" ]
then
- if [ -e "${ZOOKEEPER_PREFIX}/conf" ]; then
ZOOCFGDIR="$ZOOBINDIR/../conf"
- else
- ZOOCFGDIR="$ZOOBINDIR/../etc/zookeeper"
- fi
-fi
-
-if [ -f "${ZOOCFGDIR}/zookeeper-env.sh" ]; then
- . "${ZOOCFGDIR}/zookeeper-env.sh"
fi
if [ "x$ZOOCFG" = "x" ]
@@ -76,13 +64,13 @@ do
done
#make it work in the release
-if [ -d ${ZOOKEEPER_PREFIX}/share/zookeeper ]; then
- LIBPATH="${ZOOKEEPER_PREFIX}"/share/zookeeper/*.jar
-else
- LIBPATH="${ZOOBINDIR}"/../lib/*.jar
-fi
+for i in "$ZOOBINDIR"/../lib/*.jar
+do
+ CLASSPATH="$i:$CLASSPATH"
+done
-for i in ${LIBPATH}
+#make it work in the release
+for i in "$ZOOBINDIR"/../zookeeper-*.jar
do
CLASSPATH="$i:$CLASSPATH"
done
Modified: zookeeper/trunk/bin/zkServer.sh
URL: http://svn.apache.org/viewvc/zookeeper/trunk/bin/zkServer.sh?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/bin/zkServer.sh (original)
+++ zookeeper/trunk/bin/zkServer.sh Thu Aug 11 22:06:44 2011
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@@ -42,16 +42,16 @@ else
ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
fi
-# use POSTIX interface, symlink is followed automatically
-ZOOBIN="${BASH_SOURCE-$0}"
-ZOOBIN=`dirname ${ZOOBIN}`
-ZOOBINDIR=`cd ${ZOOBIN}; pwd`
-
-if [ -e "$ZOOBIN/../libexec/zkEnv.sh" ]; then
- . "$ZOOBINDIR"/../libexec/zkEnv.sh
+# Only follow symlinks if readlink supports it
+if readlink "$0" > /dev/null 2>&1
+then
+ ZOOBIN=`readlink "$0"`
else
- . "$ZOOBINDIR"/zkEnv.sh
+ ZOOBIN="$0"
fi
+ZOOBINDIR=`dirname "$ZOOBIN"`
+
+. "$ZOOBINDIR"/zkEnv.sh
if [ "x$SERVER_JVMFLAGS" ]
then
Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Thu Aug 11 22:06:44 2011
@@ -103,7 +103,6 @@
value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
<property name="ivy.home" value="${user.home}/.ant" />
<property name="ivy.lib" value="${build.dir}/lib"/>
- <property name="ivy.package.lib" value="${build.dir}/package/lib"/>
<property name="ivy.test.lib" value="${build.dir}/test/lib"/>
<property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
<property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
@@ -151,20 +150,6 @@
<property name="build.dir.eclipse-main-classes" value="${build.dir.eclipse}/classes-main"/>
<property name="build.dir.eclipse-test-classes" value="${build.dir.eclipse}/classes-test"/>
- <!-- cppunit property set -->
- <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"/>
<!-- ====================================================== -->
<!-- Macro definitions -->
@@ -209,12 +194,6 @@
<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 -->
<!-- ====================================================== -->
@@ -222,7 +201,6 @@
<mkdir dir="${build.classes}" />
<mkdir dir="${ivy.lib}"/>
- <mkdir dir="${ivy.package.lib}"/>
<mkdir dir="${ivy.test.lib}"/>
<condition property="ivy.jar.exists">
<available file="${lib.dir}/ivy-${ivy.version}.jar"/>
@@ -335,11 +313,6 @@
pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
</target>
- <target name="ivy-retrieve-package" depends="init,ivy-init">
- <ivy:retrieve settingsRef="${ant.project.name}" conf="package"
- pattern="${ivy.package.lib}/[artifact]-[revision].[ext]"/>
- </target>
-
<target name="ivy-retrieve-jdiff" depends="init,ivy-init">
<mkdir dir="${ivy.jdiff.lib}"/>
<ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="jdiff"
@@ -373,29 +346,6 @@
</javac>
</target>
- <target name="compile-native" depends="compile_jute" description="Make C binding">
- <exec executable="autoreconf" dir="${c.src.dir}" searchpath="yes"
- failonerror="yes">
- <arg value="-if"/>
- <env key="ACLOCAL" value="aclocal -I ${cppunit.m4}"/>
- </exec>
- <mkdir dir="${build.dir}/c" />
- <exec executable="${c.src.dir}/configure" dir="${build.dir}/c"
- failonerror="yes">
- <env key="base_dir" value="${basedir}"/>
- <env key="CALLER" value="ANT"/>
- <arg value="--prefix=${build.dir}/c/build/${package.prefix}"/>
- </exec>
- <property name="c.build" value="${build.dir}/c/build"/>
- <exec dir="${build.dir}/c" executable="make" failonerror="true">
- <arg value="install"/>
- <env key="LD_LIBRARY_PATH" value="${c.build}"/>
- <env key="PATH" path="${env.PATH};${c.src.dir};"/>
- <env key="CALLER" value="ANT"/>
- <env key="base_dir" value="${basedir}"/>
- </exec>
- </target>
-
<!-- ====================================================== -->
<!-- Documentation -->
<!-- ====================================================== -->
@@ -631,29 +581,24 @@
<!-- -->
<!-- ================================================================== -->
<target name="package"
- depends="jar,bin-jar,src-jar,javadoc-jar,test-jar,api-report,create-cppunit-configure,compile-native,compile-test"
+ depends="jar,bin-jar,src-jar,javadoc-jar,test-jar,api-report,create-cppunit-configure,compile-test"
description="Build distribution">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/lib"/>
- <mkdir dir="${dist.dir}/libexec"/>
- <mkdir dir="${dist.dir}/share/zookeeper/contrib"/>
- <mkdir dir="${dist.dir}/share/zookeeper/recipes"/>
+ <mkdir dir="${dist.dir}/contrib"/>
+ <mkdir dir="${dist.dir}/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"/>
- <copy todir="${dist.dir}/share/zookeeper" includeEmptyDirs="false">
+ <copy todir="${dist.dir}/lib" 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.-->
@@ -663,12 +608,12 @@
<fileset file="${recipes.dir}/build.xml"/>
</subant>
- <copy todir="${dist.dir}/share/zookeeper">
+ <copy todir="${dist.dir}">
<fileset file="${build.dir}/${final.name}.jar"/>
</copy>
- <checksum file="${dist.dir}/share/zookeeper/${final.name}.jar" algorithm="md5"/>
- <checksum file="${dist.dir}/share/zookeeper/${final.name}.jar" algorithm="sha1"/>
+ <checksum file="${dist.dir}/${final.name}.jar" algorithm="md5"/>
+ <checksum file="${dist.dir}/${final.name}.jar" algorithm="sha1"/>
<mkdir dir="${dist.maven.dir}"/>
@@ -710,15 +655,7 @@
<copy todir="${dist.dir}/bin">
- <fileset dir="bin" includes="zkCli*"/>
- </copy>
-
- <copy todir="${dist.dir}/libexec">
- <fileset dir="bin" includes="zkEnv*"/>
- </copy>
-
- <copy todir="${dist.dir}/sbin">
- <fileset dir="bin" includes="zkServer*"/>
+ <fileset dir="bin"/>
</copy>
<copy todir="${dist.dir}/conf">
@@ -742,20 +679,9 @@
<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"/>
- <fileset dir="${dist.dir}/sbin"/>
<fileset dir="${dist.dir}/src/contrib/">
<include name="*/bin/*" />
</fileset>
@@ -830,157 +756,6 @@
</macro_tar>
</target>
- <target name="package-native" depends="compile-native, package" description="Make
C binding tarball">
- <!-- For Unix platforms only, use OS native tar to preserve symlinks -->
- <exec executable="tar" dir="${build.dir}/c/build">
- <arg value="cfzv" />
- <arg value="${build.dir}/${final.name}-lib.tar.gz" />
- <arg value="." />
- </exec>
- <subant target="package">
- <!--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>
- </target>
-
- <target name="rpm" depends="package-native, tar" description="Make rpm package">
- <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="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="${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" 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>
-
<!-- ====================================================== -->
<!-- Clean. Delete the build files, and their directories -->
<!-- ====================================================== -->
@@ -999,7 +774,6 @@
<delete>
<fileset dir="${basedir}" includes="*.jar,*.tar.gz"/>
</delete>
- <delete dir="${package.buildroot}" />
</target>
<target name="clean-contrib">
@@ -1122,7 +896,6 @@
<exec executable="autoreconf" dir="${c.src.dir}" searchpath="yes"
failonerror="yes">
<arg value="-if"/>
- <env key="ACLOCAL" value="aclocal -I ${cppunit.m4}"/>
</exec>
</target>
@@ -1152,8 +925,9 @@
depends="compile_jute, jar, create-cppunit-makefile"
if="cppunit"
description="to run cppunit test cases">
+ <property name="lib.cppunit" value="/usr/local/lib"/>
<exec dir="${test.cppunit.dir}" executable="make" failonerror="true">
- <env key="LD_LIBRARY_PATH" value="${cppunit.lib}"/>
+ <env key="LD_LIBRARY_PATH" value="${lib.cppunit}"/>
<env key="PATH" path="${env.PATH};${c.src.dir};"/>
<env key="CALLER" value="ANT"/>
<env key="CLOVER_HOME" value="${clover.home}"/>
Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Thu Aug 11 22:06:44 2011
@@ -26,16 +26,14 @@
</info>
<configurations defaultconfmapping="default">
- <conf name="master"/>
<conf name="default"/>
<conf name="test"/>
- <conf name="package" extends="master"/>
<conf name="jdiff" visibility="private"/>
<conf name="releaseaudit" visibility="private" description="Artifacts required for
releaseaudit target"/>
</configurations>
<publications>
- <artifact name='org.apache.zookeeper' type='jar' ext='jar' />
+ <artifact name='org.jboss.netty' type='jar' ext='jar' />
</publications>
<dependencies>
@@ -50,8 +48,6 @@
<artifact name="netty" type="jar" conf="default"/>
</dependency>
- <dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/>
-
<dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
<dependency org="checkstyle" name="checkstyle" rev="5.0"
conf="test->default"/>
Modified: zookeeper/trunk/src/contrib/build-contrib.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/build-contrib.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/build-contrib.xml (original)
+++ zookeeper/trunk/src/contrib/build-contrib.xml Thu Aug 11 22:06:44 2011
@@ -153,28 +153,6 @@
</copy>
</target>
- <!-- ====================================================== -->
- <!-- Package a contrib's files -->
- <!-- ====================================================== -->
- <target name="package-native" depends="jar" unless="skip.contrib">
- <echo message="contrib: ${name}"/>
- </target>
-
- <!-- ====================================================== -->
- <!-- rpm a contrib's files -->
- <!-- ====================================================== -->
- <target name="rpm" depends="jar" unless="skip.contrib">
- <echo message="contrib: ${name}"/>
-
- </target>
-
- <!-- ====================================================== -->
- <!-- deb a contrib's files -->
- <!-- ====================================================== -->
- <target name="deb" depends="jar" unless="skip.contrib">
- <echo message="contrib: ${name}"/>
-
- </target>
<!-- ================================================================== -->
<!-- Clean. Delete the build files, and their directories -->
<!-- ================================================================== -->
Modified: zookeeper/trunk/src/contrib/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/build.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/build.xml (original)
+++ zookeeper/trunk/src/contrib/build.xml Thu Aug 11 22:06:44 2011
@@ -48,7 +48,7 @@
<fileset refid="contribfileset" />
</subant>
</target>
-
+
<!-- ====================================================== -->
<!-- Test all the contribs. -->
<!-- ====================================================== -->
@@ -68,21 +68,4 @@
</subant>
</target>
- <!-- ====================================================== -->
- <!-- rpm all the contribs. -->
- <!-- ====================================================== -->
- <target name="rpm">
- <subant target="rpm">
- <fileset refid="contribfileset" />
- </subant>
- </target>
-
- <!-- ====================================================== -->
- <!-- deb all the contribs. -->
- <!-- ====================================================== -->
- <target name="deb">
- <subant target="deb">
- <fileset refid="contribfileset" />
- </subant>
- </target>
</project>
Modified: zookeeper/trunk/src/contrib/zkpython/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkpython/build.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkpython/build.xml (original)
+++ zookeeper/trunk/src/contrib/zkpython/build.xml Thu Aug 11 22:06:44 2011
@@ -25,10 +25,6 @@
<property name="test.log.dir" value="${build.test}/logs" />
<property name="test.output" value="no" />
<property name="test.timeout" value="900000" />
- <property name="package.buildroot" value="/tmp/zkpython_build_${user.name}"/>
- <property name="package.build.dir" value="/tmp/zkpython_build_${user.name}/BUILD"/>
- <property name="package.release" value="1"/>
- <property name="package.prefix" value="/usr"/>
<target name="test"
depends="compile,test-init,test-category,test-start,python-test,test-stop" />
@@ -61,7 +57,7 @@
</exec>
</target>
- <target name="compile" depends="ivy-retrieve">
+ <target name="compile">
<exec executable="python" failonerror="true">
<arg value="${python.src.dir}/setup.py"/>
<arg value="build"/>
@@ -78,7 +74,7 @@
</exec>
</target>
- <target name="package" depends="compile" unless="skip.contrib">
+ <target name="package" unless="skip.contrib">
<echo message="contrib: ${name}"/>
<mkdir dir="${build.dir}"/>
@@ -98,98 +94,5 @@
</fileset>
</copy>
</target>
-
- <target name="tar-bin" depends="init, compile" unless="skip.contrib">
- <exec executable="python" failonerror="true" dir="${build.dir}">
- <arg value="${python.src.dir}/setup.py"/>
- <arg value="build"/>
- <arg value="--build-base=${build.dir}"/>
- <arg value="bdist_dumb"/>
- </exec>
- </target>
-
- <target name="rpm" depends="tar-bin" unless="skip.contrib">
- <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}/dist">
- <include name="*.tar.gz" />
- </fileset>
- </copy>
- <path id="python.lib">
- <fileset dir="${package.buildroot}/SOURCES">
- <include name="*.tar.gz" />
- </fileset>
- </path>
- <property name="python.lib" refid="python.lib" />
- <copy file="${src.dir}/../packages/rpm/spec/${name}.spec" todir="${package.buildroot}/SPECS">
- <filterchain>
- <replacetokens>
- <token key="final.name" value="${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="python.lib" value="${python.lib}" />
- </replacetokens>
- </filterchain>
- </copy>
-
- <rpm specFile="${name}.spec" command="-ba" topDir="${package.buildroot}" cleanBuildDir="true"
failOnError="true" />
- <copy todir="${build.dir}/" flatten="true">
- <fileset dir="${package.buildroot}/RPMS">
- <include name="**/*.rpm" />
- </fileset>
- </copy>
- <delete dir="${package.buildroot}" quiet="true" verbose="false" />
- </target>
-
- <target name="deb" depends="tar-bin" unless="skip.contrib">
- <mkdir dir="${package.buildroot}" />
- <mkdir dir="${package.buildroot}/BUILD" />
- <mkdir dir="${package.buildroot}/SPECS" />
- <copy todir="${package.buildroot}/SOURCES">
- <fileset dir="${build.dir}/dist">
- <include name="*.tar.gz" />
- </fileset>
- </copy>
- <path id="python.lib">
- <fileset dir="${package.buildroot}/SOURCES">
- <include name="*.tar.gz" />
- </fileset>
- </path>
- <property name="python.lib" refid="python.lib" />
- <copy todir="${package.build.dir}/zkpython.control">
- <fileset dir="${src.dir}/../packages/deb/zkpython.control">
- <exclude name="control" />
- </fileset>
- </copy>
- <copy file="${src.dir}/../packages/deb/zkpython.control/control" todir="${package.build.dir}/zkpython.control">
- <filterchain>
- <replacetokens>
- <token key="final.name" value="${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}" />
- </replacetokens>
- </filterchain>
- </copy>
- <taskdef name="deb" classname="org.vafer.jdeb.ant.DebAntTask">
- <classpath refid="classpath"/>
- </taskdef>
- <deb destfile="${package.buildroot}/${name}_${version}-${package.release}_${os.arch}.deb"
control="${package.build.dir}/zkpython.control">
- <data src="${python.lib}" />
- </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>
</project>
Modified: zookeeper/trunk/src/contrib/zkpython/src/python/setup.py
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/contrib/zkpython/src/python/setup.py?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/src/contrib/zkpython/src/python/setup.py (original)
+++ zookeeper/trunk/src/contrib/zkpython/src/python/setup.py Thu Aug 11 22:06:44 2011
@@ -21,11 +21,9 @@ zookeeper_basedir = "../../../"
zookeepermodule = Extension("zookeeper",
sources=["src/c/zookeeper.c"],
include_dirs=[zookeeper_basedir + "/src/c/include",
- zookeeper_basedir + "/build/c",
zookeeper_basedir + "/src/c/generated"],
libraries=["zookeeper_mt"],
library_dirs=[zookeeper_basedir + "/src/c/.libs/",
- zookeeper_basedir + "/build/c/.libs/",
zookeeper_basedir + "/build/test/test-cppunit/.libs",
"/usr/local/lib"
])
Modified: zookeeper/trunk/src/recipes/build-recipes.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/build-recipes.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/build-recipes.xml (original)
+++ zookeeper/trunk/src/recipes/build-recipes.xml Thu Aug 11 22:06:44 2011
@@ -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}/recipes/${name}"/>
+ <copy todir="${dist.dir}/recipes/${name}" includeEmptyDirs="false"
flatten="true">
<fileset dir="${build.dir}">
<include name="zookeeper-${version}-${name}.jar" />
@@ -139,21 +139,6 @@
<delete dir="${build.dir}"/>
</target>
- <!-- ====================================================== -->
- <!-- rpm a contrib's files -->
- <!-- ====================================================== -->
- <target name="rpm" depends="jar" unless="skip.contrib">
- <echo message="recipes: ${name}"/>
-
- </target>
-
- <!-- ====================================================== -->
- <!-- deb a contrib's files -->
- <!-- ====================================================== -->
- <target name="deb" depends="jar" unless="skip.contrib">
- <echo message="recipes: ${name}"/>
-
- </target>
<!-- ================================================================== -->
<!-- Utility features -->
Modified: zookeeper/trunk/src/recipes/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/build.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/build.xml (original)
+++ zookeeper/trunk/src/recipes/build.xml Thu Aug 11 22:06:44 2011
@@ -59,21 +59,4 @@
</subant>
</target>
- <!-- ====================================================== -->
- <!-- rpm all the contribs. -->
- <!-- ====================================================== -->
- <target name="rpm">
- <subant target="rpm">
- <fileset dir="." includes="*/build.xml"/>
- </subant>
- </target>
-
- <!-- ====================================================== -->
- <!-- deb all the contribs. -->
- <!-- ====================================================== -->
- <target name="deb">
- <subant target="deb">
- <fileset dir="." includes="*/build.xml"/>
- </subant>
- </target>
</project>
Modified: zookeeper/trunk/src/recipes/lock/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/lock/build.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/lock/build.xml (original)
+++ zookeeper/trunk/src/recipes/lock/build.xml Thu Aug 11 22:06:44 2011
@@ -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}/recipes/${name}"/>
- <mkdir dir="${dist.dir}/share/zookeeper/recipes/${name}/test"/>
- <copy todir="${dist.dir}/share/zookeeper/recipes/${name}/test">
+ <mkdir dir="${dist.dir}/recipes/${name}/test"/>
+ <copy todir="${dist.dir}/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}/recipes/${name}/src"/>
+ <copy todir="${dist.dir}/recipes/${name}/src">
<fileset dir="${basedir}/src"/>
</copy>
</target>
Modified: zookeeper/trunk/src/recipes/queue/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/recipes/queue/build.xml?rev=1156845&r1=1156844&r2=1156845&view=diff
==============================================================================
--- zookeeper/trunk/src/recipes/queue/build.xml (original)
+++ zookeeper/trunk/src/recipes/queue/build.xml Thu Aug 11 22:06:44 2011
@@ -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}/recipes/${name}"/>
- <mkdir dir="${dist.dir}/share/zookeeper/recipes/${name}/test"/>
- <copy todir="${dist.dir}/share/zookeeper/recipes/${name}/test">
+ <mkdir dir="${dist.dir}/recipes/${name}/test"/>
+ <copy todir="${dist.dir}/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}/recipes/${name}/src"/>
+ <copy todir="${dist.dir}/recipes/${name}/src">
<fileset dir="${basedir}/src"/>
</copy>
</target>
|