From eab1b449bb345441850204d1ca96ea1d531ac514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sun, 23 Mar 2014 01:32:46 +0000
Subject: [PATCH] [COMP][SORT] Bring back COMP and SORT utilities to build.

svn path=/trunk/; revision=62549
---
 reactos/base/applications/cmdutils/CMakeLists.txt           | 2 ++
 .../base}/applications/cmdutils/comp/CMakeLists.txt         | 0
 {rosapps => reactos/base}/applications/cmdutils/comp/comp.c | 0
 reactos/base/applications/cmdutils/comp/comp.rc             | 5 +++++
 .../base}/applications/cmdutils/sort/CMakeLists.txt         | 2 +-
 {rosapps => reactos/base}/applications/cmdutils/sort/sort.c | 0
 reactos/base/applications/cmdutils/sort/sort.rc             | 5 +++++
 rosapps/applications/cmdutils/CMakeLists.txt                | 2 --
 rosapps/applications/cmdutils/cmdutils.rbuild               | 6 ------
 rosapps/applications/cmdutils/comp/comp.rbuild              | 4 ----
 rosapps/applications/cmdutils/comp/comp.rc                  | 4 ----
 rosapps/applications/cmdutils/sort/sort.rbuild              | 4 ----
 rosapps/applications/cmdutils/sort/sort.rc                  | 5 -----
 13 files changed, 13 insertions(+), 26 deletions(-)
 rename {rosapps => reactos/base}/applications/cmdutils/comp/CMakeLists.txt (100%)
 rename {rosapps => reactos/base}/applications/cmdutils/comp/comp.c (100%)
 create mode 100644 reactos/base/applications/cmdutils/comp/comp.rc
 rename {rosapps => reactos/base}/applications/cmdutils/sort/CMakeLists.txt (62%)
 rename {rosapps => reactos/base}/applications/cmdutils/sort/sort.c (100%)
 create mode 100644 reactos/base/applications/cmdutils/sort/sort.rc
 delete mode 100644 rosapps/applications/cmdutils/comp/comp.rbuild
 delete mode 100644 rosapps/applications/cmdutils/comp/comp.rc
 delete mode 100644 rosapps/applications/cmdutils/sort/sort.rbuild
 delete mode 100644 rosapps/applications/cmdutils/sort/sort.rc

diff --git a/reactos/base/applications/cmdutils/CMakeLists.txt b/reactos/base/applications/cmdutils/CMakeLists.txt
index a559623b7e4..a5164ec1bf6 100644
--- a/reactos/base/applications/cmdutils/CMakeLists.txt
+++ b/reactos/base/applications/cmdutils/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory(comp)
 add_subdirectory(dbgprint)
 add_subdirectory(doskey)
 add_subdirectory(find)
@@ -7,6 +8,7 @@ add_subdirectory(lodctr)
 add_subdirectory(mode)
 add_subdirectory(more)
 add_subdirectory(reg)
+add_subdirectory(sort)
 add_subdirectory(taskkill)
 add_subdirectory(wmic)
 add_subdirectory(xcopy)
diff --git a/rosapps/applications/cmdutils/comp/CMakeLists.txt b/reactos/base/applications/cmdutils/comp/CMakeLists.txt
similarity index 100%
rename from rosapps/applications/cmdutils/comp/CMakeLists.txt
rename to reactos/base/applications/cmdutils/comp/CMakeLists.txt
diff --git a/rosapps/applications/cmdutils/comp/comp.c b/reactos/base/applications/cmdutils/comp/comp.c
similarity index 100%
rename from rosapps/applications/cmdutils/comp/comp.c
rename to reactos/base/applications/cmdutils/comp/comp.c
diff --git a/reactos/base/applications/cmdutils/comp/comp.rc b/reactos/base/applications/cmdutils/comp/comp.rc
new file mode 100644
index 00000000000..b83ca54f768
--- /dev/null
+++ b/reactos/base/applications/cmdutils/comp/comp.rc
@@ -0,0 +1,5 @@
+
+#define REACTOS_STR_FILE_DESCRIPTION    "File Compare Utility"
+#define REACTOS_STR_INTERNAL_NAME       "comp"
+#define REACTOS_STR_ORIGINAL_FILENAME   "comp.exe"
+#include <reactos/version.rc>
diff --git a/rosapps/applications/cmdutils/sort/CMakeLists.txt b/reactos/base/applications/cmdutils/sort/CMakeLists.txt
similarity index 62%
rename from rosapps/applications/cmdutils/sort/CMakeLists.txt
rename to reactos/base/applications/cmdutils/sort/CMakeLists.txt
index 1429da4fed9..4e2fe0b17ff 100644
--- a/rosapps/applications/cmdutils/sort/CMakeLists.txt
+++ b/reactos/base/applications/cmdutils/sort/CMakeLists.txt
@@ -2,4 +2,4 @@
 add_executable(sort sort.c sort.rc)
 set_module_type(sort win32cui)
 add_importlibs(sort msvcrt kernel32)
-add_cd_file(TARGET sort DESTINATION reactos/system32 FOR all)
\ No newline at end of file
+add_cd_file(TARGET sort DESTINATION reactos/system32 FOR all)
diff --git a/rosapps/applications/cmdutils/sort/sort.c b/reactos/base/applications/cmdutils/sort/sort.c
similarity index 100%
rename from rosapps/applications/cmdutils/sort/sort.c
rename to reactos/base/applications/cmdutils/sort/sort.c
diff --git a/reactos/base/applications/cmdutils/sort/sort.rc b/reactos/base/applications/cmdutils/sort/sort.rc
new file mode 100644
index 00000000000..596435c864e
--- /dev/null
+++ b/reactos/base/applications/cmdutils/sort/sort.rc
@@ -0,0 +1,5 @@
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Sort Command"
+#define REACTOS_STR_INTERNAL_NAME       "sort"
+#define REACTOS_STR_ORIGINAL_FILENAME   "sort.exe"
+#include <reactos/version.rc>
diff --git a/rosapps/applications/cmdutils/CMakeLists.txt b/rosapps/applications/cmdutils/CMakeLists.txt
index 304b472089d..31d5ec71206 100644
--- a/rosapps/applications/cmdutils/CMakeLists.txt
+++ b/rosapps/applications/cmdutils/CMakeLists.txt
@@ -1,6 +1,4 @@
 add_subdirectory(appwiz)
-add_subdirectory(comp)
-add_subdirectory(sort)
 add_subdirectory(tee)
 add_subdirectory(touch)
 add_subdirectory(uptime)
diff --git a/rosapps/applications/cmdutils/cmdutils.rbuild b/rosapps/applications/cmdutils/cmdutils.rbuild
index f07953080e9..dd8e5cd19b5 100644
--- a/rosapps/applications/cmdutils/cmdutils.rbuild
+++ b/rosapps/applications/cmdutils/cmdutils.rbuild
@@ -3,12 +3,6 @@
 	<directory name="appwiz">
 		<xi:include href="appwiz/appwiz.rbuild" />
 	</directory>
-	<directory name="comp">
-		<xi:include href="comp/comp.rbuild" />
-	</directory>
-	<directory name="sort">
-		<xi:include href="sort/sort.rbuild" />
-	</directory>
 	<directory name="tee">
 		<xi:include href="tee/tee.rbuild" />
 	</directory>
diff --git a/rosapps/applications/cmdutils/comp/comp.rbuild b/rosapps/applications/cmdutils/comp/comp.rbuild
deleted file mode 100644
index 13d249a3aca..00000000000
--- a/rosapps/applications/cmdutils/comp/comp.rbuild
+++ /dev/null
@@ -1,4 +0,0 @@
-<module name="comp" type="win32cui" installbase="system32" installname="comp.exe" allowwarnings="true">
-	<file>comp.c</file>
-	<file>comp.rc</file>
-</module>
diff --git a/rosapps/applications/cmdutils/comp/comp.rc b/rosapps/applications/cmdutils/comp/comp.rc
deleted file mode 100644
index 9a00c52a8ca..00000000000
--- a/rosapps/applications/cmdutils/comp/comp.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-#define REACTOS_STR_FILE_DESCRIPTION    "File Compare Utility\0"
-#define REACTOS_STR_INTERNAL_NAME   "comp\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "comp.exe\0"
-#include <reactos/version.rc>
diff --git a/rosapps/applications/cmdutils/sort/sort.rbuild b/rosapps/applications/cmdutils/sort/sort.rbuild
deleted file mode 100644
index 188fd1eb282..00000000000
--- a/rosapps/applications/cmdutils/sort/sort.rbuild
+++ /dev/null
@@ -1,4 +0,0 @@
-<module name="sort" type="win32cui" installbase="system32" installname="sort.exe">
-	<file>sort.c</file>
-	<file>sort.rc</file>
-</module>
diff --git a/rosapps/applications/cmdutils/sort/sort.rc b/rosapps/applications/cmdutils/sort/sort.rc
deleted file mode 100644
index e3418a39524..00000000000
--- a/rosapps/applications/cmdutils/sort/sort.rc
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#define REACTOS_STR_FILE_DESCRIPTION	"W32 sort command\0"
-#define REACTOS_STR_INTERNAL_NAME	"sort\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"sort.exe\0"
-#include <reactos/version.rc>