[ROSAPPS]

Add cmdutils apps to build.

svn path=/trunk/; revision=55592

diff --git a/rosapps/applications/CMakeLists.txt b/rosapps/applications/CMakeLists.txt
index bdfecae..d71d214 100644 (file)
--- a/rosapps/applications/CMakeLists.txt
+++ b/rosapps/applications/CMakeLists.txt
@@ -1,4 +1,4 @@
-#add_subdirectory(cmdutils)
+add_subdirectory(cmdutils)

 #add_subdirectory(devutils)
 #add_subdirectory(fraginator)
 #add_subdirectory(net)
 #add_subdirectory(devutils)
 #add_subdirectory(fraginator)
 #add_subdirectory(net)

diff --git a/rosapps/applications/cmdutils/CMakeLists.txt b/rosapps/applications/cmdutils/CMakeLists.txt
new file mode 100644 (file)
index 0000000..414ae3e
--- /dev/null
+++ b/rosapps/applications/cmdutils/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_subdirectory(appwiz)
+add_subdirectory(comp)
+add_subdirectory(mode)
+add_subdirectory(sort)
+add_subdirectory(tee)
+add_subdirectory(touch)
+add_subdirectory(uptime)
+add_subdirectory(y)

diff --git a/rosapps/applications/cmdutils/appwiz/CMakeLists.txt b/rosapps/applications/cmdutils/appwiz/CMakeLists.txt
new file mode 100644 (file)
index 0000000..0f3aac8
--- /dev/null
+++ b/rosapps/applications/cmdutils/appwiz/CMakeLists.txt
@@ -0,0 +1,6 @@
+
+add_executable(appwiz.exe appwiz.c appwiz.rc)
+set_module_type(appwiz.exe win32cui)
+set_target_properties(appwiz.exe PROPERTIES SUFFIX "")
+add_importlibs(appwiz.exe advapi32 user32 shell32 msvcrt kernel32)
+add_cd_file(TARGET appwiz.exe DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/applications/cmdutils/cmdutils.rbuild b/rosapps/applications/cmdutils/cmdutils.rbuild
index 919110c..0d977f7 100644 (file)
--- a/rosapps/applications/cmdutils/cmdutils.rbuild
+++ b/rosapps/applications/cmdutils/cmdutils.rbuild
@@ -18,10 +18,10 @@
        <directory name="touch">
                <xi:include href="touch/touch.rbuild" />
        </directory>
        <directory name="touch">
                <xi:include href="touch/touch.rbuild" />
        </directory>

-       <directory name="y">
-               <xi:include href="y/y.rbuild" />
-       </directory>

        <directory name="uptime">
                <xi:include href="uptime/uptime.rbuild" />
        </directory>
        <directory name="uptime">
                <xi:include href="uptime/uptime.rbuild" />
        </directory>

+       <directory name="y">
+               <xi:include href="y/y.rbuild" />
+       </directory>

 </group>
 </group>

diff --git a/rosapps/applications/cmdutils/comp/CMakeLists.txt b/rosapps/applications/cmdutils/comp/CMakeLists.txt
new file mode 100644 (file)
index 0000000..4401ba8
--- /dev/null
+++ b/rosapps/applications/cmdutils/comp/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(comp comp.c comp.rc)
+set_module_type(comp win32cui)
+add_importlibs(comp msvcrt kernel32)
+add_cd_file(TARGET comp DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/applications/cmdutils/mode/CMakeLists.txt b/rosapps/applications/cmdutils/mode/CMakeLists.txt
new file mode 100644 (file)
index 0000000..578fc4b
--- /dev/null
+++ b/rosapps/applications/cmdutils/mode/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(mode mode.c mode.rc)
+set_module_type(mode win32cui)
+add_importlibs(mode shell32 user32 msvcrt kernel32)
+add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all)

diff --git a/rosapps/applications/cmdutils/mode/mode.c b/rosapps/applications/cmdutils/mode/mode.c
index 6863f7b..bdd7341 100644 (file)
--- a/rosapps/applications/cmdutils/mode/mode.c
+++ b/rosapps/applications/cmdutils/mode/mode.c
@@ -72,7 +72,7 @@ int Usage()
 
 int QueryDevices()
 {
 
 int QueryDevices()
 {

-    TCHAR buffer[10240];
+    TCHAR buffer[20240];

     int len;
     TCHAR* ptr = buffer;
 
     int len;
     TCHAR* ptr = buffer;
 


@@ -87,12 +87,12 @@ int QueryDevices()
             } else if (_tcsstr(ptr, _T("LPT"))) {
                 _tprintf(_T("    Found parallel device - %s\n"), ptr);
             } else {
             } else if (_tcsstr(ptr, _T("LPT"))) {
                 _tprintf(_T("    Found parallel device - %s\n"), ptr);
             } else {

-                _tprintf(_T("    Found other device - %s\n"), ptr);
+                //_tprintf(_T("    Found other device - %s\n"), ptr);

             }
             ptr += (len+1);
         }
     } else {
             }
             ptr += (len+1);
         }
     } else {

-        _tprintf(_T("    ERROR: QueryDosDevice(...) failed.\n"));
+        _tprintf(_T("    ERROR: QueryDosDevice(...) failed.%ld\n"), GetLastError());

     }
     return 1;
 }
     }
     return 1;
 }

diff --git a/rosapps/applications/cmdutils/sort/CMakeLists.txt b/rosapps/applications/cmdutils/sort/CMakeLists.txt
new file mode 100644 (file)
index 0000000..1429da4
--- /dev/null
+++ b/rosapps/applications/cmdutils/sort/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+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

diff --git a/rosapps/applications/cmdutils/tee/CMakeLists.txt b/rosapps/applications/cmdutils/tee/CMakeLists.txt
new file mode 100644 (file)
index 0000000..189648e
--- /dev/null
+++ b/rosapps/applications/cmdutils/tee/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(tee tee.c tee.rc)
+set_module_type(tee win32cui)
+add_importlibs(tee msvcrt kernel32)
+add_cd_file(TARGET tee DESTINATION reactos/system32 FOR all)
\ No newline at end of file

diff --git a/rosapps/applications/cmdutils/touch/CMakeLists.txt b/rosapps/applications/cmdutils/touch/CMakeLists.txt
new file mode 100644 (file)
index 0000000..fd5cd2a
--- /dev/null
+++ b/rosapps/applications/cmdutils/touch/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+add_executable(touch err.c touch.c touch.rc)
+target_link_libraries(touch getopt)
+set_module_type(touch win32cui)
+add_importlibs(touch msvcrt kernel32)
+if(MSVC)
+    target_link_libraries(touch oldnames)
+endif()
+
+add_cd_file(TARGET touch DESTINATION reactos/system32 FOR all)
\ No newline at end of file

diff --git a/rosapps/applications/cmdutils/uptime/CMakeLists.txt b/rosapps/applications/cmdutils/uptime/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b8e5f83
--- /dev/null
+++ b/rosapps/applications/cmdutils/uptime/CMakeLists.txt
@@ -0,0 +1,9 @@
+#add_definitions(-DLINUX_OUTPUT)
+
+add_executable(uptime uptime.c uptime.rc)
+set_module_type(uptime win32cui)
+add_importlibs(uptime msvcrt kernel32)
+if(MSVC)
+    add_importlibs(uptime ntdll)
+endif()
+add_cd_file(TARGET uptime DESTINATION reactos/system32 FOR all)
\ No newline at end of file

diff --git a/rosapps/applications/cmdutils/y/CMakeLists.txt b/rosapps/applications/cmdutils/y/CMakeLists.txt
new file mode 100644 (file)
index 0000000..926bd05
--- /dev/null
+++ b/rosapps/applications/cmdutils/y/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(y y.c y.rc)
+set_module_type(y win32cui)
+add_importlibs(y msvcrt kernel32)
+add_cd_file(TARGET y DESTINATION reactos/system32 FOR all)
\ No newline at end of file