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

Add install step for missing files for packaging

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

Former-commit-id: 5b99038053fd1a7afe2d49002de484b6f9bfb044
Former-commit-id: a0d89099d1de7c11258463c042348d6cfaa6495c
This commit is contained in:
beaglejoe 2020-07-13 12:09:48 +00:00
parent 8b3c152f22
commit c8c7cbd950
3 changed files with 12 additions and 8 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. # Update (and then install) version.xml from their respective version.
SD_UPDATE_SETTINGS_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. # Usefull for using an installation of SD as a robot development framework without building it.
INSTALL_SD_CMAKE() INSTALL_SD_CMAKE()

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

@ -134,10 +134,7 @@ Section "!Base System" SEC01
; Documentation ; Documentation
SetOutPath "$INSTDIR\doc" SetOutPath "$INSTDIR\doc"
File "..\..\doc\faq\faq.html" File /r /x .svn "${BUILD_INST_DIR}\doc\*.*"
SetOutPath "$INSTDIR\doc"
File /r /x .svn "..\..\doc\userman\*.*"
; Base robots binaries ; Base robots binaries
SetOutPath "$INSTDIR\lib\drivers\human" 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 !include "MUI.nsh" ; TODO: Move to MUI2
!define MUI_HEADERIMAGE !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_ABORTWARNING
!define MUI_ICON "..\..\data\data\icons\icon.ico" !define MUI_ICON "${BUILD_INST_DIR}\data\data\icons\icon.ico"
!define MUI_UNICON "..\..\data\data\icons\icon.ico" !define MUI_UNICON "${BUILD_INST_DIR}\data\data\icons\icon.ico"
!define MUI_LICENSEPAGE_CHECKBOX !define MUI_LICENSEPAGE_CHECKBOX