diff options
| author | ruki <[email protected]> | 2023-11-14 00:57:41 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-11-14 00:57:41 +0800 |
| commit | 6a3e7b08da3e333b0a63b4230f5dbf79df684728 (patch) | |
| tree | 1c55128db8a0106c657cacad9fa7868aed19f2fb /xmake/scripts | |
| parent | ed01c2796c2485eb5a9ee6935605985bea6ad5aa (diff) | |
fix unknown vars
Diffstat (limited to 'xmake/scripts')
| -rw-r--r-- | xmake/scripts/xpack/nsis/makensis.nsi | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/xmake/scripts/xpack/nsis/makensis.nsi b/xmake/scripts/xpack/nsis/makensis.nsi index 358eee744..856ebffd1 100644 --- a/xmake/scripts/xpack/nsis/makensis.nsi +++ b/xmake/scripts/xpack/nsis/makensis.nsi @@ -10,8 +10,12 @@ !include "UAC.nsh" ; the version information -!define VERSION ${PACKAGE_VERSION} -!define VERSION_FULL ${PACKAGE_VERSION}+${PACKAGE_VERSION_BUILD} +!define VERSION "${PACKAGE_VERSION}" +!if "${PACKAGE_VERSION_BUILD}" != "" +!define VERSION_FULL "${PACKAGE_VERSION}+${PACKAGE_VERSION_BUILD}" +!else +!define VERSION_FULL "${PACKAGE_VERSION}" +!endif ; set the package name Name "${PACKAGE_NAME} - v${VERSION}" @@ -194,7 +198,7 @@ Section "${PACKAGE_NAME} (required)" InstallExeutable ; Write the uninstall keys for Windows !macro AddReg RootKey WriteRegStr ${RootKey} ${RegUninstall} "NoAdmin" "$NOADMIN" - WriteRegStr ${RootKey} ${RegUninstall} "DisplayName" "${PACKAGE_NAME} (${PACAKGE_ARCH})" + WriteRegStr ${RootKey} ${RegUninstall} "DisplayName" "${PACKAGE_NAME} (${PACKAGE_ARCH})" WriteRegStr ${RootKey} ${RegUninstall} "DisplayIcon" '"$InstDir\${PACKAGE_FILENAME}"' WriteRegStr ${RootKey} ${RegUninstall} "Comments" "${PACKAGE_DESCRIPTION}" WriteRegStr ${RootKey} ${RegUninstall} "Publisher" "${PACKAGE_COPYRIGHT}" @@ -281,9 +285,6 @@ Section "Uninstall" ; add uninstall commands ${PACKAGE_UNINSTALLCMDS} - ; remove directories used - RMDir /r "$InstDir" - ; clean regs ${If} $NOADMIN == "false" DeleteRegKey ${HKLM} ${RegUninstall} |