Return-Path: 
 <accumulo-commits-return-1260-apmail-incubator-accumulo-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-accumulo-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 91B67933D
	for <apmail-incubator-accumulo-commits-archive@minotaur.apache.org>;
 Thu, 15 Mar 2012 20:07:02 +0000 (UTC)
Received: (qmail 26453 invoked by uid 500); 15 Mar 2012 20:07:02 -0000
Delivered-To: apmail-incubator-accumulo-commits-archive@incubator.apache.org
Received: (qmail 26436 invoked by uid 500); 15 Mar 2012 20:07:02 -0000
Mailing-List: contact accumulo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:accumulo-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:accumulo-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:accumulo-commits@incubator.apache.org>
List-Id: <accumulo-commits.incubator.apache.org>
Reply-To: accumulo-dev@incubator.apache.org
Delivered-To: mailing list accumulo-commits@incubator.apache.org
Received: (qmail 26429 invoked by uid 99); 15 Mar 2012 20:07:02 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2012 20:07:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Mar 2012 20:07:00 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 5638423889E1;
	Thu, 15 Mar 2012 20:06:39 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1301175 - in /incubator/accumulo/trunk/assemble:
 build.sh
 dist.xml
Date: Thu, 15 Mar 2012 20:06:39 -0000
To: accumulo-commits@incubator.apache.org
From: ecn@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120315200639.5638423889E1@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ecn
Date: Thu Mar 15 20:06:38 2012
New Revision: 1301175

URL: http://svn.apache.org/viewvc?rev=1301175&view=rev
Log:
ACCUMULO-161: put the native libs in the tarball, update the build script

Modified:
    incubator/accumulo/trunk/assemble/build.sh
    incubator/accumulo/trunk/assemble/dist.xml

Modified: incubator/accumulo/trunk/assemble/build.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/assemble/build.sh?rev=1301175&r1=1301174&r2=1301175&view=diff
==============================================================================
--- incubator/accumulo/trunk/assemble/build.sh (original)
+++ incubator/accumulo/trunk/assemble/build.sh Thu Mar 15 20:06:38 2012
@@ -38,7 +38,7 @@ runAt() {
   ( cd $1 ; echo in `pwd`; shift ; run $@ ) || fail 
 }
 
-run mvn -U -P distclean clean 
+run mvn -U clean 
 mvn rat:check 
 COUNT=`grep '!????' target/rat.txt | wc -l`
 EXPECTED=56
@@ -48,6 +48,5 @@ then
 fi
 #need to run mvn package twice to properly build docs/config.html
 run mvn package
-run mvn package javadoc:aggregate javadoc:jar source:jar
-runAt ./src/server/src/main/c++ make 
-run mvn assembly:single -N
+run mvn package javadoc:aggregate javadoc:jar source:jar -Pdist
+run mvn -P assemble

Modified: incubator/accumulo/trunk/assemble/dist.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/assemble/dist.xml?rev=1301175&r1=1301174&r2=1301175&view=diff
==============================================================================
--- incubator/accumulo/trunk/assemble/dist.xml (original)
+++ incubator/accumulo/trunk/assemble/dist.xml Thu Mar 15 20:06:38 2012
@@ -37,10 +37,13 @@
 		</fileSet>
 		<fileSet>
 			<directory>../</directory>
+			<fileMode>0755</fileMode>
+			<directoryMode>0755</directoryMode>
 			<includes>
 				<include>**/*.py</include>
 				<include>**/*.pl</include>
 				<include>**/*.sh</include>
+				<include>${so}</include>
 			</includes>
 			<excludes>
 				<exclude>**/target</exclude>