[COMP][SORT]

Bring back COMP and SORT utilities to build.

svn path=/trunk/; revision=62549

diff --git a/reactos/base/applications/cmdutils/CMakeLists.txt b/reactos/base/applications/cmdutils/CMakeLists.txt
index a559623..a5164ec 100644 (file)
--- 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 (file)
index 0000000..b83ca54
--- /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 1429da4..4e2fe0b 100644 (file)
--- 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 (file)
index 0000000..596435c
--- /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 304b472..31d5ec7 100644 (file)
--- 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 f079530..dd8e5cd 100644 (file)
--- 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 (file)
index 13d249a..0000000
--- 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">\r
-       <file>comp.c</file>\r
-       <file>comp.rc</file>\r
-</module>\r

diff --git a/rosapps/applications/cmdutils/comp/comp.rc b/rosapps/applications/cmdutils/comp/comp.rc
deleted file mode 100644 (file)
index 9a00c52..0000000
--- 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 (file)
index 188fd1e..0000000
--- 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 (file)
index e3418a3..0000000
--- 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>