Author: spetreolle Date: Tue Feb 14 14:03:05 2012 New Revision: 55592
URL: http://svn.reactos.org/svn/reactos?rev=55592&view=rev Log: [ROSAPPS] Add cmdutils apps to build.
Added: trunk/rosapps/applications/cmdutils/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/y/CMakeLists.txt (with props) Modified: trunk/rosapps/applications/CMakeLists.txt trunk/rosapps/applications/cmdutils/cmdutils.rbuild trunk/rosapps/applications/cmdutils/mode/mode.c
Modified: trunk/rosapps/applications/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/CMakeLists.txt... ============================================================================== --- trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,4 +1,4 @@ -#add_subdirectory(cmdutils) +add_subdirectory(cmdutils) #add_subdirectory(devutils) #add_subdirectory(fraginator) #add_subdirectory(net)
Added: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMake... ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/appwi... ============================================================================== --- trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/appwiz/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
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] Tue Feb 14 14:03:05 2012 @@ -18,10 +18,10 @@ <directory name="touch"> <xi:include href="touch/touch.rbuild" /> </directory> + <directory name="uptime"> + <xi:include href="uptime/uptime.rbuild" /> + </directory> <directory name="y"> <xi:include href="y/y.rbuild" /> </directory> - <directory name="uptime"> - <xi:include href="uptime/uptime.rbuild" /> - </directory> </group>
Added: trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/comp/... ============================================================================== --- trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/comp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/mode/... ============================================================================== --- trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/mode/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/rosapps/applications/cmdutils/mode/mode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/mode/... ============================================================================== --- trunk/rosapps/applications/cmdutils/mode/mode.c [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/mode/mode.c [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -72,7 +72,7 @@
int QueryDevices() { - TCHAR buffer[10240]; + TCHAR buffer[20240]; int len; TCHAR* ptr = buffer;
@@ -87,12 +87,12 @@ } 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 { - _tprintf(_T(" ERROR: QueryDosDevice(...) failed.\n")); + _tprintf(_T(" ERROR: QueryDosDevice(...) failed.%ld\n"), GetLastError()); } return 1; }
Added: trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/sort/... ============================================================================== --- trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/sort/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/tee/C... ============================================================================== --- trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/tee/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/touch... ============================================================================== --- trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/touch/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/uptim... ============================================================================== --- trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/uptime/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/rosapps/applications/cmdutils/y/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/y/CMa... ============================================================================== --- trunk/rosapps/applications/cmdutils/y/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/y/CMakeLists.txt [iso-8859-1] Tue Feb 14 14:03:05 2012 @@ -1,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)
Propchange: trunk/rosapps/applications/cmdutils/y/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native