Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-8547. Package hadoop-pipes examples/bin directory (again). Contributed by Colin Patrick McCabe 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1356947 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-07-03 21:12:04 +00:00
parent 3728d16160
commit 8188c1cb41
3 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
View File

@ -44,6 +44,11 @@
</includes> </includes>
<outputDirectory>lib/native</outputDirectory> <outputDirectory>lib/native</outputDirectory>
</fileSet> </fileSet>
<fileSet>
<directory>../hadoop-pipes/target/native/examples</directory>
<outputDirectory>examples/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
</fileSets> </fileSets>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -304,6 +304,9 @@ Branch-2 ( Unreleased changes )
HADOOP-8538. CMake builds fail on ARM. (Trevor Robinson via eli) HADOOP-8538. CMake builds fail on ARM. (Trevor Robinson via eli)
HADOOP-8547. Package hadoop-pipes examples/bin directory (again).
(Colin Patrick McCabe via eli)
BREAKDOWN OF HDFS-3042 SUBTASKS BREAKDOWN OF HDFS-3042 SUBTASKS
HADOOP-8220. ZKFailoverController doesn't handle failure to become active HADOOP-8220. ZKFailoverController doesn't handle failure to become active

24
hadoop-tools/hadoop-pipes/src/CMakeLists.txt
View File

@ -57,33 +57,25 @@ include_directories(
# Example programs # Example programs
add_executable(wordcount-simple main/native/examples/impl/wordcount-simple.cc) add_executable(wordcount-simple main/native/examples/impl/wordcount-simple.cc)
target_link_libraries(wordcount-simple hadooppipes hadooputils) target_link_libraries(wordcount-simple hadooppipes hadooputils)
output_directory(wordcount-simple examples)
add_executable(wordcount-part main/native/examples/impl/wordcount-part.cc) add_executable(wordcount-part main/native/examples/impl/wordcount-part.cc)
target_link_libraries(wordcount-part hadooppipes hadooputils) target_link_libraries(wordcount-part hadooppipes hadooputils)
output_directory(wordcount-part examples)
add_executable(wordcount-nopipe main/native/examples/impl/wordcount-nopipe.cc) add_executable(wordcount-nopipe main/native/examples/impl/wordcount-nopipe.cc)
target_link_libraries(wordcount-nopipe hadooppipes hadooputils) target_link_libraries(wordcount-nopipe hadooppipes hadooputils)
output_directory(wordcount-nopipe examples)
add_executable(pipes-sort main/native/examples/impl/sort.cc) add_executable(pipes-sort main/native/examples/impl/sort.cc)
target_link_libraries(pipes-sort hadooppipes hadooputils) target_link_libraries(pipes-sort hadooppipes hadooputils)
output_directory(pipes-sort examples)
install(TARGETS wordcount-simple wordcount-part wordcount-nopipe pipes-sort
RUNTIME DESTINATION bin
)
add_library(hadooputils STATIC add_library(hadooputils STATIC
main/native/utils/impl/StringUtils.cc main/native/utils/impl/StringUtils.cc
main/native/utils/impl/SerialUtils.cc main/native/utils/impl/SerialUtils.cc
) )
install(FILES
main/native/utils/api/hadoop/SerialUtils.hh
main/native/utils/api/hadoop/StringUtils.hh
DESTINATION api/hadoop
COMPONENT headers
)
install(TARGETS hadooputils DESTINATION lib)
add_library(hadooppipes STATIC add_library(hadooppipes STATIC
main/native/pipes/impl/HadoopPipes.cc main/native/pipes/impl/HadoopPipes.cc
) )
@ -92,11 +84,3 @@ target_link_libraries(hadooppipes
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
pthread pthread
) )
install(FILES
main/native/pipes/api/hadoop/Pipes.hh
main/native/pipes/api/hadoop/TemplateFactory.hh
DESTINATION api/hadoop
COMPONENT headers
)
install(TARGETS hadooppipes DESTINATION lib)