[FIX] Fix date widgets styling

[odoo/odoo.git] / setup.nsi

diff --git a/setup.nsi b/setup.nsi
index 0aa0687..0ea37b0 100644 (file)
--- a/setup.nsi
+++ b/setup.nsi
@@ -30,16 +30,24 @@
 !include 'Sections.nsh'\r
 \r
 !define PUBLISHER 'OpenERP S.A.'\r
-!define MAJOR_VERSION '6.0'\r
-!define MINOR_VERSION '0.0'\r
-!define REVISION_VERSION 'RC2-test'\r
+\r
+!ifndef MAJOR_VERSION\r
+    !define MAJOR_VERSION '6'\r
+!endif\r
+!ifndef MINOR_VERSION\r
+    !define MINOR_VERSION '0'\r
+!endif\r
 !ifndef REVISION_VERSION\r
-    !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}"\r
+    !define REVISION_VERSION '0'\r
+!endif\r
+!ifndef BUILD_VERSION\r
+    !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"\r
 !else\r
-    !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}-${REVISION_VERSION}"\r
+    !define VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}-${BUILD_VERSION}"\r
 !endif\r
+\r
 !define PRODUCT_NAME "OpenERP Server"\r
-!define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}"\r
+!define DISPLAY_NAME "${PRODUCT_NAME} ${MAJOR_VERSION}.${MINOR_VERSION}"\r
 \r
 !define UNINSTALL_REGISTRY_ROOT HKLM\r
 !define UNINSTALL_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${DISPLAY_NAME}"\r
@@ -60,20 +68,20 @@ ShowInstDetails show
 \r
 XPStyle on\r
 \r
-InstallDir "$PROGRAMFILES\OpenERP ${MAJOR_VERSION}\Server"\r
+InstallDir "$PROGRAMFILES\OpenERP ${MAJOR_VERSION}.${MINOR_VERSION}\Server"\r
 InstallDirRegKey HKCU "${REGISTRY_KEY}" ""\r
 \r
 BrandingText '${PRODUCT_NAME} ${VERSION}'\r
 \r
 RequestExecutionLevel admin\r
 \r
-VIAddVersionKey "ProductName" "${PRODUCT_NAME}"\r
-VIAddVersionKey "CompanyName" "${PUBLISHER}"\r
-VIAddVersionKey "FileDescription" "Installer of ${DISPLAY_NAME}" \r
-VIAddVersionKey "LegalCopyright" "${PUBLISHER}"\r
-VIAddVersionKey "LegalTrademark" "OpenERP is a trademark of ${PUBLISHER}"\r
-VIAddVersionKey "FileVersion" "${MAJOR_VERSION}"\r
-VIProductVersion "${VERSION}"\r
+#VIAddVersionKey "ProductName" "${PRODUCT_NAME}"\r
+#VIAddVersionKey "CompanyName" "${PUBLISHER}"\r
+#VIAddVersionKey "FileDescription" "Installer of ${DISPLAY_NAME}" \r
+#VIAddVersionKey "LegalCopyright" "${PUBLISHER}"\r
+#VIAddVersionKey "LegalTrademark" "OpenERP is a trademark of ${PUBLISHER}"\r
+#VIAddVersionKey "FileVersion" "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"\r
+#VIProductVersion "${MAJOR_VERSION}.${MINOR_VERSION}.${REVISION_VERSION}"\r
 \r
 !insertmacro GetParameters\r
 !insertmacro GetOptions\r
@@ -106,7 +114,7 @@ Var STARTMENU_FOLDER
 !define MUI_HEADER_TRANSPARENT_TEXT ""\r
 \r
 !insertmacro MUI_PAGE_WELCOME\r
-!insertmacro MUI_PAGE_LICENSE "doc\License.rtf"\r
+!insertmacro MUI_PAGE_LICENSE ".\LICENSE"\r
 !define MUI_COMPONENTSPAGE_SMALLDESC\r
 !insertmacro MUI_PAGE_DIRECTORY\r
 Page Custom ShowPostgreSQL LeavePostgreSQL\r
@@ -202,6 +210,7 @@ Section OpenERP_Server SectionOpenERP_Server
     WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_user" $TextPostgreSQLUsername\r
     WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_password" $TextPostgreSQLPassword\r
     WriteIniStr "$INSTDIR\openerp-server.conf" "options" "db_port" $TextPostgreSQLPort\r
+    WriteIniStr "$INSTDIR\openerp-server.conf" "options" "pg_path" "$INSTDIR\PostgreSQL\bin"\r
 \r
     nsExec::Exec '"$INSTDIR\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\openerp-server.log" -s'\r
     nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install'\r
@@ -216,11 +225,11 @@ Section -Post
     WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "UninstallString" "$INSTDIR\Uninstall.exe"\r
     WriteRegExpandStr HKLM "${UNINSTALL_REGISTRY_KEY}" "InstallLocation" "$INSTDIR"\r
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayName" "${DISPLAY_NAME}"\r
-    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${MAJOR_VERSION}"\r
+    WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "DisplayVersion" "${MAJOR_VERSION}.${MINOR_VERSION}"\r
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "Publisher" "${PUBLISHER}"\r
     WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "Version" "${VERSION}"\r
-    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}"\r
-    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${MINOR_VERSION}"\r
+    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMajor" "${MAJOR_VERSION}.${MINOR_VERSION}"\r
+    WriteRegDWORD HKLM     "${UNINSTALL_REGISTRY_KEY}" "VersionMinor" "${REVISION_VERSION}"\r
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "support@openerp.com"\r
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "HelpTelephone" "+32.81.81.37.00"\r
     WriteRegStr HKLM       "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "http://www.openerp.com"\r