[hbelusca] 62549: [COMP][SORT] Bring back COMP and SORT utilities to build. - Ros-diffs

23 Mar 2014

Author: hbelusca
Date: Sun Mar 23 01:32:46 2014
New Revision: 62549
URL: http://svn.reactos.org/svn/reactos?rev=62549&view=rev
Log:
[COMP][SORT]
Bring back COMP and SORT utilities to build.
Added:
    trunk/reactos/base/applications/cmdutils/comp/
      - copied from r62545, trunk/rosapps/applications/cmdutils/comp/
    trunk/reactos/base/applications/cmdutils/sort/
      - copied from r62545, trunk/rosapps/applications/cmdutils/sort/
Removed:
    trunk/reactos/base/applications/cmdutils/comp/comp.rbuild
    trunk/reactos/base/applications/cmdutils/sort/sort.rbuild
    trunk/rosapps/applications/cmdutils/comp/
    trunk/rosapps/applications/cmdutils/sort/
Modified:
    trunk/reactos/base/applications/cmdutils/CMakeLists.txt
    trunk/reactos/base/applications/cmdutils/comp/comp.rc
    trunk/reactos/base/applications/cmdutils/sort/CMakeLists.txt
    trunk/reactos/base/applications/cmdutils/sort/sort.rc
    trunk/rosapps/applications/cmdutils/CMakeLists.txt
    trunk/rosapps/applications/cmdutils/cmdutils.rbuild
Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================

--- trunk/reactos/base/applications/cmdutils/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt	[iso-8859-1] Sun Mar 23 01:32:46 2014
@@ -1,3 +1,4 @@
+add_subdirectory(comp)
 add_subdirectory(dbgprint)
 add_subdirectory(doskey)
 add_subdirectory(find)
@@ -7,6 +8,7 @@
 add_subdirectory(mode)
 add_subdirectory(more)
 add_subdirectory(reg)
+add_subdirectory(sort)
 add_subdirectory(taskkill)
 add_subdirectory(wmic)
 add_subdirectory(xcopy)
Removed: trunk/reactos/base/applications/cmdutils/comp/comp.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/comp/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/comp/comp.rbuild	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/comp/comp.rbuild	(removed)
@@ -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>
Modified: trunk/reactos/base/applications/cmdutils/comp/comp.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/comp/comp.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/comp/comp.rc	[iso-8859-1] Sun Mar 23 01:32:46 2014
@@ -1,4 +1,5 @@
-#define REACTOS_STR_FILE_DESCRIPTION    "File Compare Utility\0"
-#define REACTOS_STR_INTERNAL_NAME   "comp\0"
-#define REACTOS_STR_ORIGINAL_FILENAME   "comp.exe\0"
+
+#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>
Modified: trunk/reactos/base/applications/cmdutils/sort/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/sort/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/sort/CMakeLists.txt	[iso-8859-1] Sun Mar 23 01:32:46 2014
@@ -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)
+add_cd_file(TARGET sort DESTINATION reactos/system32 FOR all)
Removed: trunk/reactos/base/applications/cmdutils/sort/sort.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/sort/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/sort/sort.rbuild	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/sort/sort.rbuild	(removed)
@@ -1,4 +0,0 @@
-<module name="sort" type="win32cui" installbase="system32" installname="sort.exe">
-	<file>sort.c</file>
-	<file>sort.rc</file>
-</module>
Modified: trunk/reactos/base/applications/cmdutils/sort/sort.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils/...
==============================================================================
--- trunk/reactos/base/applications/cmdutils/sort/sort.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/cmdutils/sort/sort.rc	[iso-8859-1] Sun Mar 23 01:32:46 2014
@@ -1,5 +1,5 @@
-#define REACTOS_STR_FILE_DESCRIPTION	"W32 sort command\0"
-#define REACTOS_STR_INTERNAL_NAME	"sort\0"
-#define REACTOS_STR_ORIGINAL_FILENAME	"sort.exe\0"
+#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>
Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMake...
==============================================================================
--- trunk/rosapps/applications/cmdutils/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/CMakeLists.txt	[iso-8859-1] Sun Mar 23 01:32:46 2014
@@ -1,6 +1,4 @@
 add_subdirectory(appwiz)
-add_subdirectory(comp)
-add_subdirectory(sort)
 add_subdirectory(tee)
 add_subdirectory(touch)
 add_subdirectory(uptime)
Modified: trunk/rosapps/applications/cmdutils/cmdutils.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/cmdut...
==============================================================================
--- trunk/rosapps/applications/cmdutils/cmdutils.rbuild	[iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/cmdutils.rbuild	[iso-8859-1] Sun Mar 23 01:32:46 2014
@@ -2,12 +2,6 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
    <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" />

    