svn commit: r1301175 - in /incubator/accumulo/trunk/assemble: build.sh dist.xml

[ec...@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>