[ros-diffs] [reactos] 08/11: [SDK] Turn txt2nls into a host tool

[Jérôme Gardou]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1549f0837f8385341e04c…

commit 1549f0837f8385341e04c4075494a26c44ba0d33
Author:     Jérôme Gardou <jerome.gardou(a)reactos.org>
AuthorDate: Tue May 18 09:27:52 2021 +0200
Commit:     Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Wed May 19 22:50:29 2021 +0200

    [SDK] Turn txt2nls into a host tool
---
 modules/rosapps/applications/devutils/CMakeLists.txt   |  1 -
 .../applications/devutils/txt2nls/CMakeLists.txt       | 12 ------------
 .../rosapps/applications/devutils/txt2nls/txt2nls.rc   | 18 ------------------
 sdk/tools/CMakeLists.txt                               |  1 +
 sdk/tools/txt2nls/CMakeLists.txt                       |  7 +++++++
 .../applications/devutils => sdk/tools}/txt2nls/main.c |  0
 .../applications/devutils => sdk/tools}/txt2nls/nls.c  |  0
 .../devutils => sdk/tools}/txt2nls/precomp.h           |  0
 .../applications/devutils => sdk/tools}/txt2nls/txt.c  |  0
 9 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/modules/rosapps/applications/devutils/CMakeLists.txt
b/modules/rosapps/applications/devutils/CMakeLists.txt
index ccbc43e68e9..446fbc1ea74 100644
--- a/modules/rosapps/applications/devutils/CMakeLists.txt
+++ b/modules/rosapps/applications/devutils/CMakeLists.txt
@@ -9,5 +9,4 @@ add_subdirectory(shimtest_ros)
 add_subdirectory(shlextdbg)
 add_subdirectory(symdump)
 add_subdirectory(syscalldump)
-add_subdirectory(txt2nls)
 add_subdirectory(vgafontedit)
diff --git a/modules/rosapps/applications/devutils/txt2nls/CMakeLists.txt
b/modules/rosapps/applications/devutils/txt2nls/CMakeLists.txt
deleted file mode 100644
index 3c26d855e39..00000000000
--- a/modules/rosapps/applications/devutils/txt2nls/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-list(APPEND SOURCE
-    main.c
-    txt.c
-    nls.c
-    precomp.h)
-
-add_executable(txt2nls ${SOURCE} txt2nls.rc)
-add_pch(txt2nls precomp.h SOURCE)
-set_module_type(txt2nls win32cui)
-add_importlibs(txt2nls msvcrt kernel32)
-add_cd_file(TARGET txt2nls DESTINATION reactos/system32 FOR all)
diff --git a/modules/rosapps/applications/devutils/txt2nls/txt2nls.rc
b/modules/rosapps/applications/devutils/txt2nls/txt2nls.rc
deleted file mode 100644
index 45b661483b8..00000000000
--- a/modules/rosapps/applications/devutils/txt2nls/txt2nls.rc
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * PROJECT:     ReactOS TXT to NLS Converter
- * LICENSE:     GNU General Public License Version 2.0 or any later version
- * FILE:        devutils/txt2nls/txt2nls.rc
- * COPYRIGHT:   Copyright 2016 Dmitry Chapyshev <dmitry(a)reactos.org>
- */
-
-#include <windows.h>
-#include <commctrl.h>
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
-
-#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS TXT to NLS Converter"
-#define REACTOS_STR_INTERNAL_NAME       "txt2nls"
-#define REACTOS_STR_ORIGINAL_FILENAME   "txt2nls.exe"
-#include <reactos/version.rc>
-
-#include <reactos/manifest_exe.rc>
diff --git a/sdk/tools/CMakeLists.txt b/sdk/tools/CMakeLists.txt
index c27c9ac3683..374ccd2f10a 100644
--- a/sdk/tools/CMakeLists.txt
+++ b/sdk/tools/CMakeLists.txt
@@ -35,6 +35,7 @@ add_subdirectory(isohybrid)
 add_subdirectory(kbdtool)
 add_subdirectory(mkhive)
 add_subdirectory(mkisofs)
+add_subdirectory(txt2nls)
 add_subdirectory(unicode)
 add_subdirectory(widl)
 add_subdirectory(wpp)
diff --git a/sdk/tools/txt2nls/CMakeLists.txt b/sdk/tools/txt2nls/CMakeLists.txt
new file mode 100644
index 00000000000..929e59539d9
--- /dev/null
+++ b/sdk/tools/txt2nls/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+list(APPEND SOURCE
+    main.c
+    txt.c
+    nls.c)
+
+add_host_tool(txt2nls ${SOURCE})
diff --git a/modules/rosapps/applications/devutils/txt2nls/main.c
b/sdk/tools/txt2nls/main.c
similarity index 100%
rename from modules/rosapps/applications/devutils/txt2nls/main.c
rename to sdk/tools/txt2nls/main.c
diff --git a/modules/rosapps/applications/devutils/txt2nls/nls.c
b/sdk/tools/txt2nls/nls.c
similarity index 100%
rename from modules/rosapps/applications/devutils/txt2nls/nls.c
rename to sdk/tools/txt2nls/nls.c
diff --git a/modules/rosapps/applications/devutils/txt2nls/precomp.h
b/sdk/tools/txt2nls/precomp.h
similarity index 100%
rename from modules/rosapps/applications/devutils/txt2nls/precomp.h
rename to sdk/tools/txt2nls/precomp.h
diff --git a/modules/rosapps/applications/devutils/txt2nls/txt.c
b/sdk/tools/txt2nls/txt.c
similarity index 100%
rename from modules/rosapps/applications/devutils/txt2nls/txt.c
rename to sdk/tools/txt2nls/txt.c