Author: ctubbsii Date: Thu Apr 11 21:08:28 2013 New Revision: 1467086 URL: http://svn.apache.org/r1467086 Log: ACCUMULO-1107 Build rpm and deb better. Made rpm noarch.
Modified: accumulo/branches/1.5/assemble/dist.xml accumulo/branches/1.5/assemble/pom.xml accumulo/branches/1.5/pom.xml Modified: accumulo/branches/1.5/assemble/dist.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/dist.xml?rev=1467086&r1=1467085&r2=1467086&view=diff ============================================================================== --- accumulo/branches/1.5/assemble/dist.xml (original) +++ accumulo/branches/1.5/assemble/dist.xml Thu Apr 11 21:08:28 2013 @@ -50,7 +50,7 @@ <include>**/*.pl</include> <include>**/*.sh</include> <include>**/*.example</include> - <include>${so}</include> + <include>**/*.so</include> </includes> <excludes> <exclude>**/target</exclude> @@ -109,8 +109,6 @@ <exclude>**/randomwalk/conf/logger.xml</exclude> <exclude>**/randomwalk/conf/randomwalk.conf</exclude> <exclude>**/randomwalk/conf/walkers</exclude> - <exclude>${so}</exclude> - <exclude>${jnilib}</exclude> </excludes> <fileMode>0644</fileMode> <directoryMode>0755</directoryMode> Modified: accumulo/branches/1.5/assemble/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/assemble/pom.xml?rev=1467086&r1=1467085&r2=1467086&view=diff ============================================================================== --- accumulo/branches/1.5/assemble/pom.xml (original) +++ accumulo/branches/1.5/assemble/pom.xml Thu Apr 11 21:08:28 2013 @@ -27,8 +27,6 @@ <name>Assemble</name> <properties> <accumulo-top>..</accumulo-top> - <jnilib>**/*.jnilib</jnilib> - <so>**/*.so</so> </properties> <dependencies> <!-- @@ -130,13 +128,6 @@ </build> </profile> <profile> - <id>dist</id> - <properties> - <jnilib></jnilib> - <so></so> - </properties> - </profile> - <profile> <id>rpm</id> <build> <plugins> @@ -152,7 +143,6 @@ Google's BigTable design.</description> <copyright>2011 The Apache Software Foundation.</copyright> <url>http://accumulo.apache.org</url> - <needarch>true</needarch> <group>Utilities</group> <requires> <require>jdk</require> @@ -178,6 +168,9 @@ <sources> <source> <location>${accumulo-top}/docs</location> + <excludes> + <exclude>src/**</exclude> + </excludes> </source> </sources> </mapping> @@ -187,10 +180,15 @@ <source> <location>${accumulo-top}/test</location> <excludes> - <exclude>${accumulo-top}/**/walkers.txt</exclude> - <exclude>${accumulo-top}/**/ingesters.txt</exclude> - <exclude>${accumulo-top}/**/continuous-env.sh</exclude> - <exclude>${accumulo-top}/**/*.pyc</exclude> + <exclude>src/**</exclude> + <exclude>target/**</exclude> + <exclude>**/walkers.txt</exclude> + <exclude>**/ingesters.txt</exclude> + <exclude>**/continuous-env.sh</exclude> + <exclude>.*/**</exclude> + <exclude>**/*.pyc</exclude> + <exclude>**/*.pyo</exclude> + <exclude>pom.xml</exclude> </excludes> </source> </sources> @@ -231,19 +229,24 @@ </mapping> <mapping> <directory>/opt/accumulo/accumulo-${project.version}/lib</directory> - <dependency></dependency> <sources> <source> <location>${accumulo-top}/lib</location> + <includes> + <include>*.jar</include> + </includes> </source> </sources> </mapping> + <mapping> + <directory>/opt/accumulo/accumulo-${project.version}/lib/ext</directory> + </mapping> </mappings> </configuration> <executions> <execution> <goals> - <goal>rpm</goal> + <goal>attached-rpm</goal> </goals> <phase>package</phase> </execution> @@ -267,10 +270,10 @@ <goals> <goal>jdeb</goal> </goals> - <phase>install</phase> + <phase>package</phase> <configuration> + <classifier>deb</classifier> <deb>${project.build.directory}/${project.artifactId}_${project.version}.deb</deb> - <attach>false</attach> <controlDir>assemble/deb/accumulo</controlDir> <installDir>/usr/lib/accumulo</installDir> <dataSet> @@ -352,11 +355,11 @@ <goals> <goal>jdeb</goal> </goals> - <phase>install</phase> + <phase>package</phase> <configuration> - <attach>false</attach> <controlDir>assemble/deb/accumulo-native</controlDir> <installDir>/usr/lib/accumulo</installDir> + <classifier>native-deb</classifier> <deb>${project.build.directory}/${project.artifactId}-native_${project.version}-${os.arch}.deb</deb> <dataSet> <data> @@ -392,11 +395,11 @@ <goals> <goal>jdeb</goal> </goals> - <phase>install</phase> + <phase>package</phase> <configuration> - <attach>false</attach> <controlDir>assemble/deb/accumulo-test</controlDir> <installDir>/usr/lib/accumulo</installDir> + <classifier>test-deb</classifier> <deb>${project.build.directory}/${project.artifactId}-test_${project.version}-${os.arch}.deb</deb> <dataSet> <data> Modified: accumulo/branches/1.5/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/pom.xml?rev=1467086&r1=1467085&r2=1467086&view=diff ============================================================================== --- accumulo/branches/1.5/pom.xml (original) +++ accumulo/branches/1.5/pom.xml Thu Apr 11 21:08:28 2013 @@ -837,7 +837,15 @@ </dependencyManagement> </profile> <profile> - <id>release</id> + <!-- Seal jars when either the apache-release profile is + activated or when tests are skipped --> + <id>apache-release</id> + <activation> + <property> + <name>skipJars</name> + <value>!false</value> + </property> + </activation> <properties> <sealJars>true</sealJars> <skipTests>true</skipTests>