Updated Branches: refs/heads/1.4.5-SNAPSHOT cc4e794b7 -> 72106a626 refs/heads/1.5.1-SNAPSHOT 480c964b7 -> 5fa1a75e3 refs/heads/1.6.0-SNAPSHOT 3acf188c4 -> 624829969 refs/heads/master feacbfee9 -> 3dc5630d8
ACCUMULO-1896 fix deb generation on clean checkout Move .deb generation into a profile and update README Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/72106a62 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72106a62 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72106a62 Branch: refs/heads/1.4.5-SNAPSHOT Commit: 72106a626ed27b2a849aa80639f8514b97710707 Parents: cc4e794 Author: Mike Drob <md...@cloudera.com> Authored: Wed Dec 11 12:02:28 2013 -0800 Committer: Mike Drob <md...@cloudera.com> Committed: Thu Dec 12 17:49:16 2013 -0800 ---------------------------------------------------------------------- README | 8 +- pom.xml | 337 ++++++++++++++++++++++++++++++----------------------------- 2 files changed, 178 insertions(+), 167 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/72106a62/README ---------------------------------------------------------------------- diff --git a/README b/README index bc469fc..a70d62b 100644 --- a/README +++ b/README @@ -31,9 +31,13 @@ but having them available suppresses a runtime warning: $ ( cd ./src/server/src/main/c++ ; make ) +If you want to build the redhat release, use the command "mvn package && mvn +-N rpm:rpm" to generate the .rpm files in platform specific subfolders under +target/rpm directory. + If you want to build the debian release, use the command "mvn package && mvn -install" to generate the .deb files in the target/ directory. Please follow -the steps at +-N install -Pdeb" to generate the .deb files in the target/ directory. Please +follow the steps at https://cwiki.apache.org/BIGTOP/how-to-install-hadoop-distribution-from-bigtop.html to add bigtop to your debian sources list. This will make it substantially easier to install. http://git-wip-us.apache.org/repos/asf/accumulo/blob/72106a62/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9d33818..fc0222e 100644 --- a/pom.xml +++ b/pom.xml @@ -312,171 +312,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>jdeb</artifactId> - <groupId>org.vafer</groupId> - <version>0.10</version> - <inherited>false</inherited> - <executions> - <execution> - <id>accumulo</id> - <phase>install</phase> - <goals> - <goal>jdeb</goal> - </goals> - <configuration> - <deb>${project.build.directory}/${artifactId}_${project.version}.deb</deb> - <attach>false</attach> - <controlDir>src/packages/deb/accumulo</controlDir> - <installDir>/usr/lib/accumulo</installDir> - <dataSet> - <data> - <src>lib</src> - <type>directory</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/lib</prefix> - </mapper> - <excludes>**/.svn/**</excludes> - </data> - <data> - <src>NOTICE</src> - <type>file</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo</prefix> - </mapper> - </data> - <data> - <src>NOTICE</src> - <type>file</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo</prefix> - </mapper> - </data> - <data> - <src>CHANGES</src> - <type>file</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo</prefix> - </mapper> - </data> - <data> - <src>README</src> - <type>file</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo</prefix> - </mapper> - </data> - <data> - <src>docs</src> - <type>directory</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/docs</prefix> - </mapper> - <excludes>**/.svn/**</excludes> - </data> - <data> - <src>bin</src> - <type>directory</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/bin</prefix> - <filemode>755</filemode> - </mapper> - <excludes>**/.svn/**</excludes> - </data> - <data> - <src>conf</src> - <type>directory</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/conf</prefix> - </mapper> - <excludes>**/.svn/**,**/accumulo-site.xml,**/accumulo-env.sh,**/accumulo-metrics.xml,**/test-*,**/slaves,**/masters,**/tracers,**/gc,**/monitor</excludes> - </data> - <data> - <src>conf/examples</src> - <type>directory</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/conf/examples</prefix> - </mapper> - <excludes>**/.svn/**</excludes> - </data> - </dataSet> - </configuration> - </execution> - <execution> - <id>accumulo-native</id> - <phase>install</phase> - <goals> - <goal>jdeb</goal> - </goals> - <configuration> - <attach>false</attach> - <controlDir>src/packages/deb/accumulo-native</controlDir> - <installDir>/usr/lib/accumulo</installDir> - <deb>${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb</deb> - <dataSet> - <data> - <src>src/server/src/main/c++</src> - <type>directory</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/src/server/src/main/c++</prefix> - </mapper> - <excludes>**/.svn/**</excludes> - </data> - <data> - <src>src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</src> - <type>file</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</prefix> - </mapper> - </data> - <data> - <src>src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</src> - <type>file</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</prefix> - </mapper> - </data> - </dataSet> - </configuration> - </execution> - <execution> - <id>accumulo-test</id> - <phase>install</phase> - <goals> - <goal>jdeb</goal> - </goals> - <configuration> - <attach>false</attach> - <controlDir>src/packages/deb/accumulo-test</controlDir> - <installDir>/usr/lib/accumulo</installDir> - <deb>${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb</deb> - <dataSet> - <data> - <src>test</src> - <type>directory</type> - <mapper> - <type>perm</type> - <prefix>/usr/lib/accumulo/test</prefix> - </mapper> - <excludes>**/.svn/**,**/*.pyc</excludes> - </data> - </dataSet> - </configuration> - </execution> - </executions> - </plugin> </plugins> <pluginManagement> <plugins> @@ -606,6 +441,178 @@ <profiles> <profile> + <id>deb</id> + <build> + <plugins> + <plugin> + <artifactId>jdeb</artifactId> + <groupId>org.vafer</groupId> + <version>0.10</version> + <inherited>false</inherited> + <executions> + <execution> + <id>accumulo</id> + <phase>install</phase> + <goals> + <goal>jdeb</goal> + </goals> + <configuration> + <deb>${project.build.directory}/${artifactId}_${project.version}.deb</deb> + <attach>false</attach> + <controlDir>src/packages/deb/accumulo</controlDir> + <installDir>/usr/lib/accumulo</installDir> + <dataSet> + <data> + <src>lib</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/lib</prefix> + </mapper> + <excludes>**/.svn/**</excludes> + </data> + <data> + <src>NOTICE</src> + <type>file</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo</prefix> + </mapper> + </data> + <data> + <src>NOTICE</src> + <type>file</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo</prefix> + </mapper> + </data> + <data> + <src>CHANGES</src> + <type>file</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo</prefix> + </mapper> + </data> + <data> + <src>README</src> + <type>file</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo</prefix> + </mapper> + </data> + <data> + <src>docs</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/docs</prefix> + </mapper> + <excludes>**/.svn/**</excludes> + </data> + <data> + <src>bin</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/bin</prefix> + <filemode>755</filemode> + </mapper> + <excludes>**/.svn/**</excludes> + </data> + <data> + <src>conf</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/conf</prefix> + </mapper> + <excludes>**/.svn/**,**/accumulo-site.xml,**/accumulo-env.sh,**/accumulo-metrics.xml,**/test-*,**/slaves,**/masters,**/tracers,**/gc,**/monitor</excludes> + </data> + <data> + <src>conf/examples</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/conf/examples</prefix> + </mapper> + <excludes>**/.svn/**</excludes> + </data> + </dataSet> + </configuration> + </execution> + <execution> + <id>accumulo-native</id> + <phase>install</phase> + <goals> + <goal>jdeb</goal> + </goals> + <configuration> + <attach>false</attach> + <controlDir>src/packages/deb/accumulo-native</controlDir> + <installDir>/usr/lib/accumulo</installDir> + <deb>${project.build.directory}/${artifactId}-native_${project.version}-${os.arch}.deb</deb> + <dataSet> + <data> + <src>src/server/src/main/c++</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/src/server/src/main/c++</prefix> + </mapper> + <excludes>**/.svn/**</excludes> + </data> + <data> + <src>src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</src> + <type>file</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</prefix> + </mapper> + </data> + <data> + <src>src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</src> + <type>file</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</prefix> + </mapper> + </data> + </dataSet> + </configuration> + </execution> + <execution> + <id>accumulo-test</id> + <phase>install</phase> + <goals> + <goal>jdeb</goal> + </goals> + <configuration> + <attach>false</attach> + <controlDir>src/packages/deb/accumulo-test</controlDir> + <installDir>/usr/lib/accumulo</installDir> + <deb>${project.build.directory}/${artifactId}-test_${project.version}-${os.arch}.deb</deb> + <dataSet> + <data> + <src>test</src> + <type>directory</type> + <mapper> + <type>perm</type> + <prefix>/usr/lib/accumulo/test</prefix> + </mapper> + <excludes>**/.svn/**,**/*.pyc</excludes> + </data> + </dataSet> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>distclean</id> <build> <plugins>
