Michael Stefaniuc : msiexec: Import the version.rc into the main rc file.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2885b0b8f4a84a2c980d034200330fb8cae64bb8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2885b0b8f4a84a2c980d034200330fb8cae64bb8

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Fri Jul  3 11:49:52 2009 +0200

msiexec: Import the version.rc into the main rc file.

There is no need for a separate file.

---

 programs/msiexec/rsrc.rc    |   11 ++++++++++-
 programs/msiexec/version.rc |   28 ----------------------------
 2 files changed, 10 insertions(+), 29 deletions(-)

diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc
index 01e43be..cfc8937 100644
--- a/programs/msiexec/rsrc.rc
+++ b/programs/msiexec/rsrc.rc
@@ -18,7 +18,16 @@
 
 #include <windows.h>
 
-#include "version.rc"
+#define WINE_FILEDESCRIPTION_STR "Wine Installer"
+#define WINE_FILENAME_STR "msiexec.exe"
+#define WINE_FILETYPE VFT_APP
+#define WINE_FILEVERSION 3,1,4000,1823
+#define WINE_FILEVERSION_STR "3.1.4000.1823"
+#define WINE_PRODUCTVERSION 3,1,4000,1823
+#define WINE_PRODUCTVERSION_STR "3.1.4000.1823"
+#define WINE_PRODUCTNAME_STR "Wine Installer"
+
+#include "wine/wine_common_ver.rc"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
diff --git a/programs/msiexec/version.rc b/programs/msiexec/version.rc
deleted file mode 100644
index 0777594..0000000
--- a/programs/msiexec/version.rc
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2004 Mike McCormack
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define WINE_FILEDESCRIPTION_STR "Wine Installer"
-#define WINE_FILENAME_STR "msiexec.exe"
-#define WINE_FILETYPE VFT_APP
-#define WINE_FILEVERSION 3,1,4000,1823
-#define WINE_FILEVERSION_STR "3.1.4000.1823"
-#define WINE_PRODUCTVERSION 3,1,4000,1823
-#define WINE_PRODUCTVERSION_STR "3.1.4000.1823"
-#define WINE_PRODUCTNAME_STR "Wine Installer"
-
-#include "wine/wine_common_ver.rc"