You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by to...@apache.org on 2011/08/22 19:19:47 UTC
svn commit: r1160341 - in /hadoop/common/trunk: BUILDING.txt
hadoop-assemblies/src/main/resources/assemblies/hadoop-bintar.xml
hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
hadoop-project-distro/pom.xml
Author: tomwhite
Date: Mon Aug 22 17:19:46 2011
New Revision: 1160341
URL: http://svn.apache.org/viewvc?rev=1160341&view=rev
Log:
HADOOP-7498. Remove legacy TAR layout creation. Contributed by Alejandro Abdelnur.
Removed:
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-bintar.xml
Modified:
hadoop/common/trunk/BUILDING.txt
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
hadoop/common/trunk/hadoop-project-distro/pom.xml
Modified: hadoop/common/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/BUILDING.txt?rev=1160341&r1=1160340&r2=1160341&view=diff
==============================================================================
--- hadoop/common/trunk/BUILDING.txt (original)
+++ hadoop/common/trunk/BUILDING.txt Mon Aug 22 17:19:46 2011
@@ -43,7 +43,7 @@ Maven build goals:
* Run clover : mvn test -Pclover [-DcloverLicenseLocation=${user.name}/.clover.license]
* Run Rat : mvn apache-rat:check
* Build javadocs : mvn javadoc:javadoc
- * Build TAR : mvn package [-Ptar][-Pbintar][-Pdocs][-Psrc][-Pnative]
+ * Build TAR : mvn package [-Ptar][-Pdocs][-Psrc][-Pnative]
Build options:
Modified: hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml?rev=1160341&r1=1160340&r2=1160341&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml (original)
+++ hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tar.xml Mon Aug 22 17:19:46 2011
@@ -15,79 +15,105 @@
limitations under the License.
-->
<assembly>
- <id>hadoop-tar</id>
+ <id>hadoop-bintar</id>
<formats>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>${basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>*.txt</include>
- </includes>
+ <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>/bin</outputDirectory>
+ <outputDirectory>/libexec</outputDirectory>
<includes>
- <include>*</include>
+ <include>*-config.sh</include>
</includes>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/bin</directory>
- <outputDirectory>/libexec</outputDirectory>
+ <outputDirectory>/sbin</outputDirectory>
<includes>
- <include>*-config.sh</include>
+ <include>*.sh</include>
</includes>
+ <excludes>
+ <exclude>hadoop-config.sh</exclude>
+ </excludes>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>${basedir}/src/main/conf</directory>
- <outputDirectory>/conf</outputDirectory>
+ <directory>${basedir}/src/main/packages</directory>
+ <outputDirectory>/sbin</outputDirectory>
+ <includes>
+ <include>*.sh</include>
+ </includes>
+ <fileMode>0755</fileMode>
</fileSet>
<fileSet>
- <directory>${basedir}/src/main/webapps</directory>
- <outputDirectory>/webapps</outputDirectory>
- <excludes>
- <exclude>proto-*-web.xml</exclude>
- </excludes>
+ <directory>${basedir}</directory>
+ <outputDirectory>/share/doc/hadoop/${hadoop.component}</outputDirectory>
+ <includes>
+ <include>*.txt</include>
+ </includes>
</fileSet>
<fileSet>
<directory>${project.build.directory}/webapps</directory>
- <outputDirectory>/webapps</outputDirectory>
- <excludes>
- <exclude>proto-*-web.xml</exclude>
- </excludes>
+ <outputDirectory>/share/hadoop/${hadoop.component}/webapps</outputDirectory>
</fileSet>
<fileSet>
- <directory>${project.build.directory}/site</directory>
- <outputDirectory>/docs</outputDirectory>
+ <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>/</outputDirectory>
+ <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>
<directory>${project.build.directory}/src</directory>
- <outputDirectory>/src</outputDirectory>
+ <outputDirectory>/share/hadoop/${hadoop.component}/src</outputDirectory>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
- <outputDirectory>/lib</outputDirectory>
+ <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-*:*:*:*</exclude>
+ <exclude>org.apache.hadoop:hadoop-*:jar</exclude>
<exclude>jdiff:jdiff:jar</exclude>
</excludes>
</dependencySet>
Modified: hadoop/common/trunk/hadoop-project-distro/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project-distro/pom.xml?rev=1160341&r1=1160340&r2=1160341&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project-distro/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project-distro/pom.xml Mon Aug 22 17:19:46 2011
@@ -387,7 +387,7 @@
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}/lib/native/${build.platform}"
+ TARGET_DIR="${BUILD_DIR}/${project.artifactId}-${project.version}/lib"
mkdir -p $${TARGET_DIR}
cd $${LIB_DIR}
$$TAR lib* | (cd $${TARGET_DIR}/; $$UNTAR)
@@ -462,113 +462,5 @@
</plugins>
</build>
</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>
</project>