move version.h from src/simgrid to include/simgrid

diff --git a/.gitignore b/.gitignore
index c0c4ce0..5940061 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -45,9 +45,9 @@ src/*_unit.c
 ### Generated files
 _*.c
 include/simgrid/config.h
+include/simgrid/version.h
 include/smpi/smpif.h
 src/internal_config.h
-src/simgrid/version.h
 testprog
 ### Cmake files
 CPackConfig.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96b68fd..193567c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -523,14 +523,14 @@ endif()
 
 # Avoid triggering a (full) rebuild by touching the files if they did not really change
 configure_file("${CMAKE_HOME_DIRECTORY}/src/internal_config.h.in"    "${CMAKE_BINARY_DIR}/src/internal_config.h.generated"    @ONLY IMMEDIATE)
-configure_file("${CMAKE_HOME_DIRECTORY}/src/simgrid/version.h.in"    "${CMAKE_BINARY_DIR}/src/simgrid/version.h.generated" @ONLY IMMEDIATE)
+configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid/version.h.in" "${CMAKE_BINARY_DIR}/include/simgrid/version.h.generated" @ONLY IMMEDIATE)
 configure_file("${CMAKE_HOME_DIRECTORY}/include/simgrid/config.h.in" "${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated" @ONLY IMMEDIATE)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/src/internal_config.h.generated ${CMAKE_BINARY_DIR}/src/internal_config.h)
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/src/simgrid/version.h.generated ${CMAKE_BINARY_DIR}/src/simgrid/version.h)
+execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/include/simgrid/version.h.generated ${CMAKE_BINARY_DIR}/include/simgrid/version.h)
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated ${CMAKE_BINARY_DIR}/include/simgrid/config.h)
 file(REMOVE ${CMAKE_BINARY_DIR}/src/internal_config.h.generated)
 file(REMOVE ${CMAKE_BINARY_DIR}/include/simgrid/config.h.generated)
-file(REMOVE ${CMAKE_BINARY_DIR}/src/simgrid/version.h.generated)
+file(REMOVE ${CMAKE_BINARY_DIR}/include/simgrid/version.h.generated)
 
 # We need two versions of the SMPI scripts because they contain the path to the library
 # so, it depends of whether SimGrid is installed, or run from the sources (during the build)

diff --git a/MANIFEST.in b/MANIFEST.in
index a10ada1..06f5b5d 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1978,6 +1978,7 @@ include include/simgrid/simix.hpp
 include include/simgrid/simix/blocking_simcall.hpp
 include include/simgrid/smpi/replay.hpp
 include include/simgrid/storage.h
+include include/simgrid/version.h.in
 include include/simgrid/vm.h
 include include/simgrid/zone.h
 include include/smpi/forward.hpp
@@ -2310,7 +2311,6 @@ include src/simgrid/Exception.cpp
 include src/simgrid/sg_config.cpp
 include src/simgrid/sg_version.cpp
 include src/simgrid/util.hpp
-include src/simgrid/version.h.in
 include src/simix/libsmx.cpp
 include src/simix/popping.cpp
 include src/simix/popping_accessors.hpp

diff --git a/src/simgrid/version.h.in b/include/simgrid/version.h.in
similarity index 100%
rename from src/simgrid/version.h.in
rename to include/simgrid/version.h.in

diff --git a/src/simgrid/sg_version.cpp b/src/simgrid/sg_version.cpp
index c538272..748c354 100644 (file)
--- a/src/simgrid/sg_version.cpp
+++ b/src/simgrid/sg_version.cpp
@@ -3,7 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 #include "simgrid/config.h"
-#include "src/simgrid/version.h"
+#include "simgrid/version.h"
 #include "xbt/base.h"
 #include "xbt/log.h"
 #include "xbt/misc.h"

diff --git a/src/surf/surf_interface.cpp b/src/surf/surf_interface.cpp
index d141819..05ea270 100644 (file)
--- a/src/surf/surf_interface.cpp
+++ b/src/surf/surf_interface.cpp
@@ -9,7 +9,6 @@
 #include "simgrid/sg_config.hpp"
 #include "src/kernel/resource/profile/FutureEvtSet.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/simgrid/version.h"
 #include "src/surf/HostImpl.hpp"
 #include "src/surf/xml/platf.hpp"
 #include "src/xbt_modinter.h" /* whether initialization was already done */

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index e945950..0d278d9 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -790,8 +790,8 @@ set(headers_to_install
   )
 set(source_of_generated_headers
   include/simgrid/config.h.in
+  include/simgrid/version.h.in
   src/internal_config.h.in
-  src/simgrid/version.h.in
   include/smpi/mpif.h.in)
 
 ### depend of some variables setted upper