r23032 - gnucash/trunk - Win32: add VERSIONINFO block to RC file and convert in into a template to be completed during configure

[Geert Janssens]

Author: gjanssens
Date: 2013-06-02 06:55:13 -0400 (Sun, 02 Jun 2013)
New Revision: 23032
Trac: http://svn.gnucash.org/trac/changeset/23032

Added:
   gnucash/trunk/src/bin/gnucash.rc.in
Removed:
   gnucash/trunk/src/bin/gnucash.rc
Modified:
   gnucash/trunk/.gitattributes
   gnucash/trunk/configure.ac
   gnucash/trunk/src/bin/Makefile.am
Log:
Win32: add VERSIONINFO block to RC file and convert in into a template to be completed during configure

Modified: gnucash/trunk/.gitattributes
===================================================================
--- gnucash/trunk/.gitattributes	2013-06-02 10:55:03 UTC (rev 23031)
+++ gnucash/trunk/.gitattributes	2013-06-02 10:55:13 UTC (rev 23032)
@@ -42,5 +42,5 @@
 *.vbs text eol=crlf
 
 gnucash.iss.in text eol=crlf
-gnucash.rc     text eol=crlf
+gnucash.rc.in  text eol=crlf
 README*win32-bin.txt text eol=crlf

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2013-06-02 10:55:03 UTC (rev 23031)
+++ gnucash/trunk/configure.ac	2013-06-02 10:55:13 UTC (rev 23032)
@@ -1232,7 +1232,6 @@
   lib/stf/Makefile
   packaging/Makefile
   packaging/win32/Makefile
-  packaging/win32/gnucash.iss
   src/Makefile
   src/app-utils/Makefile
   src/app-utils/test/Makefile
@@ -1265,7 +1264,6 @@
   src/gnc-module/test/mod-baz/Makefile
   src/gnc-module/test/misc-mods/Makefile
   src/gnome/Makefile
-  src/gnome/gnucash.desktop.in
   src/gnome/gtkbuilder/Makefile
   src/gnome/schemas/Makefile
   src/gnome/ui/Makefile
@@ -1350,6 +1348,10 @@
   src/plugins/customer_import/gtkbuilder/Makefile
   src/plugins/customer_import/ui/Makefile
   dnl # non-makefiles
+  packaging/win32/gnucash.iss
+  src/bin/gnucash.rc
+  src/gnome/gnucash.desktop.in
+
   dnl # Please read doc/build-system before adding *anything* here
   ,
   dnl # commands go here, but we don't have any right now

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2013-06-02 10:55:03 UTC (rev 23031)
+++ gnucash/trunk/src/bin/Makefile.am	2013-06-02 10:55:13 UTC (rev 23032)
@@ -30,7 +30,7 @@
 dist_noinst_DATA = gnucash.rc
 
 .rc.o:
-	$(AM_V_GEN)$(RC) -i '$<' --input-format=rc -o '$@' -O coff
+	$(AM_V_GEN)$(RC) -I${top_srcdir}/src/pixmaps -i '$<' --input-format=rc -o '$@' -O coff
 
 configdir = ${GNC_CONFIGDIR}
 config_DATA = environment

Deleted: gnucash/trunk/src/bin/gnucash.rc
===================================================================
--- gnucash/trunk/src/bin/gnucash.rc	2013-06-02 10:55:03 UTC (rev 23031)
+++ gnucash/trunk/src/bin/gnucash.rc	2013-06-02 10:55:13 UTC (rev 23032)
@@ -1 +0,0 @@
-APPLICATION_ICON    ICON          DISCARDABLE     "../pixmaps/gnucash-icon.ico"

Added: gnucash/trunk/src/bin/gnucash.rc.in
===================================================================
--- gnucash/trunk/src/bin/gnucash.rc.in	                        (rev 0)
+++ gnucash/trunk/src/bin/gnucash.rc.in	2013-06-02 10:55:13 UTC (rev 23032)
@@ -0,0 +1,33 @@
+#include <windows.h>
+
+APPLICATION_ICON ICON DISCARDABLE "gnucash-icon.ico"
+
+VS_VERSION VERSIONINFO
+ FILEVERSION     @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
+ PRODUCTVERSION  @GNUCASH_MAJOR_VERSION@, at GNUCASH_MINOR_VERSION@, at GNUCASH_MICRO_VERSION@,0
+ FILEFLAGSMASK   0x3fL
+ FILEFLAGS       0x0L
+ FILEOS          VOS__WINDOWS32
+ FILETYPE        VFT_APP
+ FILESUBTYPE     0x0L
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName", "GnuCash Development Team"
+      VALUE "FileDescription", "GnuCash Program File"
+      VALUE "FileVersion", "@VERSION@"
+      VALUE "InternalName", "gnucash"
+      VALUE "LegalCopyright", "©2011 GnuCash Development Team, Licence: GPL v2.0 or later"
+      VALUE "OriginalFilename", "gnucash.exe"
+      VALUE "ProductName", "GnuCash Free Finance Manager"
+      VALUE "ProductVersion", "@VERSION@"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 1252
+  END
+END