From 39aeecb8a72343bcb0a5af7029a7307b81b928a1 Mon Sep 17 00:00:00 2001
From: Damian Minkov <damencho@jitsi.org>
Date: Mon, 26 Nov 2012 14:12:56 +0000
Subject: [PATCH] Changes product version and manufacturer of run exe and setup
 when building windows installers.

---
 resources/install/build.xml                     | 16 +++++++++++++++-
 resources/install/windows/installer-windows.wxs |  8 ++++----
 src/native/windows/run/Makefile                 |  3 ++-
 src/native/windows/run/run.rc                   |  4 ++--
 src/native/windows/setup/Makefile               |  3 ++-
 src/native/windows/setup/setup.rc               |  4 ++--
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 71b782088..3b5bc6a1b 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -405,6 +405,7 @@
             <arg value="PRODUCTNAME=${application.name}" />
             <arg value="MINGW_HOME=${mingw.home}" />
             <arg value="TARGET_DIR=${light.dir}" />
+            <arg value="PRODUCTBUILDVERSION=${sip-communicator.version}" />
         </exec>
         <antcall target="wix-sign-file">
             <param name="file.to.sign" value="${light.dir}/run.exe"/>
@@ -624,6 +625,7 @@
             <env key="PATH" path="${mingw.home}/bin;${env.PATH}" />
             <arg value="MINGW_HOME=${mingw.home}" />
             <arg value="TARGET_DIR=${windows.app.dir}/tmp" />
+            <arg value="PRODUCTBUILDVERSION=${sip-communicator.version}" />
         </exec>
         <antcall target="wix-sign-file">
             <param name="file.to.sign" value="${windows.app.dir}\tmp\setup.exe"/>
@@ -641,10 +643,21 @@
     </target>
 
     <target name="build-installation-wix-msi" if="wix.store.msi">
+
+        <!-- if application publisher is not set use application name -->
+        <condition property="application.publisher"
+                   value="${application.name}">
+            <not>
+                <isset property="application.publisher" />
+            </not>
+        </condition>
+
         <!-- Finish the preparation for the execution of candle.exe -->
         <filter token="APP_EMAIL" value="${application.email}" />
         <filter token="APP_NAME" value="${application.name}" />
         <filter token="APP_WEB" value="${application.web}" />
+        <filter token="APP_PUBLISHER" value="${application.publisher}" />
+        <filter token="PRODUCTBUILDVERSION" value="${sip-communicator.version}" />
         <filter token="WelcomeText1" value="${installer.welcome.wtext1}" />
         <filter token="WelcomeText2" value="${installer.welcome.wtext2}" />
         <filter token="WelcomeText3" value="${installer.welcome.wtext3}" />
@@ -881,6 +894,7 @@
             <arg value="TARGET_DIR=${windows.app.dir}/tmp" />
             <arg value="PACKAGECODE=${old.packagecode}" />
             <arg value="PACKAGESIZE=${old.packagesize}" />
+            <arg value="PRODUCTBUILDVERSION=${sip-communicator.version}" />
         </exec>
         <antcall target="wix-sign-file">
             <param name="file.to.sign" value="${windows.app.dir}\tmp\setup.exe"/>
@@ -1370,7 +1384,7 @@
         </copy>
 
         <tstamp>
-            <format property="current.tstamp" pattern="EEE d MMM yyyy HH:mm:ss"/>
+            <format property="current.tstamp" pattern="d MMM yyyy HH:mm:ss"/>
         </tstamp>
 
         <filter token="BUILD" value="${sparkle.build}" />
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index 558838359..e1ebce340 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -10,10 +10,10 @@
     Id="*"
     Language="1033"
     Codepage='$(var.codepage)'
-    Manufacturer="@APP_NAME@"
+    Manufacturer="@APP_PUBLISHER@"
     Name="@APP_NAME@"
     UpgradeCode="@WIX_UPGRADE_CODE@"
-    Version="1.0.0.0">
+    Version="@PRODUCTBUILDVERSION@">
 
 <!-- in Language we list all languages we support for localize -->
 <Package
@@ -23,7 +23,7 @@
     InstallerVersion="200"
     InstallScope="perMachine"
     Languages="1033,1036"
-    Manufacturer="@APP_NAME@"
+    Manufacturer="@APP_PUBLISHER@"
     Platform="$(var.Platform)"
     SummaryCodepage='$(var.codepage)' />
 
@@ -32,7 +32,7 @@
       IncludeMaximum="yes"
       IncludeMinimum="yes"
       Language="1033,1036"
-      Maximum="1.0.0.0"
+      Maximum="@PRODUCTBUILDVERSION@"
       Minimum="0.0.0.0"
       Property="UPGRADEFOUND" />
 </Upgrade>
diff --git a/src/native/windows/run/Makefile b/src/native/windows/run/Makefile
index 8712c0e1e..77e88e870 100644
--- a/src/native/windows/run/Makefile
+++ b/src/native/windows/run/Makefile
@@ -7,6 +7,7 @@
 
 MINGW_HOME ?= C:/mingw
 PRODUCTNAME ?= Jitsi
+PRODUCTBUILDVERSION ?= 1.0.0.0
 TARGET_BASENAME ?= run
 TARGET_DIR ?= ../../../../release/windows/tmp
 
@@ -45,7 +46,7 @@ $(cygwin.target.dir)/$(TARGET_BASENAME).exe: $(cygwin.target.dir)/config.h regis
 
 $(cygwin.target.dir)/config.h:
 	-rm.exe -f ../../../../resources/install/windows/config.h
-	echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"' > $(cygwin.target.dir)/config.h
+	echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)"' > $(cygwin.target.dir)/config.h
 
 $(cygwin.target.dir)/run.res: $(cygwin.target.dir)/config.h run.rc
 	$(WINDRES) -I../../../../resources/install/windows -I$(target.dir) run.rc -O coff -o $(target.dir)/run.res
diff --git a/src/native/windows/run/run.rc b/src/native/windows/run/run.rc
index ceaf85f4a..82506bc90 100644
--- a/src/native/windows/run/run.rc
+++ b/src/native/windows/run/run.rc
@@ -32,11 +32,11 @@ BEGIN
             VALUE "Comments", ""
             VALUE "CompanyName", "jitsi.org"
             VALUE "FileDescription", PRODUCTNAME
-            VALUE "FileVersion", "1.0.0.0"
+            VALUE "FileVersion", PRODUCTBUILDVERSION
             VALUE "InternalName", "run"
             VALUE "OriginalFilename", "run.exe"
             VALUE "ProductName", PRODUCTNAME
-            VALUE "ProductVersion", "1.0.0.0"
+            VALUE "ProductVersion", PRODUCTBUILDVERSION
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/native/windows/setup/Makefile b/src/native/windows/setup/Makefile
index 40b3411fe..6c887ee95 100644
--- a/src/native/windows/setup/Makefile
+++ b/src/native/windows/setup/Makefile
@@ -9,6 +9,7 @@ BZ2_HOME ?= .
 LZMA_HOME ?= .
 MINGW_HOME ?= C:/mingw
 PRODUCTNAME ?= Jitsi
+PRODUCTBUILDVERSION ?= 1.0.0.0
 TARGET_BASENAME ?= setup
 TARGET_DIR ?= ../../../../release/windows/tmp
 
@@ -64,7 +65,7 @@ $(cygwin.target.dir)/$(TARGET_BASENAME).exe: bspatch.c $(cygwin.target.dir)/conf
 
 $(cygwin.target.dir)/config.h:
 	-rm.exe -f ../../../../resources/install/windows/config.h
-	echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#$(DEFINE_PACKAGECODE)\n#$(DEFINE_PACKAGESIZE)' > $(cygwin.target.dir)/config.h
+	echo.exe -e '#define PRODUCTNAME "$(PRODUCTNAME)"\n#$(DEFINE_PACKAGECODE)\n#$(DEFINE_PACKAGESIZE)\n#define PRODUCTBUILDVERSION "$(PRODUCTBUILDVERSION)"' > $(cygwin.target.dir)/config.h
 
 $(cygwin.target.dir)/setup.res: $(cygwin.target.dir)/config.h setup.rc
 	$(WINDRES) -I../../../../resources/install/windows -I$(target.dir) setup.rc -O coff -o $(target.dir)/setup.res
diff --git a/src/native/windows/setup/setup.rc b/src/native/windows/setup/setup.rc
index f7e927738..34213fd42 100644
--- a/src/native/windows/setup/setup.rc
+++ b/src/native/windows/setup/setup.rc
@@ -46,11 +46,11 @@ BEGIN
             VALUE "Comments", ""
             VALUE "CompanyName", "jitsi.org"
             VALUE "FileDescription", PRODUCTNAME " Setup"
-            VALUE "FileVersion", "1.0.0.0"
+            VALUE "FileVersion", PRODUCTBUILDVERSION
             VALUE "InternalName", "setup"
             VALUE "OriginalFilename", "setup.exe"
             VALUE "ProductName", PRODUCTNAME
-            VALUE "ProductVersion", "1.0.0.0"
+            VALUE "ProductVersion", PRODUCTBUILDVERSION
         END
     END
     BLOCK "VarFileInfo"