diff options
| author | ruki <[email protected]> | 2023-11-13 22:41:32 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2023-11-13 22:41:32 +0800 |
| commit | 993d8b39a8bd1f59a5fd80c3615ce180b85cdf57 (patch) | |
| tree | 1a3df47d0cdd51577d3db2017a3a396a627f17e4 | |
| parent | 2578d5d05628efd0d8b98d90107e165aa71d2fb6 (diff) | |
fix specfile
| -rw-r--r-- | xmake/plugins/pack/nsis/main.lua | 11 | ||||
| -rw-r--r-- | xmake/scripts/xpack/nsis/makensis.nsi | 18 |
2 files changed, 11 insertions, 18 deletions
diff --git a/xmake/plugins/pack/nsis/main.lua b/xmake/plugins/pack/nsis/main.lua index 5e03b1709..f9d6c609b 100644 --- a/xmake/plugins/pack/nsis/main.lua +++ b/xmake/plugins/pack/nsis/main.lua @@ -76,16 +76,9 @@ function _pack_nsis(makensis, package, opt) end return value end) + io.cat(specfile) - -- get version - local version, version_build = package:version() - assert(version, "xpack(%s): version not found!", package:name()) - version = semver.new(version) - - -- generate specfile - print("xpack(%s)", package:name()) - print(" description: %s", package:description()) - print(" installcmd: ", package:script("installcmd")) + -- make package os.vrunv(makensis, {specfile}) end diff --git a/xmake/scripts/xpack/nsis/makensis.nsi b/xmake/scripts/xpack/nsis/makensis.nsi index 8e238e783..363e31069 100644 --- a/xmake/scripts/xpack/nsis/makensis.nsi +++ b/xmake/scripts/xpack/nsis/makensis.nsi @@ -90,16 +90,16 @@ ManifestDPIAware true !insertmacro MUI_LANGUAGE "English" ; set product information -VIProductVersion ${VERSION}.0 -VIFileVersion ${VERSION}.0 -VIAddVersionKey /LANG=0 ProductName ${PACKAGE_NAME} -VIAddVersionKey /LANG=0 Comments ${PACKAGE_DESCRIPTION} -VIAddVersionKey /LANG=0 CompanyName ${PACKAGE_COMPANY} -VIAddVersionKey /LANG=0 LegalCopyright ${PACKAGE_COPYRIGHT} +VIProductVersion "${VERSION}.0" +VIFileVersion "${VERSION}.0" +VIAddVersionKey /LANG=0 ProductName "${PACKAGE_NAME}" +VIAddVersionKey /LANG=0 Comments "${PACKAGE_DESCRIPTION}" +VIAddVersionKey /LANG=0 CompanyName "${PACKAGE_COMPANY}" +VIAddVersionKey /LANG=0 LegalCopyright "${PACKAGE_COPYRIGHT}" VIAddVersionKey /LANG=0 FileDescription "${PACKAGE_NAME} Installer - v${VERSION}" -VIAddVersionKey /LANG=0 OriginalFilename ${PACKAGE_FILENAME} -VIAddVersionKey /LANG=0 FileVersion ${VERSION_FULL} -VIAddVersionKey /LANG=0 ProductVersion ${VERSION_FULL} +VIAddVersionKey /LANG=0 OriginalFilename "${PACKAGE_FILENAME}" +VIAddVersionKey /LANG=0 FileVersion "${VERSION_FULL}" +VIAddVersionKey /LANG=0 ProductVersion "${VERSION_FULL}" ; set registry paths !define RegUninstall "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PACKAGE_NAME}" |