# HG changeset patch
# User Dan
# Date 1261047396 18000
# Node ID 37824b18ff73a6042e51150e1dbf750f978520a3
# Parent  6016fd9e848f661014a3f66974bbed2b27e68932
Updated version numbering to be more easily controllable from the Makefile

diff -r 6016fd9e848f -r 37824b18ff73 Makefile
--- a/Makefile	Tue Dec 08 02:25:33 2009 -0500
+++ b/Makefile	Thu Dec 17 05:56:36 2009 -0500
@@ -1,5 +1,9 @@
 EXPERIENCEUI=/public/exui/Contrib/ExperienceUI
 ENANOHG=/var/www/html/enano-1.1/repo
+# ONLY use n.n.n here! Leave prefixes like -hg for ENANO_VERSION_APPEND.
+ENANO_VERSION=1.1.7
+ENANO_VERSION_APPEND=
 
 all:
-	makensis "-DXPUI_SYSDIR=$(EXPERIENCEUI)" "-DENANO_ROOT=$(ENANOHG)" enano-bundle.nsi
+	makensis "-DXPUI_SYSDIR=$(EXPERIENCEUI)" "-DENANO_ROOT=$(ENANOHG)" "-DPRODUCT_VERSION=$(ENANO_VERSION)" \
+                 "-DPRODUCT_VERSION_APPEND=$(ENANO_VERSION_APPEND)" enano-bundle.nsi
diff -r 6016fd9e848f -r 37824b18ff73 enano-bundle.nsi
--- a/enano-bundle.nsi	Tue Dec 08 02:25:33 2009 -0500
+++ b/enano-bundle.nsi	Thu Dec 17 05:56:36 2009 -0500
@@ -5,6 +5,9 @@
 !ifndef PRODUCT_VERSION
 !define PRODUCT_VERSION "1.1.6"
 !endif
+!ifndef PRODUCT_VERSION_APPEND
+!define PRODUCT_VERSION_APPEND ""
+!endif
 !define PRODUCT_PUBLISHER "Enano CMS Project"
 !define PRODUCT_WEB_SITE "http://enanocms.org"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -128,8 +131,8 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME}"
-Caption "${PRODUCT_NAME} ${PRODUCT_VERSION} Bitnami installer"
-OutFile "enano-${PRODUCT_VERSION}-bitnami-setup.exe"
+Caption "${PRODUCT_NAME} ${PRODUCT_VERSION}${PRODUCT_VERSION_APPEND} Bitnami installer"
+OutFile "enano-${PRODUCT_VERSION}${PRODUCT_VERSION_APPEND}-bitnami-setup.exe"
 InstallDir "$PROGRAMFILES\Enano CMS"
 ShowInstDetails show
 ShowUnInstDetails show
@@ -248,7 +251,7 @@
 Section -Post
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\apps\${PRODUCT_SHORTNAME}\uninstall.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}${PRODUCT_VERSION_APPEND}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
 SectionEnd
@@ -347,4 +350,4 @@
 VIAddVersionKey /LANG=1033 "Publisher Name" "Neal Gompa (King InuYasha), Enano CMS Project"
 VIAddVersionKey /LANG=1033 "LegalCopyright" "©2009 Enano CMS Project"
 VIAddVersionKey /LANG=1033 "FileDescription" "Enano - The CMS that focuses on what matters most: content."
-VIAddVersionKey /LANG=1033 "FileVersion" "${PRODUCT_VERSION}"
+VIAddVersionKey /LANG=1033 "FileVersion" "${PRODUCT_VERSION}${PRODUCT_VERSION_APPEND}"