A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to guess JSG_BUNDLE on unknown systems.
[simgrid.git]
/
buildtools
/
Cmake
/
Distrib.cmake
diff --git
a/buildtools/Cmake/Distrib.cmake
b/buildtools/Cmake/Distrib.cmake
index
426ef52
..
4e314ba
100644
(file)
--- a/
buildtools/Cmake/Distrib.cmake
+++ b/
buildtools/Cmake/Distrib.cmake
@@
-5,7
+5,9
@@
# doc
file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html/)
install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/html/"
# doc
file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html/)
install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/html/"
- DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/html/)
+ DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/html/)
+install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/HelloWorld/"
+ DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/HelloWorld/)
#### Generate the manpages
if(NOT WIN32)
#### Generate the manpages
if(NOT WIN32)
@@
-73,6
+75,13
@@
if(enable_lib_static AND NOT WIN32)
endif()
endif()
endif()
endif()
+if(enable_java)
+ install(TARGETS SG_java
+ DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/)
+ install(FILES ${SIMGRID_JAR}
+ DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/java/)
+endif()
+
# include files
set(HEADERS
${headers_to_install}
# include files
set(HEADERS
${headers_to_install}
@@
-170,6
+179,8
@@
set(source_to_pack
${BINDINGS_SRC}
${GTNETS_SRC}
${JEDULE_SRC}
${BINDINGS_SRC}
${GTNETS_SRC}
${JEDULE_SRC}
+ ${JMSG_C_SRC}
+ ${JMSG_JAVA_SRC}
${LUA_SRC}
${MC_SRC}
${MSG_SRC}
${LUA_SRC}
${MC_SRC}
${MSG_SRC}
@@
-214,6
+225,8
@@
add_custom_target(dist-dir
COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_NAME}-${release_version}.tar.gz
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}
COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_NAME}-${release_version}.tar.gz
COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}
+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/doc/html/
+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/html/ ${PROJECT_NAME}-${release_version}/doc/html/
)
add_dependencies(dist-dir simgrid_documentation)
add_dependencies(dist-dir maintainer_files)
)
add_dependencies(dist-dir simgrid_documentation)
add_dependencies(dist-dir maintainer_files)
@@
-254,6
+267,7
@@
add_custom_command(
add_custom_target(dist
COMMENT "Removing the distribution directory"
DEPENDS ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz
add_custom_target(dist
COMMENT "Removing the distribution directory"
DEPENDS ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-${release_version}.tar.gz
+ COMMAND ${CMAKE_COMMAND} -E echo ${PROJECT_NAME}-${release_version} > ${CMAKE_BINARY_DIR}/VERSION
COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
)
COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
)
@@
-283,6
+297,9
@@
set(CMAKE_BINARY_TEST_DIR ${CMAKE_BINARY_DIR})
# Allow to test the "make dist"
add_custom_target(distcheck
# Allow to test the "make dist"
add_custom_target(distcheck
+ COMMAND ${CMAKE_COMMAND} -E echo "XXX compare archive with git repository"
+ COMMAND ${CMAKE_HOME_DIRECTORY}/tools/check_dist_archive -batch ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz
+
COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy"
COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}
COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy"
COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}