Browse Source

version for ms too

David Rose 16 years ago
parent
commit
0b80f4f933

+ 2 - 1
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]
 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_NAME_SHORT="' + options.short_name + '" '
         CMD += '/DPRODUCT_PUBLISHER="' + options.publisher + '" '
         CMD += '/DPRODUCT_PUBLISHER="' + options.publisher + '" '
         CMD += '/DPRODUCT_WEB_SITE="' + options.website + '" '
         CMD += '/DPRODUCT_WEB_SITE="' + options.website + '" '
+        CMD += '/DPRODUCT_VERSION="' + options.version + '" '
         CMD += '/DINSTALL_DIR="' + options.install_dir + '" '
         CMD += '/DINSTALL_DIR="' + options.install_dir + '" '
         CMD += '/DLICENSE_FILE="' + options.license + '" '
         CMD += '/DLICENSE_FILE="' + options.license + '" '
         CMD += '/DOCX="' + ocx + '" '
         CMD += '/DOCX="' + ocx + '" '

+ 1 - 1
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}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
   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}" "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}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 SectionEnd
 SectionEnd