[sedwards] 19153: add all of the new xml makefiles to the directory.xml thereby breaking rosapps for a bit. Move some stuff around to avoid naming conflicts.
add all of the new xml makefiles to the directory.xml thereby breaking rosapps for a bit. Move some stuff around to avoid naming conflicts. Deleted: trunk/rosapps/tests/button2/accelerator.xml Added: trunk/rosapps/tests/button2/button2.xml Deleted: trunk/rosapps/tests/combo/ Added: trunk/rosapps/tests/combotst/ Added: trunk/rosapps/tests/combotst/combotst.xml Deleted: trunk/rosapps/tests/combotst/makefile Modified: trunk/rosapps/tests/directory.xml Modified: trunk/rosapps/tests/fiber/fiber.xml Deleted: trunk/rosapps/tests/lan/ Added: trunk/rosapps/tests/lantst/ Added: trunk/rosapps/tests/lantst/lantest.xml Deleted: trunk/rosapps/tests/lantst/makefile Deleted: trunk/rosapps/tests/lpc/ Added: trunk/rosapps/tests/lpctst/ Added: trunk/rosapps/tests/lpctst/lpctst.xml Deleted: trunk/rosapps/tests/lpctst/makefile Added: trunk/rosapps/tests/wclickat/wclickat.xml Added: trunk/rosapps/tests/wpickclick/wpickclick.xml _____
Deleted: trunk/rosapps/tests/button2/accelerator.xml --- trunk/rosapps/tests/button2/accelerator.xml 2005-11-11 21:59:28 UTC (rev 19152) +++ trunk/rosapps/tests/button2/accelerator.xml 2005-11-11 22:25:19 UTC (rev 19153) @@ -1,10 +0,0 @@
-<module name="accelerator" type="win32gui" installbase="system32" installname="alphablend.exe"> - <define name="_WIN32_IE">0x0501</define> - <define name="_WIN32_WINNT">0x0501</define> - <define name="__USE_W32API" /> - - <library>kernel32</library> - <library>gdi32</library> - - <file>accelerator.c</file> -</module> \ No newline at end of file _____
Copied: trunk/rosapps/tests/button2/button2.xml (from rev 19148, trunk/rosapps/tests/button2/accelerator.xml) _____
Copied: trunk/rosapps/tests/combotst (from rev 19129, trunk/rosapps/tests/combo) _____
Copied: trunk/rosapps/tests/combotst/combotst.xml (from rev 19148, trunk/rosapps/tests/combo/combotst.xml) _____
Deleted: trunk/rosapps/tests/combotst/makefile --- trunk/rosapps/tests/combo/makefile 2005-11-11 08:58:05 UTC (rev 19129) +++ trunk/rosapps/tests/combotst/makefile 2005-11-11 22:25:19 UTC (rev 19153) @@ -1,25 +0,0 @@
- -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = windows - -TARGET_NAME = combotst - -TARGET_SDKLIBS = kernel32.a gdi32.a - -TARGET_OBJECTS = \ - combotst.o \ - utils.o - -TARGET_CFLAGS = -Wall -Werror - - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____
Modified: trunk/rosapps/tests/directory.xml --- trunk/rosapps/tests/directory.xml 2005-11-11 21:59:28 UTC (rev 19152) +++ trunk/rosapps/tests/directory.xml 2005-11-11 22:25:19 UTC (rev 19153) @@ -10,3 +10,269 @@
<directory name="apc"> <xi:include href="apc/apc.xml" /> </directory> +<directory name="apc2"> + <xi:include href="apc2/apc2.xml" /> +</directory> +<directory name="args"> + <xi:include href="args/args.xml" /> +</directory> +<directory name="atomtest"> + <xi:include href="atomtest/atomtest.xml" /> +</directory> +<directory name="bench"> + <xi:include href="bench/bench.xml" /> +</directory> +<directory name="bitblt"> + <xi:include href="bitblt/bitblt.xml" /> +</directory> +<directory name="button"> + <xi:include href="button/button.xml" /> +</directory> +<directory name="button2"> + <xi:include href="button2/button2.xml" /> +</directory> +<directory name="capclock"> + <xi:include href="capclock/capclock.xml" /> +</directory> +<directory name="carets"> + <xi:include href="carets/carets.xml" /> +</directory> +<directory name="combotst"> + <xi:include href="combotst/combotst.xml" /> +</directory> +<directory name="consume"> + <xi:include href="consume/consume.xml" /> +</directory> +<directory name="copymove"> + <xi:include href="copymove/copymove.xml" /> +</directory> +<directory name="count"> + <xi:include href="count/count.xml" /> +</directory> +<directory name="create-links"> + <xi:include href="create-links/create-links.xml" /> +</directory> +<directory name="dibtest"> + <xi:include href="dibtest/dibtest.xml" /> +</directory> +<directory name="dirdlg"> + <xi:include href="dirdlg/dirdlg.xml" /> +</directory> +<directory name="diskspeed"> + <xi:include href="diskspeed/diskspeed.xml" /> +</directory> +<directory name="dnsapi"> + <xi:include href="dnsapi/dnsapi.xml" /> +</directory> +<directory name="dnsquery"> + <xi:include href="dnsquery/dnsquery.xml" /> +</directory> +<directory name="dump_shared_data"> + <xi:include href="dump_shared_data/dump_shared_data.xml" /> +</directory> +<directory name="edit"> + <xi:include href="edit/edit.xml" /> +</directory> +<directory name="enhmetafile"> + <xi:include href="enhmetafile/enhmetafile.xml" /> +</directory> +<directory name="enumfonts"> + <xi:include href="enumfonts/enumfonts.xml" /> +</directory> +<directory name="enumwnd"> + <xi:include href="enumwnd/enumwnd.xml" /> +</directory> +<directory name="enumws"> + <xi:include href="enumws/enumws.xml" /> +</directory> +<directory name="event"> + <xi:include href="event/event.xml" /> +</directory> +<directory name="eventpair"> + <xi:include href="eventpair/eventpair.xml" /> +</directory> +<directory name="fiber"> + <xi:include href="fiber/fiber.xml" /> +</directory> +<directory name="gethostbyname"> + <xi:include href="gethostbyname/gethostbyname.xml" /> +</directory> +<directory name="global_mem"> + <xi:include href="global_mem/global_mem.xml" /> +</directory> +<directory name="gradient"> + <xi:include href="gradient/gradient.xml" /> +</directory> +<directory name="guithreadinfo"> + <xi:include href="guithreadinfo/guithreadinfo.xml" /> +</directory> +<directory name="hello"> + <xi:include href="hello/hello.xml" /> +</directory> +<directory name="hivetest"> + <xi:include href="hivetest/hivetest.xml" /> +</directory> +<directory name="icontest"> + <xi:include href="icontest/icontest.xml" /> +</directory> +<directory name="iptest"> + <xi:include href="iptest/iptest.xml" /> +</directory> +<directory name="isotest"> + <xi:include href="isotest/isotest.xml" /> +</directory> +<directory name="lantst"> + <xi:include href="lantst/lantest.xml" /> +</directory> +<directory name="lineclip"> + <xi:include href="lineclip/lineclip.xml" /> +</directory> +<directory name="linetest"> + <xi:include href="linetest/linetest.xml" /> +</directory> +<directory name="lpctst"> + <xi:include href="lpctst/lpctst.xml" /> +</directory> +<directory name="map_dup_inherit"> + <xi:include href="map_dup_inherit/map_dup_inherit.xml" /> +</directory> +<directory name="mdi"> + <xi:include href="mdi/mdi.xml" /> +</directory> +<directory name="miditest"> + <xi:include href="miditest/miditest.xml" /> +</directory> +<directory name="mktime"> + <xi:include href="mktime/mktime.xml" /> +</directory> +<directory name="moztest"> + <xi:include href="moztest/moztest.xml" /> +</directory> +<directory name="mstest"> + <xi:include href="mstest/mstest.xml" /> +</directory> +<directory name="multithrdwin"> + <xi:include href="multithrdwin/multithrdwin.xml" /> +</directory> +<directory name="multiwin"> + <xi:include href="multiwin/multiwin.xml" /> +</directory> +<directory name="mutex"> + <xi:include href="mutex/mutex.xml" /> +</directory> +<directory name="nameserverlist"> + <xi:include href="nameserverlist/nameserverlist.xml" /> +</directory> +<directory name="noexecute"> + <xi:include href="noexecute/noexecute.xml" /> +</directory> +<directory name="nptest"> + <xi:include href="nptest/nptest.xml" /> +</directory> +<directory name="oskittcp"> + <xi:include href="oskittcp/oskittcp.xml" /> +</directory> +<directory name="palbitblt"> + <xi:include href="palbitblt/palbitblt.xml" /> +</directory> +<directory name="patblt"> + <xi:include href="patblt/patblt.xml" /> +</directory> +<directory name="polytest"> + <xi:include href="polytest/polytest.xml" /> +</directory> +<directory name="popupmenu"> + <xi:include href="popupmenu/popupmenu.xml" /> +</directory> +<directory name="primitives"> + <xi:include href="primitives/primitives.xml" /> +</directory> +<directory name="pteb"> + <xi:include href="pteb/pteb.xml" /> +</directory> +<directory name="p_dup_handle"> + <xi:include href="p_dup_handle/p_dup_handle.xml" /> +</directory> +<directory name="regdump"> + <xi:include href="regdump/regdump.xml" /> +</directory> +<directory name="regqueryvalue"> + <xi:include href="regqueryvalue/regqueryvalue.xml" /> +</directory> +<directory name="regtest"> + <xi:include href="regtest/regtest.xml" /> +</directory> +<directory name="sectest"> + <xi:include href="sectest/sectest.xml" /> +</directory> +<directory name="sertest"> + <xi:include href="sertest/sertest.xml" /> +</directory> +<directory name="shaptest"> + <xi:include href="shaptest/shaptest.xml" /> +</directory> +<directory name="shm"> + <xi:include href="shm/shm.xml" /> +</directory> +<directory name="statst"> + <xi:include href="statst/statst.xml" /> +</directory> +<directory name="statst2"> + <xi:include href="statst2/statst2.xml" /> +</directory> +<directory name="stretchblt"> + <xi:include href="stretchblt/stretchblt.xml" /> +</directory> +<directory name="subclass"> + <xi:include href="subclass/subclass.xml" /> +</directory> +<directory name="suspend"> + <xi:include href="suspend/suspend.xml" /> +</directory> +<directory name="tcpsvr"> + <xi:include href="tcpsvr/tcpsvr.xml" /> +</directory> +<directory name="terminate"> + <xi:include href="terminate/terminate.xml" /> +</directory> +<directory name="thread"> + <xi:include href="thread/thread.xml" /> +</directory> +<directory name="threadwait"> + <xi:include href="threadwait/threadwait.xml" /> +</directory> +<directory name="thread_msg"> + <xi:include href="thread_msg/thread_msg.xml" /> +</directory> +<directory name="tmrqueue"> + <xi:include href="tmrqueue/tmrqueue.xml" /> +</directory> +<directory name="tokentest"> + <xi:include href="tokentest/tokentest.xml" /> +</directory> +<directory name="txtscale"> + <xi:include href="txtscale/txtscale.xml" /> +</directory> + +<directory name="vmtest/vmtest"> + <xi:include href="vmtest/vmtest.xml" /> +</directory> +<directory name="wclickat"> + <xi:include href="wclickat/wclickat.xml" /> +</directory> +<directory name="winhello"> + <xi:include href="winhello/winhello.xml" /> +</directory> +<directory name="wm_erasebkgnd"> + <xi:include href="wm_erasebkgnd/wm_erasebkgnd.xml" /> +</directory> +<directory name="wm_paint"> + <xi:include href="wm_paint/wm_paint.xml" /> +</directory> +<directory name="wpickclick"> + <xi:include href="wpickclick/wpickclick.xml" /> +</directory> +<directory name="zwcontinue"> + <xi:include href="zwcontinue/zwcontinue.xml" /> +</directory> + _____
Modified: trunk/rosapps/tests/fiber/fiber.xml --- trunk/rosapps/tests/fiber/fiber.xml 2005-11-11 21:59:28 UTC (rev 19152) +++ trunk/rosapps/tests/fiber/fiber.xml 2005-11-11 22:25:19 UTC (rev 19153) @@ -1,4 +1,4 @@
-<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> +<module name="fiber" type="win32gui" installbase="system32" installname="alphablend.exe"> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> @@ -6,5 +6,5 @@ <library>kernel32</library> <library>gdi32</library>
- <file>alphablend.c</file> + <file>fiber.c</file> </module> \ No newline at end of file _____
Copied: trunk/rosapps/tests/lantst (from rev 19129, trunk/rosapps/tests/lan) _____
Copied: trunk/rosapps/tests/lantst/lantest.xml (from rev 19148, trunk/rosapps/tests/lan/lantest.xml) _____
Deleted: trunk/rosapps/tests/lantst/makefile --- trunk/rosapps/tests/lan/makefile 2005-11-11 08:58:05 UTC (rev 19129) +++ trunk/rosapps/tests/lantst/makefile 2005-11-11 22:25:19 UTC (rev 19153) @@ -1,24 +0,0 @@
-# -# $Id: makefile,v 1.1 2004/10/21 04:58:58 sedwards Exp $ - -PATH_TO_TOP = ../../../reactos - -TARGET_NORC = yes - -TARGET_TYPE = program - -TARGET_APPTYPE = console - -TARGET_NAME = lantest - -TARGET_SDKLIBS = ws2_32.a ntdll.a - -TARGET_OBJECTS = lantest.o -lstdc++ - -TARGET_CPPFLAGS = -I$(PATH_TO_TOP)/include -g - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk - -# EOF _____
Copied: trunk/rosapps/tests/lpctst (from rev 19129, trunk/rosapps/tests/lpc) _____
Copied: trunk/rosapps/tests/lpctst/lpctst.xml (from rev 19148, trunk/rosapps/tests/lpc/lpctst.xml) _____
Deleted: trunk/rosapps/tests/lpctst/makefile --- trunk/rosapps/tests/lpc/makefile 2005-11-11 08:58:05 UTC (rev 19129) +++ trunk/rosapps/tests/lpctst/makefile 2005-11-11 22:25:19 UTC (rev 19153) @@ -1,52 +0,0 @@
-# -# -# -PATH_TO_TOP = ../../../reactos - -include $(PATH_TO_TOP)/config -include $(PATH_TO_TOP)/rules.mak - -SRV_OBJECTS= lpcsrv.o -CLT_OBJECTS= lpcclt.o - -PROGS= lpcsrv.exe lpcclt.exe - -CFLAGS = $(STD_CFLAGS) - -LIBS = $(SDK_PATH_LIB)/libkernel32.a \ - $(SDK_PATH_LIB)/libntdll.a - -all: $(PROGS) - -.phony: all - -implib: - -clean: - - $(RM) lpcsrv.o lpcsrv.exe lpcsrv.sym lpcclt.o lpcclt.exe lpcclt.sym - -.phony: implib clean - -ifneq ($(BOOTCD_INSTALL),) - -install: $(PROGS:%=$(INSTALL_DIR)/%) - -$(PROGS:%=$(INSTALL_DIR)/%): $(INSTALL_DIR)/%: % - $(CP) $* $(INSTALL_DIR)/$* - -else # BOOTCD_INSTALL - -install: $(PROGS:%=$(INSTALL_DIR)/bin/%) - -$(PROGS:%=$(INSTALL_DIR)/bin/%): $(INSTALL_DIR)/bin/%: % - $(CP) $* $(INSTALL_DIR)/bin/$* - -endif # BOOTCD_INSTALL - -lpcsrv.exe: $(SRV_OBJECTS) $(LIBS) - $(CC) $(SRV_OBJECTS) $(LIBS) -o lpcsrv.exe - $(NM) --numeric-sort lpcsrv.exe > lpcsrv.sym - -lpcclt.exe: $(CLT_OBJECTS) $(LIBS) - $(CC) $(CLT_OBJECTS) $(LIBS) -o lpcclt.exe - $(NM) --numeric-sort lpcclt.exe > lpcclt.sym _____
Added: trunk/rosapps/tests/wclickat/wclickat.xml --- trunk/rosapps/tests/wclickat/wclickat.xml 2005-11-11 21:59:28 UTC (rev 19152) +++ trunk/rosapps/tests/wclickat/wclickat.xml 2005-11-11 22:25:19 UTC (rev 19153) @@ -0,0 +1,10 @@
+<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file _____
Added: trunk/rosapps/tests/wpickclick/wpickclick.xml --- trunk/rosapps/tests/wpickclick/wpickclick.xml 2005-11-11 21:59:28 UTC (rev 19152) +++ trunk/rosapps/tests/wpickclick/wpickclick.xml 2005-11-11 22:25:19 UTC (rev 19153) @@ -0,0 +1,10 @@
+<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + + <library>kernel32</library> + <library>gdi32</library> + + <file>alphablend.c</file> +</module> \ No newline at end of file
-
sedwards＠svn.reactos.com