svn commit: r1691408 - in /avro/trunk: build.sh lang/py3/setup.py share/docker/Dockerfile

[to...@apache.org]

Author: tomwhite
Date: Thu Jul 16 14:29:03 2015
New Revision: 1691408

URL: http://svn.apache.org/r1691408
Log:
Build release fixes.

Modified:
    avro/trunk/build.sh
    avro/trunk/lang/py3/setup.py
    avro/trunk/share/docker/Dockerfile

Modified: avro/trunk/build.sh
URL: http://svn.apache.org/viewvc/avro/trunk/build.sh?rev=1691408&r1=1691407&r2=1691408&view=diff
==============================================================================
--- avro/trunk/build.sh (original)
+++ avro/trunk/build.sh Thu Jul 16 14:29:03 2015
@@ -170,7 +170,7 @@ case "$target" in
 
 	(cd lang/php; ./build.sh clean)
 
-	(cd lang/perl; [ -f Makefile ] && make clean)
+	(cd lang/perl; [ ! -f Makefile ] || make clean)
 	;;
 
     docker)
@@ -198,6 +198,7 @@ UserSpecificDocker
           -v ${PWD}:/home/${USER_NAME}/avro \
           -w /home/${USER_NAME}/avro \
           -v ${HOME}/.m2:/home/${USER_NAME}/.m2 \
+          -v ${HOME}/.gnupg:/home/${USER_NAME}/.gnupg \
           -u ${USER_NAME} \
           avro-build-${USER_NAME}
         ;;

Modified: avro/trunk/lang/py3/setup.py
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py3/setup.py?rev=1691408&r1=1691407&r2=1691408&view=diff
==============================================================================
--- avro/trunk/lang/py3/setup.py (original)
+++ avro/trunk/lang/py3/setup.py Thu Jul 16 14:29:03 2015
@@ -27,6 +27,9 @@ from setuptools import setup
 
 VERSION_FILE_NAME = 'VERSION.txt'
 
+# The following prevents distutils from using hardlinks (which may not always be
+# available, e.g. on a Docker volume). See http://bugs.python.org/issue8876
+del os.link
 
 def RunsFromSourceDist():
   """Tests whether setup.py is invoked from a source distribution.

Modified: avro/trunk/share/docker/Dockerfile
URL: http://svn.apache.org/viewvc/avro/trunk/share/docker/Dockerfile?rev=1691408&r1=1691407&r2=1691408&view=diff
==============================================================================
--- avro/trunk/share/docker/Dockerfile (original)
+++ avro/trunk/share/docker/Dockerfile Thu Jul 16 14:29:03 2015
@@ -29,7 +29,7 @@ RUN apt-get update && apt-get install --
   mono-devel mono-gmcs nunit \
   nodejs nodejs-legacy npm \
   perl \
-  php5 phpunit php5-gmp \
+  php5 phpunit php5-gmp bzip2 \
   python python-setuptools python3-setuptools \
   ruby ruby-dev rake \
   libsnappy1 libsnappy-dev
@@ -39,6 +39,9 @@ RUN mkdir -p /usr/local/apache-forrest
 RUN curl -O http://archive.apache.org/dist/forrest/0.8/apache-forrest-0.8.tar.gz
 RUN tar xzf *forrest* --strip-components 1 -C /usr/local/apache-forrest
 RUN echo 'forrest.home=/usr/local/apache-forrest' > build.properties
+RUN chmod -R 0777 /usr/local/apache-forrest/build /usr/local/apache-forrest/main \
+  /usr/local/apache-forrest/plugins
+ENV FORREST_HOME /usr/local/apache-forrest
 
 # Install Perl modules
 RUN curl -L http://cpanmin.us | perl - --self-upgrade # non-interactive cpan