HADOOP-7498. Remove legacy TAR layout creation. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1160341 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
272c6ebe23
commit
8d34a17407
@ -43,7 +43,7 @@ Maven build goals:
|
|||||||
* Run clover : mvn test -Pclover [-DcloverLicenseLocation=${user.name}/.clover.license]
|
* Run clover : mvn test -Pclover [-DcloverLicenseLocation=${user.name}/.clover.license]
|
||||||
* Run Rat : mvn apache-rat:check
|
* Run Rat : mvn apache-rat:check
|
||||||
* Build javadocs : mvn javadoc:javadoc
|
* Build javadocs : mvn javadoc:javadoc
|
||||||
* Build TAR : mvn package [-Ptar][-Pbintar][-Pdocs][-Psrc][-Pnative]
|
* Build TAR : mvn package [-Ptar][-Pdocs][-Psrc][-Pnative]
|
||||||
|
|
||||||
Build options:
|
Build options:
|
||||||
|
|
||||||
|
@ -1,113 +0,0 @@
|
|||||||
<!--
|
|
||||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
|
||||||
contributor license agreements. See the NOTICE file distributed with
|
|
||||||
this work for additional information regarding copyright ownership.
|
|
||||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
|
||||||
(the "License"); you may not use this file except in compliance with
|
|
||||||
the License. You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
-->
|
|
||||||
<assembly>
|
|
||||||
<id>hadoop-bintar</id>
|
|
||||||
<formats>
|
|
||||||
<format>dir</format>
|
|
||||||
</formats>
|
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
|
||||||
<fileSets>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}/src/main/bin</directory>
|
|
||||||
<outputDirectory>/bin</outputDirectory>
|
|
||||||
<excludes>
|
|
||||||
<exclude>*.sh</exclude>
|
|
||||||
</excludes>
|
|
||||||
<fileMode>0755</fileMode>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}/src/main/conf</directory>
|
|
||||||
<outputDirectory>/etc/hadoop</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}/src/main/bin</directory>
|
|
||||||
<outputDirectory>/libexec</outputDirectory>
|
|
||||||
<includes>
|
|
||||||
<include>*-config.sh</include>
|
|
||||||
</includes>
|
|
||||||
<fileMode>0755</fileMode>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}/src/main/bin</directory>
|
|
||||||
<outputDirectory>/sbin</outputDirectory>
|
|
||||||
<includes>
|
|
||||||
<include>*.sh</include>
|
|
||||||
</includes>
|
|
||||||
<excludes>
|
|
||||||
<exclude>hadoop-config.sh</exclude>
|
|
||||||
</excludes>
|
|
||||||
<fileMode>0755</fileMode>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}/src/main/packages</directory>
|
|
||||||
<outputDirectory>/sbin</outputDirectory>
|
|
||||||
<includes>
|
|
||||||
<include>*.sh</include>
|
|
||||||
</includes>
|
|
||||||
<fileMode>0755</fileMode>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}</directory>
|
|
||||||
<outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
|
|
||||||
<includes>
|
|
||||||
<include>*.txt</include>
|
|
||||||
</includes>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${project.build.directory}/webapps</directory>
|
|
||||||
<outputDirectory>/share/hadoop/${hadoop.component}/webapps</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}/src/main/conf</directory>
|
|
||||||
<outputDirectory>/share/hadoop/${hadoop.component}/templates</outputDirectory>
|
|
||||||
<includes>
|
|
||||||
<include>*-site.xml</include>
|
|
||||||
</includes>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${project.build.directory}</directory>
|
|
||||||
<outputDirectory>/share/hadoop/${hadoop.component}</outputDirectory>
|
|
||||||
<includes>
|
|
||||||
<include>${project.artifactId}-${project.version}.jar</include>
|
|
||||||
<include>${project.artifactId}-${project.version}-tests.jar</include>
|
|
||||||
<include>${project.artifactId}-${project.version}-sources.jar</include>
|
|
||||||
<include>${project.artifactId}-${project.version}-test-sources.jar</include>
|
|
||||||
</includes>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}/dev-support/jdiff</directory>
|
|
||||||
<outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${project.build.directory}/site/jdiff/xml</directory>
|
|
||||||
<outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
</fileSets>
|
|
||||||
<dependencySets>
|
|
||||||
<dependencySet>
|
|
||||||
<outputDirectory>/share/hadoop/${hadoop.component}/lib</outputDirectory>
|
|
||||||
<unpack>false</unpack>
|
|
||||||
<scope>runtime</scope>
|
|
||||||
<useProjectArtifact>false</useProjectArtifact>
|
|
||||||
<excludes>
|
|
||||||
<exclude>org.apache.ant:*:jar</exclude>
|
|
||||||
<exclude>org.apache.hadoop:hadoop-*:jar</exclude>
|
|
||||||
<exclude>jdiff:jdiff:jar</exclude>
|
|
||||||
</excludes>
|
|
||||||
</dependencySet>
|
|
||||||
</dependencySets>
|
|
||||||
</assembly>
|
|
@ -15,27 +15,24 @@
|
|||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
<assembly>
|
<assembly>
|
||||||
<id>hadoop-tar</id>
|
<id>hadoop-bintar</id>
|
||||||
<formats>
|
<formats>
|
||||||
<format>dir</format>
|
<format>dir</format>
|
||||||
</formats>
|
</formats>
|
||||||
<includeBaseDirectory>false</includeBaseDirectory>
|
<includeBaseDirectory>false</includeBaseDirectory>
|
||||||
<fileSets>
|
<fileSets>
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}</directory>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<includes>
|
|
||||||
<include>*.txt</include>
|
|
||||||
</includes>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>${basedir}/src/main/bin</directory>
|
<directory>${basedir}/src/main/bin</directory>
|
||||||
<outputDirectory>/bin</outputDirectory>
|
<outputDirectory>/bin</outputDirectory>
|
||||||
<includes>
|
<excludes>
|
||||||
<include>*</include>
|
<exclude>*.sh</exclude>
|
||||||
</includes>
|
</excludes>
|
||||||
<fileMode>0755</fileMode>
|
<fileMode>0755</fileMode>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${basedir}/src/main/conf</directory>
|
||||||
|
<outputDirectory>/etc/hadoop</outputDirectory>
|
||||||
|
</fileSet>
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>${basedir}/src/main/bin</directory>
|
<directory>${basedir}/src/main/bin</directory>
|
||||||
<outputDirectory>/libexec</outputDirectory>
|
<outputDirectory>/libexec</outputDirectory>
|
||||||
@ -45,49 +42,78 @@
|
|||||||
<fileMode>0755</fileMode>
|
<fileMode>0755</fileMode>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>${basedir}/src/main/conf</directory>
|
<directory>${basedir}/src/main/bin</directory>
|
||||||
<outputDirectory>/conf</outputDirectory>
|
<outputDirectory>/sbin</outputDirectory>
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${basedir}/src/main/webapps</directory>
|
|
||||||
<outputDirectory>/webapps</outputDirectory>
|
|
||||||
<excludes>
|
|
||||||
<exclude>proto-*-web.xml</exclude>
|
|
||||||
</excludes>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${project.build.directory}/webapps</directory>
|
|
||||||
<outputDirectory>/webapps</outputDirectory>
|
|
||||||
<excludes>
|
|
||||||
<exclude>proto-*-web.xml</exclude>
|
|
||||||
</excludes>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${project.build.directory}/site</directory>
|
|
||||||
<outputDirectory>/docs</outputDirectory>
|
|
||||||
</fileSet>
|
|
||||||
<fileSet>
|
|
||||||
<directory>${project.build.directory}</directory>
|
|
||||||
<outputDirectory>/</outputDirectory>
|
|
||||||
<includes>
|
<includes>
|
||||||
<include>${project.artifactId}-${project.version}.jar</include>
|
<include>*.sh</include>
|
||||||
<include>${project.artifactId}-${project.version}-tests.jar</include>
|
</includes>
|
||||||
|
<excludes>
|
||||||
|
<exclude>hadoop-config.sh</exclude>
|
||||||
|
</excludes>
|
||||||
|
<fileMode>0755</fileMode>
|
||||||
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${basedir}/src/main/packages</directory>
|
||||||
|
<outputDirectory>/sbin</outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>*.sh</include>
|
||||||
|
</includes>
|
||||||
|
<fileMode>0755</fileMode>
|
||||||
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${basedir}</directory>
|
||||||
|
<outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>*.txt</include>
|
||||||
</includes>
|
</includes>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${project.build.directory}/webapps</directory>
|
||||||
|
<outputDirectory>/share/hadoop/${hadoop.component}/webapps</outputDirectory>
|
||||||
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${basedir}/src/main/conf</directory>
|
||||||
|
<outputDirectory>/share/hadoop/${hadoop.component}/templates</outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>*-site.xml</include>
|
||||||
|
</includes>
|
||||||
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${project.build.directory}</directory>
|
||||||
|
<outputDirectory>/share/hadoop/${hadoop.component}</outputDirectory>
|
||||||
|
<includes>
|
||||||
|
<include>${project.artifactId}-${project.version}.jar</include>
|
||||||
|
<include>${project.artifactId}-${project.version}-tests.jar</include>
|
||||||
|
<include>${project.artifactId}-${project.version}-sources.jar</include>
|
||||||
|
<include>${project.artifactId}-${project.version}-test-sources.jar</include>
|
||||||
|
</includes>
|
||||||
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${basedir}/dev-support/jdiff</directory>
|
||||||
|
<outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
|
||||||
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${project.build.directory}/site/jdiff/xml</directory>
|
||||||
|
<outputDirectory>/share/hadoop/${hadoop.component}/jdiff</outputDirectory>
|
||||||
|
</fileSet>
|
||||||
|
<fileSet>
|
||||||
|
<directory>${project.build.directory}/site</directory>
|
||||||
|
<outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
|
||||||
|
</fileSet>
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<directory>${project.build.directory}/src</directory>
|
<directory>${project.build.directory}/src</directory>
|
||||||
<outputDirectory>/src</outputDirectory>
|
<outputDirectory>/share/hadoop/${hadoop.component}/src</outputDirectory>
|
||||||
</fileSet>
|
</fileSet>
|
||||||
</fileSets>
|
</fileSets>
|
||||||
<dependencySets>
|
<dependencySets>
|
||||||
<dependencySet>
|
<dependencySet>
|
||||||
<outputDirectory>/lib</outputDirectory>
|
<outputDirectory>/share/hadoop/${hadoop.component}/lib</outputDirectory>
|
||||||
<unpack>false</unpack>
|
<unpack>false</unpack>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
<useProjectArtifact>false</useProjectArtifact>
|
<useProjectArtifact>false</useProjectArtifact>
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>org.apache.ant:*:jar</exclude>
|
<exclude>org.apache.ant:*:jar</exclude>
|
||||||
<exclude>org.apache.hadoop:hadoop-*:*:*:*</exclude>
|
<exclude>org.apache.hadoop:hadoop-*:jar</exclude>
|
||||||
<exclude>jdiff:jdiff:jar</exclude>
|
<exclude>jdiff:jdiff:jar</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</dependencySet>
|
</dependencySet>
|
||||||
|
@ -334,6 +334,9 @@ Trunk (unreleased changes)
|
|||||||
HADOOP-7264. Bump avro version to at least 1.4.1. (Alejandro Abdelnur via
|
HADOOP-7264. Bump avro version to at least 1.4.1. (Alejandro Abdelnur via
|
||||||
tomwhite)
|
tomwhite)
|
||||||
|
|
||||||
|
HADOOP-7498. Remove legacy TAR layout creation. (Alejandro Abdelnur via
|
||||||
|
tomwhite)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
|
|
||||||
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
|
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
|
||||||
|
@ -387,7 +387,7 @@
|
|||||||
UNTAR='tar xfBp -'
|
UNTAR='tar xfBp -'
|
||||||
LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib"
|
LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib"
|
||||||
if [ -d $${LIB_DIR} ] ; then
|
if [ -d $${LIB_DIR} ] ; then
|
||||||
TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib/native/${build.platform}"
|
TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib"
|
||||||
mkdir -p $${TARGET_DIR}
|
mkdir -p $${TARGET_DIR}
|
||||||
cd $${LIB_DIR}
|
cd $${LIB_DIR}
|
||||||
$$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)
|
$$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)
|
||||||
@ -462,113 +462,5 @@
|
|||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>bintar</id>
|
|
||||||
<activation>
|
|
||||||
<activeByDefault>false</activeByDefault>
|
|
||||||
</activation>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>pre-bintar</id>
|
|
||||||
<phase>prepare-package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<!-- Using Unix script to preserve symlinks -->
|
|
||||||
<echo file="${project.build.directory}/bintar-copynativelibs.sh">
|
|
||||||
|
|
||||||
which cygpath 2> /dev/null
|
|
||||||
if [ $? = 1 ]; then
|
|
||||||
BUILD_DIR="${project.build.directory}"
|
|
||||||
else
|
|
||||||
BUILD_DIR=`cygpath --unix '${project.build.directory}'`
|
|
||||||
fi
|
|
||||||
TAR='tar cf -'
|
|
||||||
UNTAR='tar xfBp -'
|
|
||||||
LIB_DIR="${BUILD_DIR}/native/target/usr/local/lib"
|
|
||||||
if [ -d $${LIB_DIR} ] ; then
|
|
||||||
TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}-bin/lib"
|
|
||||||
mkdir -p $${TARGET_DIR}
|
|
||||||
cd $${LIB_DIR}
|
|
||||||
$$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)
|
|
||||||
if [ "${bundle.snappy}" = "true" ] ; then
|
|
||||||
cd ${snappy.lib}
|
|
||||||
$$TAR *snappy* | (cd $${TARGET_DIR}/; $$UNTAR)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
</echo>
|
|
||||||
<exec executable="sh" dir="${project.build.directory}" failonerror="true">
|
|
||||||
<arg line="./bintar-copynativelibs.sh"/>
|
|
||||||
</exec>
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
<execution>
|
|
||||||
<id>bintar</id>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<!-- Using Unix script to preserve symlinks -->
|
|
||||||
<echo file="${project.build.directory}/bintar-maketar.sh">
|
|
||||||
|
|
||||||
which cygpath 2> /dev/null
|
|
||||||
if [ $? = 1 ]; then
|
|
||||||
BUILD_DIR="${project.build.directory}"
|
|
||||||
else
|
|
||||||
BUILD_DIR=`cygpath --unix '${project.build.directory}'`
|
|
||||||
fi
|
|
||||||
cd ${BUILD_DIR}
|
|
||||||
tar czf ${project.artifactId}-${project.version}-bin.tar.gz ${project.artifactId}-${project.version}-bin
|
|
||||||
</echo>
|
|
||||||
<exec executable="sh" dir="${project.build.directory}" failonerror="true">
|
|
||||||
<arg line="./bintar-maketar.sh"/>
|
|
||||||
</exec>
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.hadoop</groupId>
|
|
||||||
<artifactId>hadoop-assemblies</artifactId>
|
|
||||||
<version>${hadoop.assemblies.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<id>pre-bintar</id>
|
|
||||||
<phase>prepare-package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>single</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<appendAssemblyId>false</appendAssemblyId>
|
|
||||||
<attach>false</attach>
|
|
||||||
<finalName>${project.artifactId}-${project.version}-bin</finalName>
|
|
||||||
<descriptorRefs>
|
|
||||||
<descriptorRef>hadoop-bintar</descriptorRef>
|
|
||||||
</descriptorRefs>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
Loading…
Reference in New Issue
Block a user