rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

GCS/Windows installer: fixed working directory in shortcuts, added shortcut comments.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2353 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
osnwt 2011-01-09 14:13:48 +00:00 committed by osnwt
parent 30b165c302
commit 9827746847
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ground/packaging/winx86/nsis/OpenPilotGCS.nsh
View File

@ -3,9 +3,9 @@
#
; Installer file name
OutFile "OpenPilotGCS-XXXX-install.exe"
!define OUT_FILE "OpenPilotGCS-XXXX-install.exe"
; Installer version info
VIProductVersion "0.0.0.0"
VIAddVersionKey "FileVersion" "0.0.0.0"
VIAddVersionKey "Comments" "OpenPilot GCS Installer. Unknown product revision."
!define PRODUCT_VERSION "0.0.0.0"
!define FILE_VERSION "0.0.0.0"
!define BUILD_DESCRIPTION "Unknown revision."

31
ground/packaging/winx86/nsis/OpenPilotGCS.nsi
View File

@ -47,18 +47,26 @@
; Read automatically generated version info
!include "OpenPilotGCS.nsh"
; VIProductVersion "0.0.0.0"
; VIAddVersionKey "FileVersion" "0.0.0.0"
; VIAddVersionKey "Comments" "OpenPilot GCS Installer"
VIAddVersionKey "ProductName" "OpenPilot GCS Installer"
; !define OUT_FILE "OpenPilotGCS-XXXX-install.exe"
; !define PRODUCT_VERSION "0.0.0.0"
; !define FILE_VERSION "0.0.0.0"
; !define BUILD_DESCRIPTION "Unknown revision."
!define PRODUCT_NAME "OpenPilot GCS"
!define INSTALLER_NAME "OpenPilot GCS Installer"
VIProductVersion ${PRODUCT_VERSION}
VIAddVersionKey "ProductName" "${INSTALLER_NAME}"
VIAddVersionKey "FileVersion" ${FILE_VERSION}
VIAddVersionKey "Comments" "${INSTALLER_NAME}. ${BUILD_DESCRIPTION}"
VIAddVersionKey "CompanyName" "The OpenPilot Team, http://www.openpilot.org"
VIAddVersionKey "LegalTrademarks" "OpenPilot GCS is a trademark of The OpenPilot Team"
VIAddVersionKey "LegalTrademarks" "${PRODUCT_NAME} is a trademark of The OpenPilot Team"
VIAddVersionKey "LegalCopyright" "© 2010-2011 The OpenPilot Team"
VIAddVersionKey "FileDescription" "OpenPilot GCS Installer"
VIAddVersionKey "FileDescription" "${INSTALLER_NAME}"
; Program name and installer file
Name "OpenPilot GCS"
; OutFile "OpenPilotGCS-1234-install.exe"
Name "${PRODUCT_NAME}"
OutFile "${OUT_FILE}"
;--------------------------------
; Misc options
@ -181,10 +189,13 @@ SectionEnd
Section "Shortcuts" InSecShortcuts
; Create desktop and start menu shortcuts
SetOutPath "$INSTDIR"
CreateDirectory "$SMPROGRAMS\OpenPilot"
CreateShortCut "$SMPROGRAMS\OpenPilot\OpenPilot GCS.lnk" "$INSTDIR\bin\openpilotgcs.exe" "" "$INSTDIR\bin\openpilotgcs.exe" 0
CreateShortCut "$SMPROGRAMS\OpenPilot\OpenPilot GCS.lnk" "$INSTDIR\bin\openpilotgcs.exe" \
"" "$INSTDIR\bin\openpilotgcs.exe" 0 "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}. ${BUILD_DESCRIPTION}"
CreateShortCut "$DESKTOP\OpenPilot GCS.lnk" "$INSTDIR\bin\openpilotgcs.exe" \
"" "$INSTDIR\bin\openpilotgcs.exe" 0 "" "" "${PRODUCT_NAME} ${PRODUCT_VERSION}. ${BUILD_DESCRIPTION}"
CreateShortCut "$SMPROGRAMS\OpenPilot\Uninstall.lnk" "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0
CreateShortCut "$DESKTOP\OpenPilot GCS.lnk" "$INSTDIR\bin\openpilotgcs.exe" "" "$INSTDIR\bin\openpilotgcs.exe" 0
SectionEnd
Section ; create uninstall info

11
ground/packaging/winx86/winx86.pro
View File

@ -53,17 +53,16 @@ equals(copydata, 1):win32:CONFIG(release, debug|release) {
NSIS_NSH = $$targetPath(nsis/OpenPilotGCS.nsh)
nsis.commands += \
@echo $$LITERAL_HASH > $$NSIS_TPL $$addNewline() \
@echo $$LITERAL_HASH This file contains defaults and will be rebuilt automatically >> $$NSIS_TPL $$addNewline() \
@echo $$LITERAL_HASH Autogenerated file, do not modify >> $$NSIS_TPL $$addNewline() \
@echo $$LITERAL_HASH >> $$NSIS_TPL $$addNewline() \
@echo ; >> $$NSIS_TPL $$addNewline() \
@echo ; Installer file name >> $$NSIS_TPL $$addNewline() \
@echo OutFile \"OpenPilotGCS-\$\$WCREV\$\$-install.exe\" >> $$NSIS_TPL $$addNewline() \
@echo !define OUT_FILE \"OpenPilotGCS-\$\$WCREV\$\$-install.exe\" >> $$NSIS_TPL $$addNewline() \
@echo ; >> $$NSIS_TPL $$addNewline() \
@echo ; Installer version info >> $$NSIS_TPL $$addNewline() \
@echo VIProductVersion \"$${QT_VERSION}.\$\$WCREV\$\$\" >> $$NSIS_TPL $$addNewline() \
@echo VIAddVersionKey \"FileVersion\" \"$${QT_VERSION}.\$\$WCREV\$\$\" >> $$NSIS_TPL $$addNewline() \
@echo VIAddVersionKey \"Comments\" \
\"OpenPilot GCS Installer. Product revision \$\$WCREV\$\$ committed on \$\$WCDATE\$\$. \
@echo !define PRODUCT_VERSION \"$${QT_VERSION}.\$\$WCREV\$\$\" >> $$NSIS_TPL $$addNewline() \
@echo !define FILE_VERSION \"$${QT_VERSION}.\$\$WCREV\$\$\" >> $$NSIS_TPL $$addNewline() \
@echo !define BUILD_DESCRIPTION \"Revision \$\$WCREV\$\$ committed on \$\$WCDATE\$\$. \
Built on \$\$WCNOW\$\$ from \$\$WCURL\$\$ using Qt $${QT_VERSION}.\" >> $$NSIS_TPL $$addNewline() \
$$SUBWCREV_EXE $$SVN_SOURCE_ROOT $$NSIS_TPL $$NSIS_NSH $$addNewline() \
-@$(DEL_FILE) $$NSIS_TPL $$addNewline()