Use minor upgrade mechanism for updates, set installer versionautomatically

WixInstaller/Makefile

Index: WixInstaller/Makefile
===================================================================
--- a/WixInstaller/Makefile
+++ b/WixInstaller/Makefile
@@ -1,36 +1,39 @@
 #----------------------------------
 # Makefile for Microsoft NMAKE
 #
-# Call with no arguments to set the default target to all installers.
-#   nmake 
+# Call with only the version parameter to set the default target to all installers.
+#   nmake VERSION=1.2.3
 # Call with a definition of the NMAKE variable ARCH on the command line
-#   nmake ARCH=ia32
-#   nmake ARCH=x64
+#   nmake VERSION=1.2.3 ARCH=ia32
+#   nmake VERSION=1.2.3 ARCH=x64
 # If an architecture is specified, the default target is constrained to it.
 #----------------------------------
 
 .SUFFIXES: .msi .wixobj .wxs
 
-Build_Dir_common = ..\build\ # 
-Build_Dir_ia32 = ..\build\ia32\ # comment prevents newline 
+Build_Dir_common = ..\build\ #
+Build_Dir_ia32 = ..\build\ia32\ # comment prevents newline
 Build_Dir_x64  = ..\build\x64\ #
-Configuration = Release Production
-Version = 0.8.1
+Configuration = Release Test
+
+!ifndef VERSION
+!error VERSION parameter is required

[Eric, 2013/06/11 15:41:46]

Mandating a version number is a needless burden for the maintainer of the
installer (me, currently). I don't build releases each time I build installers
to test, which means I won't be running the build_release.py script each and
every time. This modification more-or-less presumes that the Makefile primarily
supports the release script. 

We need a default version number here. A default can use a very high build
number, such as 0.8.63333, that won't ever interfere with a release.
Alternately, we can cache the current build number in such a way that we don't
need to be calling 'hg' each time we make an installer.

[Wladimir Palant, 2013/06/12 09:46:34]

nmake VERSION=0.8.63333 doesn't look too complicated to me. But sure, we can
have VERSION default to 99.9 if you prefer.

[Eric, 2013/06/12 14:33:24]

I've been bitten by typos on the command line already. As a result, I rather
prefer things I can check out in the editor rather than hoping the command line
history has what I need.

+!endif
 
 #---------------------
 # Default Targets
-# 
+#
 # We change the default rule depending upon the ARCH (architecture) definition.
 #---------------------
 
-Installer_ia32 = $(Build_Dir_ia32)adblockplusie-$(Version)-en-us-ia32.msi 
-Installer_x64  = $(Build_Dir_x64)adblockplusie-$(Version)-en-us-x64.msi
-Setup = $(Build_Dir_common)setup-$(Version).exe 
+Installer_ia32 = $(Build_Dir_ia32)adblockplusie-$(VERSION)-en-us-ia32.msi
+Installer_x64  = $(Build_Dir_x64)adblockplusie-$(VERSION)-en-us-x64.msi
+Setup = $(Build_Dir_common)setup-$(VERSION).exe
 
 !ifndef ARCH
 default: $(Installer_ia32) $(Installer_x64)
 !elseif "$(ARCH)"=="ia32"
 default: $(Installer_ia32)
 !elseif "$(ARCH)"=="x64"
 default: $(Installer_x64)
 !else
@@ -38,52 +41,52 @@ default: $(Installer_x64)
 !endif
 
 all: ia32 x64 setup
 
 ia32: $(Installer_ia32)
 
 x64: $(Installer_x64)
 
-setup: $(Setup) 
+setup: $(Setup)
 
 #---------------------
-# candle .wxs --> .wixobj 
+# candle .wxs --> .wixobj
 #---------------------
 
-Candle = candle -nologo -dNoDefault -dVersion=$(Version) $(CANDLE_FLAGS) $(*F).wxs -out $@  
+Candle = candle -nologo -dNoDefault -dVersion=$(VERSION) "-dConfiguration=$(Configuration)" $(CANDLE_FLAGS) $(*F).wxs -out $@

[Eric, 2013/06/11 15:41:46]

No issue here with this modification, since we have a default configuration
declared.

 .wxs{$(Build_Dir_common)}.wixobj:
     $(Candle)
 .wxs{$(Build_Dir_ia32)}.wixobj:
     $(Candle) -arch x86
 .wxs{$(Build_Dir_x64)}.wixobj:
     $(Candle) -arch x64
 
-objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj 
-objects_ia32 = $(Build_Dir_ia32)adblockplusie.wixobj $(objects_common)  
+objects_common = $(Build_Dir_common)custom_WixUI_InstallDir.wixobj
+objects_ia32 = $(Build_Dir_ia32)adblockplusie.wixobj $(objects_common)
 objects_x64 = $(Build_Dir_x64)adblockplusie.wixobj $(objects_common)
 
 object_setup = $(Build_Dir_common)setup.wixobj
 $(object_setup): setup.wxs
     $(Candle) -ext WixBalExtension
 
 #---------------------
-# light .wixobj --> .msi 
+# light .wixobj --> .msi
 #---------------------
 
 Light = light -notidy -nologo -cultures:en-us -loc en-us.wxl -ext WixUIExtension -out $@
 
 $(Installer_ia32): $(objects_ia32) "..\build\ia32\$(Configuration)\AdblockPlus.dll"
     $(Light) $(objects_ia32)
 
 $(Installer_x64): $(objects_x64) "..\build\x64\$(Configuration)\AdblockPlusx64.dll"
-    $(Light) $(objects_x64) 
+    $(Light) $(objects_x64)
 
 #---------------------
-# light .wixobj --> .exe 
+# light .wixobj --> .exe
 #---------------------
 
 $(Setup): $(object_setup)
     $(Light) $(object_setup) -ext WixBalExtension
 
 #---------------------
 # msiexec .msi --> installed --> uninstalled
 #---------------------
@@ -99,18 +102,18 @@ install-x64: $(Installer_x64)
     call <<nmake_temporary.bat
 pushd $(Build_Dir_x64)
 msiexec /i $(**F) /l*v install.log
 popd
 <<
 
 uninstall:
     msiexec /x {4f27c814-5ee0-4b25-b3ab-3ad565551918}
-    
+
 install-setup: $(Setup)
     $(Setup)
 
 #---------------------
 # Miscellaneous
 #---------------------
 
 clean:
-    del $(objects_ia32) 
+    del $(objects_ia32)