speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions 5

Windows packaging improvements

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7450 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 6b8573a3de6ec8822663b1f54934ec25da793275
Former-commit-id: 3eaed46c97959eb14b8c1bdc79a843b7c7f7ce3c
This commit is contained in:
beaglejoe 2021-04-26 19:38:27 +00:00
parent 6b2fdf1c7a
commit 1cd7e732c3
2 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
cmake/packagemaker-nsis.cmake
View file

@ -30,31 +30,31 @@ Message(STATUS "NSIS_INET_PLUGIN = ${NSIS_INET_PLUGIN}")
if(NSIS_FOUND AND NSIS_MAKE_EXE AND NSIS_INET_PLUGIN) if(NSIS_FOUND AND NSIS_MAKE_EXE AND NSIS_INET_PLUGIN)
FILE(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_PREFIX}" NSIS_INSTALL_DIR) FILE(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_PREFIX}" NSIS_INSTALL_DIR)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/readme_for_user.txt" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/packaging/windows/readme_for_user.txt"
"${CMAKE_CURRENT_BINARY_DIR}/packaging/readme_for_user.txt" COPYONLY) "${CMAKE_BINARY_DIR}/packaging/readme_for_user.txt" COPYONLY)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/speed-dreams.ini" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/packaging/windows/speed-dreams.ini"
"${CMAKE_CURRENT_BINARY_DIR}/packaging/speed-dreams.ini" COPYONLY) "${CMAKE_BINARY_DIR}/packaging/speed-dreams.ini" COPYONLY)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/speed-dreams.nsh.in" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/packaging/windows/speed-dreams.nsh.in"
"${CMAKE_CURRENT_BINARY_DIR}/packaging/speed-dreams.nsh" @ONLY) "${CMAKE_BINARY_DIR}/packaging/speed-dreams.nsh" @ONLY)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/speed-dreams-base.nsi" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/packaging/windows/speed-dreams-base.nsi"
"${CMAKE_CURRENT_BINARY_DIR}/packaging/speed-dreams-base.nsi" @ONLY) "${CMAKE_BINARY_DIR}/packaging/speed-dreams-base.nsi" @ONLY)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/packaging/windows/speed-dreams-hq-cars-and-tracks.nsi"
"${CMAKE_CURRENT_BINARY_DIR}/packaging/speed-dreams-hq-cars-and-tracks.nsi" @ONLY) "${CMAKE_BINARY_DIR}/packaging/speed-dreams-hq-cars-and-tracks.nsi" @ONLY)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/packaging/windows/speed-dreams-more-hq-cars-and-tracks.nsi"
"${CMAKE_CURRENT_BINARY_DIR}/packaging/speed-dreams-more-hq-cars-and-tracks.nsi" @ONLY) "${CMAKE_BINARY_DIR}/packaging/speed-dreams-more-hq-cars-and-tracks.nsi" @ONLY)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/packaging/windows/speed-dreams-wip-cars-and-tracks.nsi"
"${CMAKE_CURRENT_BINARY_DIR}/packaging/speed-dreams-wip-cars-and-tracks.nsi" @ONLY) "${CMAKE_BINARY_DIR}/packaging/speed-dreams-wip-cars-and-tracks.nsi" @ONLY)
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/packaging/windows/speed-dreams-unmaintained.nsi" CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/packaging/windows/speed-dreams-unmaintained.nsi"
"${CMAKE_CURRENT_BINARY_DIR}/packaging/speed-dreams-unmaintained.nsi" @ONLY) "${CMAKE_BINARY_DIR}/packaging/speed-dreams-unmaintained.nsi" @ONLY)
#ADD_CUSTOM_TARGET(PACKAGE_BASE DEPENDS INSTALL) #ADD_CUSTOM_TARGET(PACKAGE_BASE DEPENDS INSTALL)
# can't depend on built-in target INSTALL, so we ADD_CUSTOM_COMMAND # can't depend on built-in target INSTALL, so we ADD_CUSTOM_COMMAND
@ -76,37 +76,43 @@ if(NSIS_FOUND AND NSIS_MAKE_EXE AND NSIS_INET_PLUGIN)
ADD_CUSTOM_COMMAND(TARGET PACKING_INSTALL ADD_CUSTOM_COMMAND(TARGET PACKING_INSTALL
COMMAND "${CMAKE_COMMAND}" --build . --target INSTALL --config $<CONFIG> COMMAND "${CMAKE_COMMAND}" --build . --target INSTALL --config $<CONFIG>
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Building INSTALL...") COMMENT "Building INSTALL...")
ADD_CUSTOM_COMMAND(TARGET PACKAGE_BASE ADD_CUSTOM_COMMAND(TARGET PACKAGE_BASE
COMMAND ${NSIS_MAKE_EXE} speed-dreams-base.nsi COMMAND ${NSIS_MAKE_EXE} packaging/speed-dreams-base.nsi
WORKING_DIRECTORY packaging WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Building base package...") COMMENT "Building base package...")
ADD_CUSTOM_COMMAND(TARGET PACKAGE_HQ ADD_CUSTOM_COMMAND(TARGET PACKAGE_HQ
COMMAND ${NSIS_MAKE_EXE} speed-dreams-hq-cars-and-tracks.nsi COMMAND ${NSIS_MAKE_EXE} packaging/speed-dreams-hq-cars-and-tracks.nsi
WORKING_DIRECTORY packaging WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Building HQ package...") COMMENT "Building HQ package...")
ADD_CUSTOM_COMMAND(TARGET PACKAGE_MORE_HQ ADD_CUSTOM_COMMAND(TARGET PACKAGE_MORE_HQ
COMMAND ${NSIS_MAKE_EXE} speed-dreams-more-hq-cars-and-tracks.nsi COMMAND ${NSIS_MAKE_EXE} packaging/speed-dreams-more-hq-cars-and-tracks.nsi
WORKING_DIRECTORY packaging WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Building More HQ package...") COMMENT "Building More HQ package...")
ADD_CUSTOM_COMMAND(TARGET PACKAGE_WIP ADD_CUSTOM_COMMAND(TARGET PACKAGE_WIP
COMMAND ${NSIS_MAKE_EXE} speed-dreams-wip-cars-and-tracks.nsi COMMAND ${NSIS_MAKE_EXE} packaging/speed-dreams-wip-cars-and-tracks.nsi
WORKING_DIRECTORY packaging WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Building WIP package...") COMMENT "Building WIP package...")
ADD_CUSTOM_COMMAND(TARGET PACKAGE_UNMAINTAINED ADD_CUSTOM_COMMAND(TARGET PACKAGE_UNMAINTAINED
COMMAND ${NSIS_MAKE_EXE} speed-dreams-unmaintained.nsi COMMAND ${NSIS_MAKE_EXE} packaging/speed-dreams-unmaintained.nsi
WORKING_DIRECTORY packaging WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Building unmaintained package...") COMMENT "Building unmaintained package...")
# Make sure that SD_PACKAGEDIR is not empty or PACKAGE_MKDIR will fail.
# Treat empty string as current directory
if(SD_PACKAGEDIR STREQUAL "")
set(SD_PACKAGEDIR "." CACHE PATH "Location for the created installers" FORCE)
endif(SD_PACKAGEDIR STREQUAL "")
ADD_CUSTOM_COMMAND(TARGET PACKAGE_MKDIR ADD_CUSTOM_COMMAND(TARGET PACKAGE_MKDIR
COMMAND "${CMAKE_COMMAND}" -E make_directory ${SD_PACKAGEDIR} COMMAND "${CMAKE_COMMAND}" -E make_directory ${SD_PACKAGEDIR}
WORKING_DIRECTORY packaging WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMENT "Create ${SD_PACKAGEDIR} directory for Packages dir") COMMENT "Create ${SD_PACKAGEDIR} directory for Packages dir")
else(NSIS_FOUND AND NSIS_MAKE_EXE AND NSIS_INET_PLUGIN) else(NSIS_FOUND AND NSIS_MAKE_EXE AND NSIS_INET_PLUGIN)

2
packaging/CMakeLists.txt
View file

@ -24,7 +24,7 @@
#============================================================================== #==============================================================================
INCLUDE(../cmake/macros.cmake) INCLUDE(../cmake/macros.cmake)
SET(SD_PACKAGEDIR "../packages" CACHE PATH "Location for the created installers") SET(SD_PACKAGEDIR "${CMAKE_BINARY_DIR}/packages" CACHE PATH "Location for the created installers")
MARK_AS_ADVANCED(SD_PACKAGEDIR) MARK_AS_ADVANCED(SD_PACKAGEDIR)
IF(OPTION_OSGGRAPH) IF(OPTION_OSGGRAPH)