29 Oct
2007
29 Oct
'07
9:30 p.m.
Author: cfinck
Date: Tue Oct 30 00:30:02 2007
New Revision: 29961
URL: http://svn.reactos.org/svn/reactos?rev=29961&view=rev
Log:
Move cylfrac, matrix, scrmsave and starfield to rosapps as proposed on the mailing list.
New screensavers should only go there now.
I created an "applications/screensavers" directory for that, eventually rosapps
should get a similar directory structure to reactos.
Also changed the appropriate parts in reactos.dff.
Added:
trunk/rosapps/applications/ (with props)
trunk/rosapps/applications/applications.rbuild (with props)
trunk/rosapps/applications/screensavers/ (with props)
trunk/rosapps/applications/screensavers/cylfrac/
- copied from r29957, trunk/reactos/base/applications/screensavers/cylfrac/
trunk/rosapps/applications/screensavers/matrix/
- copied from r29957, trunk/reactos/base/applications/screensavers/matrix/
trunk/rosapps/applications/screensavers/screensavers.rbuild (with props)
trunk/rosapps/applications/screensavers/scrnsave/
- copied from r29957, trunk/reactos/base/applications/screensavers/scrnsave/
trunk/rosapps/applications/screensavers/starfield/
- copied from r29957, trunk/reactos/base/applications/screensavers/starfield/
Removed:
trunk/reactos/base/applications/screensavers/cylfrac/
trunk/reactos/base/applications/screensavers/matrix/
trunk/reactos/base/applications/screensavers/scrnsave/
trunk/reactos/base/applications/screensavers/starfield/
Modified:
trunk/reactos/base/applications/screensavers/screensavers.rbuild
trunk/reactos/boot/bootdata/packages/reactos.dff
trunk/rosapps/directory.rbuild
Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa…
==============================================================================
--- trunk/reactos/base/applications/screensavers/screensavers.rbuild (original)
+++ trunk/reactos/base/applications/screensavers/screensavers.rbuild Tue Oct 30 00:30:02
2007
@@ -4,19 +4,7 @@
<directory name="3dtext">
<xi:include href="3dtext/3dtext.rbuild" />
</directory>
- <directory name="cylfrac">
- <xi:include href="cylfrac/cylfrac.rbuild" />
- </directory>
<directory name="logon">
<xi:include href="logon/logon.rbuild" />
</directory>
- <directory name="matrix">
- <xi:include href="matrix/matrix.rbuild" />
- </directory>
- <directory name="scrnsave">
- <xi:include href="scrnsave/scrnsave.rbuild" />
- </directory>
- <directory name="starfield">
- <xi:include href="starfield/starfield.rbuild" />
- </directory>
-</group>
+</group>
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff Tue Oct 30 00:30:02 2007
@@ -60,11 +60,8 @@
base\applications\regedit\regedit.exe 4
base\applications\regedit\clb\clb.dll 1
base\applications\sc\sc.exe 1
-base\applications\screensavers\cylfrac\cylfrac.scr 1
+base\applications\screensavers\3dtext\3dtext.scr 1
base\applications\screensavers\logon\logon.scr 1
-base\applications\screensavers\matrix\matrix.scr 1
-base\applications\screensavers\scrnsave\scrnsave.scr 1
-base\applications\screensavers\starfield\starfield.scr 1
base\applications\mscutils\servman\servman.exe 1
base\applications\shutdown\shutdown.exe 1
base\applications\sndvol32\sndvol32.exe 1
@@ -445,96 +442,100 @@
tools\dbgprint\dbgprint.exe 7 optional
; Modules
-modules\os2\server\os2srv.dll 1 optional
-modules\os2\dll\win32\doscalls\doscalls.dll 1 optional
-modules\posix\server\psxsrv.dll 1 optional
-modules\posix\dll\win32\psxdll\psxdll.dll 1 optional
-modules\rosky\dll\win32\libsky\libsky.dll 1 optional
-modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional
-modules\vms\server\vmssrv.dll 1 optional
-modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional
-modules\rosapps\avtest\avtest.sys 1 optional
-modules\rosapps\cmdutils\comp\comp.exe 1 optional
-modules\rosapps\cmdutils\mode\mode.exe 1 optional
-modules\rosapps\cmdutils\sort\sort.exe 1 optional
-modules\rosapps\cmdutils\tee\tee.exe 1 optional
-modules\rosapps\cmdutils\touch\touch.exe 1 optional
-modules\rosapps\cmdutils\uptime\uptime.exe 1 optional
-modules\rosapps\cmdutils\y\y.exe 1 optional
-modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional
-modules\rosapps\demos\maze\maze.exe 1 optional
-modules\rosapps\devutils\cputointel\cputointel.exe 1 optional
-modules\rosapps\devutils\gdb2\gdb2.exe 1 optional
-modules\rosapps\devutils\gdihv\gdihv.exe 1 optional
-modules\rosapps\devutils\genguid\genguid.exe 1 optional
-modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional
-modules\rosapps\devutils\zoomin\zoomin.exe 1 optional
-modules\rosapps\dflat32\edit.exe 1 optional
-modules\rosapps\downloader\downloader.exe 1 optional
-modules\rosapps\downloader\downloader.xml 1 optional
-modules\rosapps\gettype\gettype.exe 1 optional
-modules\rosapps\green\green.sys 1 optional
-modules\rosapps\imagesoft\imagesoft.exe 1 optional
-modules\rosapps\lib\dflat32\dflat32.dll 1 optional
-modules\rosapps\mc\mc.exe 1 optional
-modules\rosapps\net\ncftp\ncftp.exe 1 optional
-modules\rosapps\net\netreg\netreg.exe 1 optional
-modules\rosapps\net\niclist\niclist.exe 1 optional
-modules\rosapps\notevil\notevil.exe 1 optional
-modules\rosapps\magnify\magnify.exe 1 optional
-modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional
-modules\rosapps\packmgr\gui\packmgr.exe 1 optional
-modules\rosapps\packmgr\lib\package.dll 1 optional
-modules\rosapps\ramdrv\ramdrv.sys 1 optional
-modules\rosapps\roshttpd\roshttpd.exe 1 optional
-modules\rosapps\screenshot\screenshot.exe 1 optional
-modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional
-modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional
-modules\rosapps\sysutils\chklib\chklib.exe 1 optional
-modules\rosapps\sysutils\ctm\ctm.exe 1 optional
-modules\rosapps\sysutils\kill\kill.exe 1 optional
-modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional
-modules\rosapps\sysutils\man\man.exe 1 optional
-modules\rosapps\sysutils\pedump\pedump.exe 1 optional
-modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional
-modules\rosapps\sysutils\tcat\tcat.exe 1 optional
-modules\rosapps\sysutils\tlist\tlist.exe 1 optional
-modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional
-modules\rosapps\sysutils\utils\cat\cat.exe 1 optional
-modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional
-modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional
-modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional
-modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional
-modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional
-modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional
-modules\rosapps\sysutils\utils\ps\ps.exe 1 optional
-modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional
-modules\rosapps\sysutils\utils\stats\stats.exe 1 optional
-modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional
-modules\rosapps\templates\dialog.exe 1 optional
-modules\rosapps\templates\mdi.exe 1 optional
-modules\rosapps\winefile\winefile.exe 1 optional
-modules\rosapps\winver\winver.exe 1 optional
-modules\rosapps\write\write.exe 1 optional
-modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional
-modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional
-modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional
-modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional
-modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional
-modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional
-modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional
-modules\rostests\winetests\msi\msi_winetest.exe 7 optional
-modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional
-modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional
-modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional
-modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional
-modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional
-modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional
-modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional
-modules\rostests\winetests\user32\user32_winetest.exe 7 optional
-modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional
-modules\rostests\winetests\version\version_winetest.exe 7 optional
-modules\wallpaper\lake.bmp 4 optional
+modules\os2\server\os2srv.dll 1 optional
+modules\os2\dll\win32\doscalls\doscalls.dll 1 optional
+modules\posix\server\psxsrv.dll 1 optional
+modules\posix\dll\win32\psxdll\psxdll.dll 1 optional
+modules\rosky\dll\win32\libsky\libsky.dll 1 optional
+modules\rosky\dll\win32\libskygi\libskygi.dll 1 optional
+modules\vms\server\vmssrv.dll 1 optional
+modules\vms\dll\win32\vmsdll\vmsdll.dll 1 optional
+modules\rosapps\avtest\avtest.sys 1 optional
+modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr 1 optional
+modules\rosapps\applications\screensavers\matrix\matrix.scr 1 optional
+modules\rosapps\applications\screensavers\scrnsave\scrnsave.scr 1 optional
+modules\rosapps\applications\screensavers\starfield\starfield.scr 1 optional
+modules\rosapps\cmdutils\comp\comp.exe 1 optional
+modules\rosapps\cmdutils\mode\mode.exe 1 optional
+modules\rosapps\cmdutils\sort\sort.exe 1 optional
+modules\rosapps\cmdutils\tee\tee.exe 1 optional
+modules\rosapps\cmdutils\touch\touch.exe 1 optional
+modules\rosapps\cmdutils\uptime\uptime.exe 1 optional
+modules\rosapps\cmdutils\y\y.exe 1 optional
+modules\rosapps\demos\ddraw\ddraw_demo.exe 1 optional
+modules\rosapps\demos\maze\maze.exe 1 optional
+modules\rosapps\devutils\cputointel\cputointel.exe 1 optional
+modules\rosapps\devutils\gdb2\gdb2.exe 1 optional
+modules\rosapps\devutils\gdihv\gdihv.exe 1 optional
+modules\rosapps\devutils\genguid\genguid.exe 1 optional
+modules\rosapps\devutils\roswebparser\roswebparser.exe 1 optional
+modules\rosapps\devutils\zoomin\zoomin.exe 1 optional
+modules\rosapps\dflat32\edit.exe 1 optional
+modules\rosapps\downloader\downloader.exe 1 optional
+modules\rosapps\downloader\downloader.xml 1 optional
+modules\rosapps\gettype\gettype.exe 1 optional
+modules\rosapps\green\green.sys 1 optional
+modules\rosapps\imagesoft\imagesoft.exe 1 optional
+modules\rosapps\lib\dflat32\dflat32.dll 1 optional
+modules\rosapps\mc\mc.exe 1 optional
+modules\rosapps\net\ncftp\ncftp.exe 1 optional
+modules\rosapps\net\netreg\netreg.exe 1 optional
+modules\rosapps\net\niclist\niclist.exe 1 optional
+modules\rosapps\notevil\notevil.exe 1 optional
+modules\rosapps\magnify\magnify.exe 1 optional
+modules\rosapps\packmgr\cmd-line\rosget.exe 1 optional
+modules\rosapps\packmgr\gui\packmgr.exe 1 optional
+modules\rosapps\packmgr\lib\package.dll 1 optional
+modules\rosapps\ramdrv\ramdrv.sys 1 optional
+modules\rosapps\roshttpd\roshttpd.exe 1 optional
+modules\rosapps\screenshot\screenshot.exe 1 optional
+modules\rosapps\sysutils\chkdsk\chkdsk.exe 1 optional
+modules\rosapps\sysutils\systeminfo\systeminfo.exe 1 optional
+modules\rosapps\sysutils\chklib\chklib.exe 1 optional
+modules\rosapps\sysutils\ctm\ctm.exe 1 optional
+modules\rosapps\sysutils\kill\kill.exe 1 optional
+modules\rosapps\sysutils\lsdd\lsdd.exe 1 optional
+modules\rosapps\sysutils\man\man.exe 1 optional
+modules\rosapps\sysutils\pedump\pedump.exe 1 optional
+modules\rosapps\sysutils\regexpl\regexpl.exe 1 optional
+modules\rosapps\sysutils\tcat\tcat.exe 1 optional
+modules\rosapps\sysutils\tlist\tlist.exe 1 optional
+modules\rosapps\sysutils\utils\binpatch\binpatch.exe 1 optional
+modules\rosapps\sysutils\utils\cat\cat.exe 1 optional
+modules\rosapps\sysutils\utils\driver\load\load.exe 1 optional
+modules\rosapps\sysutils\utils\driver\unload\unload.exe 1 optional
+modules\rosapps\sysutils\utils\infinst\infinst.exe 1 optional
+modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe 1 optional
+modules\rosapps\sysutils\utils\objdir\objdir.exe 1 optional
+modules\rosapps\sysutils\utils\partinfo\partinfo.exe 1 optional
+modules\rosapps\sysutils\utils\ps\ps.exe 1 optional
+modules\rosapps\sysutils\utils\rosperf\rosperf.exe 1 optional
+modules\rosapps\sysutils\utils\stats\stats.exe 1 optional
+modules\rosapps\sysutils\utils\tickcount\tickcount.exe 1 optional
+modules\rosapps\templates\dialog.exe 1 optional
+modules\rosapps\templates\mdi.exe 1 optional
+modules\rosapps\winefile\winefile.exe 1 optional
+modules\rosapps\winver\winver.exe 1 optional
+modules\rosapps\write\write.exe 1 optional
+modules\rostests\winetests\advapi32\advapi32_winetest.exe 7 optional
+modules\rostests\winetests\cabinet\cabinet_winetest.exe 7 optional
+modules\rostests\winetests\comctl32\comctl32_winetest.exe 7 optional
+modules\rostests\winetests\gdi32\gdi32_winetest.exe 7 optional
+modules\rostests\winetests\icmp\icmp_winetest.exe 7 optional
+modules\rostests\winetests\kernel32\kernel32_winetest.exe 7 optional
+modules\rostests\winetests\lz32\lz32_winetest.exe 7 optional
+modules\rostests\winetests\msi\msi_winetest.exe 7 optional
+modules\rostests\winetests\msvcrt\msvcrt_winetest.exe 7 optional
+modules\rostests\winetests\ntdll\ntdll_winetest.exe 7 optional
+modules\rostests\winetests\powrprof\powrprof_winetest.exe 7 optional
+modules\rostests\winetests\psapi\psapi_winetest.exe 7 optional
+modules\rostests\winetests\setupapi\setupapi_winetest.exe 7 optional
+modules\rostests\winetests\shell32\shell32_winetest.exe 7 optional
+modules\rostests\winetests\shlwapi\shlwapi_winetest.exe 7 optional
+modules\rostests\winetests\user32\user32_winetest.exe 7 optional
+modules\rostests\winetests\usp10\usp10_winetest.exe 7 optional
+modules\rostests\winetests\version\version_winetest.exe 7 optional
+modules\wallpaper\lake.bmp 4 optional
; Native libraries
-modules\windows\mfc42.dll 1 optional
+modules\windows\mfc42.dll 1 optional
Propchange: trunk/rosapps/applications/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 30 00:30:02 2007
@@ -1,0 +1,7 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln
Added: trunk/rosapps/applications/applications.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.…
==============================================================================
--- trunk/rosapps/applications/applications.rbuild (added)
+++ trunk/rosapps/applications/applications.rbuild Tue Oct 30 00:30:02 2007
@@ -1,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+ <directory name="screensavers">
+ <xi:include href="screensavers/screensavers.rbuild" />
+ </directory>
+</group>
Propchange: trunk/rosapps/applications/applications.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/rosapps/applications/screensavers/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 30 00:30:02 2007
@@ -1,0 +1,7 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln
Added: trunk/rosapps/applications/screensavers/screensavers.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/screensavers.rbuild (added)
+++ trunk/rosapps/applications/screensavers/screensavers.rbuild Tue Oct 30 00:30:02 2007
@@ -1,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+ <directory name="cylfrac">
+ <xi:include href="cylfrac/cylfrac.rbuild" />
+ </directory>
+ <directory name="matrix">
+ <xi:include href="matrix/matrix.rbuild" />
+ </directory>
+ <directory name="scrnsave">
+ <xi:include href="scrnsave/scrnsave.rbuild" />
+ </directory>
+ <directory name="starfield">
+ <xi:include href="starfield/starfield.rbuild" />
+ </directory>
+</group>
Propchange: trunk/rosapps/applications/screensavers/screensavers.rbuild
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/rosapps/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29961…
==============================================================================
--- trunk/rosapps/directory.rbuild (original)
+++ trunk/rosapps/directory.rbuild Tue Oct 30 00:30:02 2007
@@ -7,6 +7,10 @@
</directory>
-->
+ <directory name="applications">
+ <xi:include href="applications/applications.rbuild" />
+ </directory>
+
<directory name="cmdutils">
<xi:include href="cmdutils/cmdutils.rbuild" />
</directory>
@@ -120,4 +124,4 @@
<directory name="write">
<xi:include href="write/write.rbuild" />
</directory>
-</group>
+</group>