Author: eli
Date: Tue Jul 3 21:12:04 2012
New Revision: 1356947
URL: http://svn.apache.org/viewvc?rev=1356947&view=rev
Log:
HADOOP-8547. Package hadoop-pipes examples/bin directory (again). Contributed
by Colin Patrick McCabe
Modified:
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
Modified:
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml?rev=1356947&r1=1356946&r2=1356947&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
(original)
+++
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
Tue Jul 3 21:12:04 2012
@@ -44,6 +44,11 @@
</includes>
<outputDirectory>lib/native</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>../hadoop-pipes/target/native/examples</directory>
+ <outputDirectory>examples/bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
Modified: hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/CMakeLists.txt?rev=1356947&r1=1356946&r2=1356947&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/CMakeLists.txt (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/CMakeLists.txt Tue Jul 3
21:12:04 2012
@@ -57,33 +57,25 @@ include_directories(
# Example programs
add_executable(wordcount-simple main/native/examples/impl/wordcount-simple.cc)
target_link_libraries(wordcount-simple hadooppipes hadooputils)
+output_directory(wordcount-simple examples)
add_executable(wordcount-part main/native/examples/impl/wordcount-part.cc)
target_link_libraries(wordcount-part hadooppipes hadooputils)
+output_directory(wordcount-part examples)
add_executable(wordcount-nopipe main/native/examples/impl/wordcount-nopipe.cc)
target_link_libraries(wordcount-nopipe hadooppipes hadooputils)
+output_directory(wordcount-nopipe examples)
add_executable(pipes-sort main/native/examples/impl/sort.cc)
target_link_libraries(pipes-sort hadooppipes hadooputils)
-
-install(TARGETS wordcount-simple wordcount-part wordcount-nopipe pipes-sort
- RUNTIME DESTINATION bin
-)
+output_directory(pipes-sort examples)
add_library(hadooputils STATIC
main/native/utils/impl/StringUtils.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
main/native/pipes/impl/HadoopPipes.cc
)
@@ -92,11 +84,3 @@ target_link_libraries(hadooppipes
${OPENSSL_LIBRARIES}
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)
