uninstaller: Build language resource files separately

Michael Stefaniuc mstefani at redhat.de
Tue Jun 30 04:13:29 CDT 2009


instead of including them from an other rc file.
---
 programs/uninstaller/Bg.rc       |    2 +
 programs/uninstaller/Cs.rc       |    2 +
 programs/uninstaller/Da.rc       |    2 +
 programs/uninstaller/De.rc       |    2 +
 programs/uninstaller/En.rc       |    2 +
 programs/uninstaller/Eo.rc       |    2 +
 programs/uninstaller/Es.rc       |    2 +
 programs/uninstaller/Fi.rc       |    2 +
 programs/uninstaller/Fr.rc       |    2 +
 programs/uninstaller/Hu.rc       |    2 +
 programs/uninstaller/It.rc       |    2 +
 programs/uninstaller/Ko.rc       |    2 +
 programs/uninstaller/Lt.rc       |    4 +-
 programs/uninstaller/Makefile.in |   25 ++++++++++++++++++-
 programs/uninstaller/Nl.rc       |    2 +
 programs/uninstaller/No.rc       |    2 +
 programs/uninstaller/Pl.rc       |    2 +
 programs/uninstaller/Pt.rc       |    2 +
 programs/uninstaller/Ro.rc       |    4 +-
 programs/uninstaller/Ru.rc       |    2 +
 programs/uninstaller/Si.rc       |    4 +-
 programs/uninstaller/Sv.rc       |    2 +
 programs/uninstaller/Tr.rc       |    2 +
 programs/uninstaller/Zh.rc       |    4 +-
 programs/uninstaller/resource.h  |    2 +
 programs/uninstaller/rsrc.rc     |   51 --------------------------------------
 26 files changed, 72 insertions(+), 60 deletions(-)
 delete mode 100644 programs/uninstaller/rsrc.rc

diff --git a/programs/uninstaller/Bg.rc b/programs/uninstaller/Bg.rc
index 4570514..517f3e2 100644
--- a/programs/uninstaller/Bg.rc
+++ b/programs/uninstaller/Bg.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Cs.rc b/programs/uninstaller/Cs.rc
index 6944636..ed73cd3 100644
--- a/programs/uninstaller/Cs.rc
+++ b/programs/uninstaller/Cs.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_CZECH, SUBLANG_NEUTRAL
 
 /* Czech strings in CP1250 */
diff --git a/programs/uninstaller/Da.rc b/programs/uninstaller/Da.rc
index 1c928d7..696413c 100644
--- a/programs/uninstaller/Da.rc
+++ b/programs/uninstaller/Da.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/De.rc b/programs/uninstaller/De.rc
index a01bd7a..fb19621 100644
--- a/programs/uninstaller/De.rc
+++ b/programs/uninstaller/De.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/En.rc b/programs/uninstaller/En.rc
index f6ce7b2..7282543 100644
--- a/programs/uninstaller/En.rc
+++ b/programs/uninstaller/En.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Eo.rc b/programs/uninstaller/Eo.rc
index 5215362..199356b 100644
--- a/programs/uninstaller/Eo.rc
+++ b/programs/uninstaller/Eo.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ESPERANTO, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Es.rc b/programs/uninstaller/Es.rc
index 0fe7d14..7862cea 100644
--- a/programs/uninstaller/Es.rc
+++ b/programs/uninstaller/Es.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Fi.rc b/programs/uninstaller/Fi.rc
index 0114990..13bc170 100644
--- a/programs/uninstaller/Fi.rc
+++ b/programs/uninstaller/Fi.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Fr.rc b/programs/uninstaller/Fr.rc
index d9ec2a8..d1a4485 100644
--- a/programs/uninstaller/Fr.rc
+++ b/programs/uninstaller/Fr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Hu.rc b/programs/uninstaller/Hu.rc
index bfd689c..d58e54d 100644
--- a/programs/uninstaller/Hu.rc
+++ b/programs/uninstaller/Hu.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/It.rc b/programs/uninstaller/It.rc
index af21f6c..3eaad1f 100644
--- a/programs/uninstaller/It.rc
+++ b/programs/uninstaller/It.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Ko.rc b/programs/uninstaller/Ko.rc
index 7300c11..a14ac3d 100644
--- a/programs/uninstaller/Ko.rc
+++ b/programs/uninstaller/Ko.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Lt.rc b/programs/uninstaller/Lt.rc
index 1a3156a..7cf0dc2 100644
--- a/programs/uninstaller/Lt.rc
+++ b/programs/uninstaller/Lt.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /* UTF-8 */
 #pragma code_page(65001)
 
@@ -27,5 +29,3 @@ STRINGTABLE DISCARDABLE {
      IDS_APPNAME, "Wine program?? ??alinimo programa"
      IDS_UNINSTALLFAILED, "Nepavyko ??vykdyti programos pa??alinimo komandos '%s', grei??iausiai d??l tr??kstamo vykdomojo failo.\r\nAr norite pa??alinti programos ??alinimo ??ra???? i?? registro?"
 }
-
-#pragma code_page(default)
diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index 0f7e0e4..0c9851c 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -11,7 +11,30 @@ DELAYIMPORTS = shlwapi shell32 user32 gdi32
 C_SRCS = \
 	main.c
 
-RC_SRCS = rsrc.rc
+RC_SRCS = \
+	Bg.rc \
+	Cs.rc \
+	Da.rc \
+	De.rc \
+	En.rc \
+	Eo.rc \
+	Es.rc \
+	Fi.rc \
+	Fr.rc \
+	Hu.rc \
+	It.rc \
+	Ko.rc \
+	Lt.rc \
+	Nl.rc \
+	No.rc \
+	Pl.rc \
+	Pt.rc \
+	Ro.rc \
+	Ru.rc \
+	Si.rc \
+	Sv.rc \
+	Tr.rc \
+	Zh.rc
 
 @MAKE_PROG_RULES@
 
diff --git a/programs/uninstaller/Nl.rc b/programs/uninstaller/Nl.rc
index 8c645b7..97d2184 100644
--- a/programs/uninstaller/Nl.rc
+++ b/programs/uninstaller/Nl.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/No.rc b/programs/uninstaller/No.rc
index 2aaa1ec..470f8d9 100644
--- a/programs/uninstaller/No.rc
+++ b/programs/uninstaller/No.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Pl.rc b/programs/uninstaller/Pl.rc
index 7451e63..174759a 100644
--- a/programs/uninstaller/Pl.rc
+++ b/programs/uninstaller/Pl.rc
@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Pt.rc b/programs/uninstaller/Pt.rc
index 14c7867..01c26f8 100644
--- a/programs/uninstaller/Pt.rc
+++ b/programs/uninstaller/Pt.rc
@@ -18,6 +18,8 @@
  *
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Ro.rc b/programs/uninstaller/Ro.rc
index 5f02488..770b4a6 100644
--- a/programs/uninstaller/Ro.rc
+++ b/programs/uninstaller/Ro.rc
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
@@ -25,5 +27,3 @@ STRINGTABLE DISCARDABLE {
      IDS_APPNAME, "Programul de dezinstalare de aplica??ii Wine"
      IDS_UNINSTALLFAILED, "Execu??ia comenzi de dezinstalare '%s' a e??uat, probabil din lipsa fi??ierului executabil.\r\nDori??i s?? ??terge??i ??nregistrarea de dezinstalare din registru?"
 }
-
-#pragma code_page(default)
diff --git a/programs/uninstaller/Ru.rc b/programs/uninstaller/Ru.rc
index bada09c..512b8f6 100644
--- a/programs/uninstaller/Ru.rc
+++ b/programs/uninstaller/Ru.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Si.rc b/programs/uninstaller/Si.rc
index a971ae3..598df64 100644
--- a/programs/uninstaller/Si.rc
+++ b/programs/uninstaller/Si.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
@@ -26,5 +28,3 @@ STRINGTABLE DISCARDABLE {
      IDS_APPNAME, "Wine Odstranjevalec programov"
      IDS_UNINSTALLFAILED, "Izvedba odstranitvenega ukaza '%s' ni uspela, morda zaradi manjkajo??e izvr??ljive datoteke.\r\nAli ??elite odstraniti odstranitveni klju?? iz registra?"
 }
-
-#pragma code_page(default)
diff --git a/programs/uninstaller/Sv.rc b/programs/uninstaller/Sv.rc
index 00d0810..3365e2e 100644
--- a/programs/uninstaller/Sv.rc
+++ b/programs/uninstaller/Sv.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Tr.rc b/programs/uninstaller/Tr.rc
index 5a46812..ce31e15 100644
--- a/programs/uninstaller/Tr.rc
+++ b/programs/uninstaller/Tr.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE DISCARDABLE {
diff --git a/programs/uninstaller/Zh.rc b/programs/uninstaller/Zh.rc
index 6e0e2be..368814c 100644
--- a/programs/uninstaller/Zh.rc
+++ b/programs/uninstaller/Zh.rc
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "resource.h"
+
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
@@ -34,5 +36,3 @@ STRINGTABLE DISCARDABLE {
      IDS_APPNAME, "Wine ???????????????????????????"
      IDS_UNINSTALLFAILED, "???????????????????????? '%s', ?????????????????????????????????.\r\n????????????????????????????????????????????????????"
 }
-
-#pragma code_page(default)
diff --git a/programs/uninstaller/resource.h b/programs/uninstaller/resource.h
index b30be4e..67e1f4b 100644
--- a/programs/uninstaller/resource.h
+++ b/programs/uninstaller/resource.h
@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+
 #define IDS_APPNAME                     1000
 #define IDS_UNINSTALLFAILED             1001
 #define MAX_STRING_LEN                  255
diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc
deleted file mode 100644
index 799e3f6..0000000
--- a/programs/uninstaller/rsrc.rc
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Uninstaller (rsrc.rc)
- *
- * Copyright 2000 Andreas Mohr
- * Copyright 2003 Vincent B?ron
- * Copyright 2003 Ivan Leo Puoti
- * Copyright 2004 David Kredba
- * Copyright 2005 Jonathan Ernst
- *
- * 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
- */
-
-#include <windef.h>
-#include <winuser.h>
-
-#include "resource.h"
-#include "Bg.rc"
-#include "Cs.rc"
-#include "Da.rc"
-#include "De.rc"
-#include "En.rc"
-#include "Eo.rc"
-#include "Es.rc"
-#include "Fi.rc"
-#include "Fr.rc"
-#include "It.rc"
-#include "Hu.rc"
-#include "Ko.rc"
-#include "Lt.rc"
-#include "Nl.rc"
-#include "No.rc"
-#include "Pl.rc"
-#include "Pt.rc"
-#include "Ro.rc"
-#include "Ru.rc"
-#include "Si.rc"
-#include "Sv.rc"
-#include "Tr.rc"
-#include "Zh.rc"
-- 
1.6.2.5



More information about the wine-patches mailing list