[ros-diffs] [akhaldi] 51703: [CMAKE] * Partially revert r50224 as the current resource handling doesn't suffer from the iconv issue on unix.

Author: akhaldi
Date: Fri May 13 17:53:03 2011
New Revision: 51703

URL: http://svn.reactos.org/svn/reactos?rev=51703&view=rev
Log:
[CMAKE]
* Partially revert r50224 as the current resource handling doesn't suffer from the
iconv issue on unix.

Modified:
    branches/cmake-bringup/base/applications/calc/resource.rc
    branches/cmake-bringup/base/applications/dxdiag/rsrc.rc
    branches/cmake-bringup/base/applications/mplay32/rsrc.rc
    branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc
    branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc
    branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc
    branches/cmake-bringup/base/applications/mstsc/rsrc.rc
    branches/cmake-bringup/base/applications/notepad/rsrc.rc
    branches/cmake-bringup/base/applications/rapps/rsrc.rc
    branches/cmake-bringup/base/applications/regedit/rsrc.rc
    branches/cmake-bringup/base/applications/screensavers/logon/logon.rc
    branches/cmake-bringup/base/setup/vmwinst/rsrc.rc
    branches/cmake-bringup/base/setup/welcome/rsrc.rc
    branches/cmake-bringup/base/system/winlogon/rsrc.rc
    branches/cmake-bringup/dll/cpl/desk/rsrc.rc
    branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc
    branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc
    branches/cmake-bringup/dll/win32/netid/rsrc.rc
    branches/cmake-bringup/dll/win32/netshell/netshell.rc
    branches/cmake-bringup/dll/win32/shell32/shell32.rc
    branches/cmake-bringup/dll/win32/syssetup/syssetup.rc
    branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc

Modified: branches/cmake-bringup/base/applications/calc/resource.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/calc/resource.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/calc/resource.rc [iso-8859-1] Fri May 13
17:53:03 2011
@@ -52,7 +52,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/dxdiag/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/dxdiag/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/dxdiag/rsrc.rc [iso-8859-1] Fri May 13
17:53:03 2011
@@ -10,7 +10,7 @@
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/mplay32/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mplay32/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/mplay32/rsrc.rc [iso-8859-1] Fri May 13
17:53:03 2011
@@ -8,7 +8,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-// #include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/mscutils/devmgmt/rsrc.rc [iso-8859-1] Fri May
13 17:53:03 2011
@@ -20,7 +20,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
@@ -30,4 +30,3 @@
 #include "lang/sv-SE.rc"
 #include "lang/th-TH.rc"
 #include "lang/uk-UA.rc"
-

Modified: branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/mscutils/eventvwr/rsrc.rc [iso-8859-1] Fri
May 13 17:53:03 2011
@@ -16,10 +16,10 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
-//#include "lang/pl-PL.rc" FIXME: iconv issue
+#include "lang/pl-PL.rc"
 #include "lang/ro-RO.rc"
 #include "lang/ru-RU.rc"
 #include "lang/sk-SK.rc"

Modified: branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/mscutils/servman/rsrc.rc [iso-8859-1] Fri May
13 17:53:03 2011
@@ -28,7 +28,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/base/applications/mstsc/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/mstsc/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/mstsc/rsrc.rc [iso-8859-1] Fri May 13
17:53:03 2011
@@ -20,7 +20,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/notepad/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/notepad/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/notepad/rsrc.rc [iso-8859-1] Fri May 13
17:53:03 2011
@@ -48,7 +48,7 @@
 #include "lang/hy-AM.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/rapps/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/rapps/rsrc.rc [iso-8859-1] Fri May 13
17:53:03 2011
@@ -5,7 +5,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"

Modified: branches/cmake-bringup/base/applications/regedit/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/regedit/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/applications/regedit/rsrc.rc [iso-8859-1] Fri May 13
17:53:03 2011
@@ -38,7 +38,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/base/applications/screensavers/logon/logon.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications…
==============================================================================
--- branches/cmake-bringup/base/applications/screensavers/logon/logon.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/base/applications/screensavers/logon/logon.rc [iso-8859-1] Fri
May 13 17:53:03 2011
@@ -20,7 +20,7 @@
 #include "lang/es-ES.rc"
 #include "lang/eu-ES.rc"
 #include "lang/fr-FR.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/lt-LT.rc"
 #include "lang/nl-NL.rc"

Modified: branches/cmake-bringup/base/setup/vmwinst/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/vmwins…
==============================================================================
--- branches/cmake-bringup/base/setup/vmwinst/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/setup/vmwinst/rsrc.rc [iso-8859-1] Fri May 13 17:53:03
2011
@@ -23,7 +23,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/base/setup/welcome/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/welcom…
==============================================================================
--- branches/cmake-bringup/base/setup/welcome/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/setup/welcome/rsrc.rc [iso-8859-1] Fri May 13 17:53:03
2011
@@ -51,7 +51,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

Modified: branches/cmake-bringup/base/system/winlogon/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo…
==============================================================================
--- branches/cmake-bringup/base/system/winlogon/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/base/system/winlogon/rsrc.rc [iso-8859-1] Fri May 13 17:53:03
2011
@@ -15,7 +15,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/lt-LT.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"

Modified: branches/cmake-bringup/dll/cpl/desk/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/desk/rsrc…
==============================================================================
--- branches/cmake-bringup/dll/cpl/desk/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/desk/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011
@@ -11,7 +11,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/powercfg/…
==============================================================================
--- branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/powercfg/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011
@@ -10,7 +10,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/cpl/sysdm/rsr…
==============================================================================
--- branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/cpl/sysdm/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011
@@ -10,7 +10,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ro-RO.rc"

Modified: branches/cmake-bringup/dll/win32/netid/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netid/r…
==============================================================================
--- branches/cmake-bringup/dll/win32/netid/rsrc.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/netid/rsrc.rc [iso-8859-1] Fri May 13 17:53:03 2011
@@ -9,7 +9,7 @@
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/it-IT.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/dll/win32/netshell/netshell.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/netshel…
==============================================================================
--- branches/cmake-bringup/dll/win32/netshell/netshell.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/netshell/netshell.rc [iso-8859-1] Fri May 13 17:53:03
2011
@@ -33,7 +33,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/dll/win32/shell32/shell32.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32…
==============================================================================
--- branches/cmake-bringup/dll/win32/shell32/shell32.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/shell32/shell32.rc [iso-8859-1] Fri May 13 17:53:03
2011
@@ -60,7 +60,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/hu-HU.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/ko-KR.rc"
 #include "lang/nl-NL.rc"
 #include "lang/no-NO.rc"

Modified: branches/cmake-bringup/dll/win32/syssetup/syssetup.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/syssetu…
==============================================================================
--- branches/cmake-bringup/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/syssetup/syssetup.rc [iso-8859-1] Fri May 13 17:53:03
2011
@@ -63,7 +63,7 @@
 #include "lang/hu-HU.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/no-NO.rc"
 #include "lang/nl-NL.rc"
 #include "lang/pl-PL.rc"

Modified: branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…
==============================================================================
--- branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1]
(original)
+++ branches/cmake-bringup/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Fri May 13
17:53:03 2011
@@ -13,7 +13,7 @@
 #include "lang/fr-FR.rc"
 #include "lang/id-ID.rc"
 #include "lang/it-IT.rc"
-//#include "lang/ja-JP.rc" FIXME: iconv issue
+#include "lang/ja-JP.rc"
 #include "lang/no-NO.rc"
 #include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"