diff --git a/direct/src/plugin_installer/make_installer.py b/direct/src/plugin_installer/make_installer.py index 7914398bc3..02ed3b9d5e 100755 --- a/direct/src/plugin_installer/make_installer.py +++ b/direct/src/plugin_installer/make_installer.py @@ -62,7 +62,7 @@ parser.add_option('', '--mssdk', dest = 'mssdk', this_dir = os.path.split(sys.argv[0])[0] -assert options.version != None, "A version number must be supplied!" +assert options.version, "A version number must be supplied!" ############################################################################## # @@ -413,6 +413,7 @@ def makeInstaller(): CMD += '/DPRODUCT_NAME_SHORT="' + options.short_name + '" ' CMD += '/DPRODUCT_PUBLISHER="' + options.publisher + '" ' CMD += '/DPRODUCT_WEB_SITE="' + options.website + '" ' + CMD += '/DPRODUCT_VERSION="' + options.version + '" ' CMD += '/DINSTALL_DIR="' + options.install_dir + '" ' CMD += '/DLICENSE_FILE="' + options.license + '" ' CMD += '/DOCX="' + ocx + '" ' diff --git a/direct/src/plugin_installer/p3d_installer.nsi b/direct/src/plugin_installer/p3d_installer.nsi index e2e2fd5a62..59b7e76c1f 100755 --- a/direct/src/plugin_installer/p3d_installer.nsi +++ b/direct/src/plugin_installer/p3d_installer.nsi @@ -131,7 +131,7 @@ Section -Post WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\${OCX}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" SectionEnd