Clean old command install-simgrid.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7764 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/src/CMakeCompleteInFiles.txt b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
index 8ae55f4..f72fbf4 100644 (file)
--- a/buildtools/Cmake/src/CMakeCompleteInFiles.txt
+++ b/buildtools/Cmake/src/CMakeCompleteInFiles.txt
@@ -684,15 +684,11 @@ endif(ADDR2LINE)
 configure_file(${PROJECT_DIRECTORY}/src/context_sysv_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/context_sysv_config.h)
 
 SET( CMAKEDEFINE "#cmakedefine" )
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/tmp_gras_config.h.in" @ONLY IMMEDIATE)
-configure_file("${CMAKE_CURRENT_BINARY_DIR}/tmp_gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/tmp_gras_config.h.in)
-
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/c_gras_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" "${CMAKE_CURRENT_BINARY_DIR}/src/gras_config.h" @ONLY IMMEDIATE)
 configure_file(${PROJECT_DIRECTORY}/include/simgrid_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/src/simgrid_config.h)
-
-configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/tmp_tracing_config.h.in" @ONLY IMMEDIATE)
-configure_file("${CMAKE_CURRENT_BINARY_DIR}/tmp_tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
-file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/tmp_tracing_config.h.in)
+configure_file("${PROJECT_DIRECTORY}/buildtools/Cmake/src/tracing_config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
+configure_file("${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" "${CMAKE_CURRENT_BINARY_DIR}/include/instr/tracing_config.h" @ONLY IMMEDIATE)
 
 if(NOT prefix)
        set(prefix /usr/local)

diff --git a/buildtools/Cmake/src/CMakeDistrib.txt b/buildtools/Cmake/src/CMakeDistrib.txt
index fae05e5..8835092 100755 (executable)
--- a/buildtools/Cmake/src/CMakeDistrib.txt
+++ b/buildtools/Cmake/src/CMakeDistrib.txt
@@ -17,26 +17,26 @@ set(CMAKE_INSTALL_PREFIX ${prefix} CACHE TYPE INTERNAL FORCE)
 ### Fill in the "make install" target ###
 #########################################
          
-                                 
-
 # doc
-install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/"
-  DESTINATION "$ENV{DESTDIR}${prefix}/doc/simgrid/html/"
-  PATTERN ".svn" EXCLUDE 
-  PATTERN ".git" EXCLUDE 
-  PATTERN "*.o" EXCLUDE
-  PATTERN "*~" EXCLUDE
-)
+if(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
+       install(DIRECTORY "${PROJECT_DIRECTORY}/doc/html/"
+         DESTINATION "$ENV{DESTDIR}${prefix}/doc/simgrid/html/"
+         PATTERN ".svn" EXCLUDE 
+         PATTERN ".git" EXCLUDE 
+         PATTERN "*.o" EXCLUDE
+         PATTERN "*~" EXCLUDE
+       )
+endif(EXISTS ${PROJECT_DIRECTORY}/doc/html/)
 
 # binaries
 install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
                  ${CMAKE_BINARY_DIR}/bin/smpirun
                  ${CMAKE_BINARY_DIR}/bin/tesh
-       DESTINATION $ENV{DESTDIR}${prefix}/bin/)
+               DESTINATION $ENV{DESTDIR}${prefix}/bin/)
        
 install(PROGRAMS tools/MSG_visualization/colorize.pl
         DESTINATION $ENV{DESTDIR}${prefix}/bin/
-       RENAME simgrid-colorizer)
+               RENAME simgrid-colorizer)
 
 # libraries
 install(TARGETS simgrid gras 
@@ -87,77 +87,9 @@ if(HAVE_RUBY)
           DESTINATION $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/)
 endif(HAVE_RUBY)
 
-
-########################################################
-### Fill in the BROKEN "make install-simgrid" target ###
-########################################################
-### scripts
-set(install_bins
- ${CMAKE_BINARY_DIR}/bin/smpicc
- ${CMAKE_BINARY_DIR}/bin/smpirun
- ${CMAKE_BINARY_DIR}/bin/gras_stub_generator
- ${CMAKE_BINARY_DIR}/bin/tesh
-)
-
-string(REPLACE ";" "\t" install_libs "${install_libs}")
-set(uninstall_bins "${install_bins}")
-string(REPLACE "${PROJECT_DIRECTORY}/src/smpi" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
-string(REPLACE "${PROJECT_DIRECTORY}/tools/gras" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
-string(REPLACE "${PROJECT_DIRECTORY}/tools/tesh" "${prefix}/bin" uninstall_bins "${uninstall_bins}")
-string(REPLACE "${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl" "${prefix}/bin/simgrid-colorizer" uninstall_bins "${uninstall_bins}")
-string(REPLACE "${PROJECT_DIRECTORY}/src/.libs" "${prefix}/lib" uninstall_libs "${install_libs}")
-string(REPLACE "./" "${prefix}/" uninstall_HEADERS "${install_HEADERS}")
-
-
-
-add_custom_target(install-simgrid
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/bin
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/lib
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/html
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/xbt
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/mc
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/msg
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/simdag
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/smpi
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/surf
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/gras
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/amok
-COMMAND mkdir -p $ENV{DESTDIR}${prefix}/include/instr
-COMMAND cp ${install_bins} $ENV{DESTDIR}${prefix}/bin
-COMMAND cp ${PROJECT_DIRECTORY}/tools/MSG_visualization/colorize.pl $ENV{DESTDIR}${prefix}/bin/simgrid-colorizer
-COMMAND echo "install bin           OK"
-
-  COMMAND cp ${PROJECT_DIRECTORY}/src/.libs/libsimgrid.so.${release_version} $ENV{DESTDIR}${prefix}/lib
-  COMMAND ln -sf $ENV{DESTDIR}${prefix}/lib/libsimgrid.so.${release_version} $ENV{DESTDIR}${prefix}/lib/libsimgrid.so
-
-  COMMAND cp ${PROJECT_DIRECTORY}/src/.libs/libsimgrid_static.a $ENV{DESTDIR}${prefix}/lib/libsimgrid.a
-
-  COMMAND cp ${PROJECT_DIRECTORY}/src/.libs/libgras.so.${release_version} $ENV{DESTDIR}${prefix}/lib
-  COMMAND ln -sf $ENV{DESTDIR}${prefix}/lib/libgras.so.${release_version} $ENV{DESTDIR}${prefix}/lib/libgras.so
-
-  # FIXME: this should be copied only if enable_smpi is true
-  COMMAND cp ${PROJECT_DIRECTORY}/src/.libs/libsmpi.so.${release_version} $ENV{DESTDIR}${prefix}/lib || true
-  COMMAND ln -sf $ENV{DESTDIR}${prefix}/lib/libsmpi.so.${release_version} $ENV{DESTDIR}${prefix}/lib/libsmpi.so
-
-COMMAND echo "install lib           OK"
-WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
-)
-
-foreach(file ${install_HEADERS})
-       add_custom_command(TARGET install-simgrid
-               COMMAND cp ${file} $ENV{DESTDIR}${prefix}/${file}
-               WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-       )
-endforeach(file ${install_HEADERS})
-add_custom_command(TARGET install-simgrid
-       COMMAND echo "install include       OK"
-       WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
+###########################################
+### Fill in the "make uninstall" target ###
+###########################################
 
 add_custom_target(uninstall
 COMMAND rm -rf ${prefix}/doc/simgrid
@@ -175,12 +107,6 @@ WORKING_DIRECTORY "${prefix}"
 )
 
 if(HAVE_JAVA)
-       add_custom_command(TARGET install-simgrid
-       COMMAND mkdir -p $ENV{DESTDIR}${prefix}/share/
-       COMMAND cp ${PROJECT_DIRECTORY}/src/simgrid.jar $ENV{DESTDIR}${prefix}/share/simgrid.jar
-       COMMAND echo "install binding java  OK"
-       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
-       )
        add_custom_command(TARGET uninstall
        COMMAND rm -f ${prefix}/share/simgrid.jar
        COMMAND echo "uninstall binding java"
@@ -189,12 +115,6 @@ if(HAVE_JAVA)
 endif(HAVE_JAVA)
 
 if(HAVE_LUA)
-       add_custom_command(TARGET install-simgrid
-       COMMAND mkdir -p $ENV{DESTDIR}${prefix}/lib/lua/5.1/
-       COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/lua/5.1/simgrid.so
-       COMMAND echo "install binding lua   OK"
-       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
-       )
        add_custom_command(TARGET uninstall
        COMMAND echo "uninstall binding lua"
        COMMAND rm -f ${prefix}/lib/lua/5.1/simgrid.so  
@@ -204,13 +124,6 @@ endif(HAVE_LUA)
 
 if(HAVE_RUBY)
        string(REGEX REPLACE "^.*ruby/" "" install_link_ruby "${RUBY_ARCH_DIR}")
-       add_custom_command(TARGET install-simgrid
-       COMMAND mkdir -p "$ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/"
-       COMMAND ln -sf ${prefix}/lib/libsimgrid.so $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so
-       COMMAND cp ${PROJECT_DIRECTORY}/src/bindings/ruby/simgrid.rb $ENV{DESTDIR}${prefix}/lib/ruby/${install_link_ruby}/simgrid.rb
-       COMMAND echo "install binding ruby  OK"
-       WORKING_DIRECTORY "${PROJECT_DIRECTORY}/"
-       )
        add_custom_command(TARGET uninstall
        COMMAND echo "uninstall binding ruby"
        COMMAND rm -f ${prefix}/lib/ruby/${install_link_ruby}/libsimgrid.so
@@ -219,34 +132,9 @@ if(HAVE_RUBY)
        )
 endif(HAVE_RUBY)
 
-foreach(file ${directory_to_create})
-       string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}")
-       add_custom_command(TARGET install-simgrid
-               COMMAND mkdir -p $ENV{DESTDIR}${prefix}/doc/simgrid/${file}
-               WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-       )
-endforeach(file ${directory_to_create})
-
-foreach(file ${ex_to_svg})
-       string(REPLACE "${PROJECT_DIRECTORY}" "." file "${file}")
-       add_custom_command(TARGET install-simgrid
-               COMMAND cp ${file} $ENV{DESTDIR}${prefix}/doc/simgrid/${file}
-               WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-       )
-endforeach(file ${ex_to_svg})
-
-add_custom_command(TARGET install-simgrid
-       COMMAND echo "install doc/examples  OK"
-       WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
-
-configure_file(${PROJECT_DIRECTORY}/buildtools/Cmake/src/install_doc.sh.in ${PROJECT_DIRECTORY}/buildtools/Cmake/src/install_doc.sh @ONLY)
-
-add_custom_command(TARGET install-simgrid
-       COMMAND cp ${PROJECT_DIRECTORY}/doc/html/* $ENV{DESTDIR}${prefix}/doc/simgrid/html/ || true
-       COMMAND sh ${PROJECT_DIRECTORY}/buildtools/Cmake/src/install_doc.sh
-       WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
-)
+######################################
+### Fill in the "make html" target ###
+######################################
 
 add_custom_target(html
 COMMAND echo "Make the html doc"
@@ -259,10 +147,6 @@ COMMAND rm -f ${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc/Makefile
 WORKING_DIRECTORY "${PROJECT_DIRECTORY}/buildtools/Cmake/src/doc"
 )
 
-
-
-#SET(CMAKE_VERBOSE_MAKEFILE 1)
-
 ################################################################
 ## Build a sain "make dist" target to build a source package ###
 ##   containing only the files that I explicitely state      ###
@@ -274,7 +158,6 @@ add_custom_target(dist-dir
   COMMAND ${CMAKE_COMMAND} -E make_directory simgrid-${release_version}
 )
 
-
 set(dirs_in_tarball "")
 foreach(file ${to_svg} ${txt_files})
   # This damn prefix is still set somewhere (seems to be in subdirs)
@@ -327,15 +210,19 @@ add_custom_target(distcheck
 )
 add_dependencies(distcheck dist-dir)
 
-########################################
-### End of "make dist" related stuff ### 
-########################################
+#######################################
+### Fill in the "make check" target ###
+#######################################
 
 add_custom_target(check
 COMMAND make test
 #WORKING_DIRECTORY "${PROJECT_DIRECTORY}"
 )
 
+#######################################
+### Fill in the "make all-clean" target ###
+#######################################
+
 add_custom_target(maintainer-clean
 COMMAND rm -f src/config_unit.c
 COMMAND rm -f src/cunit_unit.c
@@ -419,6 +306,10 @@ if(enable_maintainer_mode)
        )
 endif(enable_maintainer_mode)
 
+#############################################
+### Fill in the "make sync-gforge" target ###
+#############################################
+
 add_custom_target(sync-gforge
 COMMAND chmod g+rw -R doc/
 COMMAND chmod a+rX -R doc/

diff --git a/buildtools/Cmake/src/install_doc.sh.in b/buildtools/Cmake/src/install_doc.sh.in
deleted file mode 100644 (file)
index c699fd7..0000000
--- a/buildtools/Cmake/src/install_doc.sh.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [ -e @prefix@/doc/simgrid/html/index.html ]; then 
-       echo "install doc/html      OK"
-else
-       echo "install doc/html      IGNORED"
-fi