xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add install step for missing files for packaging 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7155 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
beaglejoe 2020-07-13 12:09:48 +00:00
parent 2d99e0544f
commit c95fd407d6
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -147,6 +147,13 @@ ADD_SUBDIRECTORY(cmake)
# Update (and then install) version.xml from their respective version.
SD_UPDATE_SETTINGS_VERSION()
IF(MSVC)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/faq/faq.html DESTINATION ./doc)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/userman/how_to_drive.html DESTINATION ./doc)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc/userman/images/ DESTINATION ./doc/images/)
ENDIF(MSVC)
# Usefull for using an installation of SD as a robot development framework without building it.
INSTALL_SD_CMAKE()

3
data/data/img/CMakeLists.txt
View File

@ -2,9 +2,10 @@ INCLUDE(../../../cmake/macros.cmake)
FILE(GLOB png *.png)
FILE(GLOB jpg *.jpg)
FILE(GLOB bmp *.bmp)
IF(OPTION_OSGGRAPH)
ADD_SUBDIRECTORY(osg-hud)
ENDIF(OPTION_OSGGRAPH)
SD_INSTALL_FILES(DATA data/img FILES ${png} ${jpg})
SD_INSTALL_FILES(DATA data/img FILES ${png} ${jpg} ${bmp})

5
packaging/windows/speed-dreams-base.nsi
View File

@ -134,10 +134,7 @@ Section "!Base System" SEC01
; Documentation
SetOutPath "$INSTDIR\doc"
File "..\..\doc\faq\faq.html"
SetOutPath "$INSTDIR\doc"
File /r /x .svn "..\..\doc\userman\*.*"
File /r /x .svn "${BUILD_INST_DIR}\doc\*.*"
; Base robots binaries
SetOutPath "$INSTDIR\lib\drivers\human"

8
packaging/windows/speed-dreams.nsh.in
View File

@ -86,14 +86,14 @@ SetCompressor /SOLID lzma ; 1-block compression, smaller but longer (generation,
!include "MUI.nsh" ; TODO: Move to MUI2
!define MUI_HEADERIMAGE
!define MUI_HEADERIMAGE_BITMAP "..\..\data\data\img\header.bmp"
!define MUI_HEADERIMAGE_BITMAP "${BUILD_INST_DIR}\data\data\img\header.bmp"
!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\data\data\img\header-vert.bmp"
!define MUI_WELCOMEFINISHPAGE_BITMAP "${BUILD_INST_DIR}\data\data\img\header-vert.bmp"
!define MUI_ABORTWARNING
!define MUI_ICON "..\..\data\data\icons\icon.ico"
!define MUI_UNICON "..\..\data\data\icons\icon.ico"
!define MUI_ICON "${BUILD_INST_DIR}\data\data\icons\icon.ico"
!define MUI_UNICON "${BUILD_INST_DIR}\data\data\icons\icon.ico"
!define MUI_LICENSEPAGE_CHECKBOX