MWS_SRX644: migrate branch mws_srx644 -> HEAD

3 files changed, 71 insertions, 57 deletions

diff --git a/udkapi/prj/build.lst b/udkapi/prj/build.lst
index ac6511030611..40bc1b008a75 100644
--- a/udkapi/prj/build.lst
+++ b/udkapi/prj/build.lst
@@ -1,22 +1,27 @@
 ua	udkapi	:	idlc NULL
 ua	udkapi									usr1	-	all	ua_mkout NULL
-ua	udkapi\com\sun\star\beans				nmake	-	all	ua_bean NULL
-ua	udkapi\com\sun\star\bridge				nmake	-	all	ua_brid NULL
-ua	udkapi\com\sun\star\connection			nmake	-	all	ua_connect NULL
-ua	udkapi\com\sun\star\container			nmake	-	all	ua_cont NULL
-ua	udkapi\com\sun\star\io					nmake	-	all	ua_io NULL
-ua	udkapi\com\sun\star\java				nmake	-	all	ua_java NULL
-ua	udkapi\com\sun\star\lang				nmake	-	all	ua_lang NULL
-ua	udkapi\com\sun\star\loader				nmake	-	all	ua_load NULL
-ua	udkapi\com\sun\star\reflection			nmake	-	all	ua_refl NULL
-ua	udkapi\com\sun\star\registry			nmake	-	all	ua_regis NULL
-ua	udkapi\com\sun\star\script				nmake	-	all	ua_scrpt NULL
-ua	udkapi\com\sun\star\test				nmake	-	all	ua_test NULL
+ua	udkapi\com\sun\star\beans		nmake	-	all	ua_bean NULL
+ua	udkapi\com\sun\star\bridge		nmake	-	all	ua_brid NULL
+ua	udkapi\com\sun\star\connection		nmake	-	all	ua_connect NULL
+ua	udkapi\com\sun\star\container		nmake	-	all	ua_cont NULL
+ua	udkapi\com\sun\star\io			nmake	-	all	ua_io NULL
+ua	udkapi\com\sun\star\java		nmake	-	all	ua_java NULL
+ua	udkapi\com\sun\star\lang		nmake	-	all	ua_lang NULL
+ua	udkapi\com\sun\star\loader		nmake	-	all	ua_load NULL
+ua	udkapi\com\sun\star\reflection		nmake	-	all	ua_refl NULL
+ua	udkapi\com\sun\star\registry		nmake	-	all	ua_regis NULL
+ua	udkapi\com\sun\star\script		nmake	-	all	ua_scrpt NULL
+ua	udkapi\com\sun\star\test		nmake	-	all	ua_test NULL
 ua	udkapi\com\sun\star\test\performance	nmake	-	all	ua_tstperform NULL
-ua	udkapi\com\sun\star\test\bridge			nmake	-	all	ua_tstbridge NULL
-ua	udkapi\com\sun\star\corba\iop			nmake	-	all	ua_iop NULL
-ua	udkapi\com\sun\star\corba\giop			nmake	-	all	ua_giop NULL
-ua	udkapi\com\sun\star\corba\iiop			nmake	-	all	ua_iiop NULL
-ua	udkapi\com\sun\star\corba				nmake	-	all	ua_corba NULL
-ua	udkapi\com\sun\star\uno					nmake	-	all	ua_uno NULL
-ua	udkapi\util								nmake	-	all	ua_util ua_bean ua_brid ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_uno NULL
+ua	udkapi\com\sun\star\test\bridge		nmake	-	all	ua_tstbridge NULL
+ua	udkapi\com\sun\star\corba\iop		nmake	-	all	ua_iop NULL
+ua	udkapi\com\sun\star\corba\giop		nmake	-	all	ua_giop NULL
+ua	udkapi\com\sun\star\corba\iiop		nmake	-	all	ua_iiop NULL
+ua	udkapi\com\sun\star\corba		nmake	-	all	ua_corba NULL
+ua	udkapi\com\sun\star\uno			nmake	-	all	ua_uno NULL
+ua	udkapi\com\sun\star\security		nmake	-	all	ua_sec ua_uno NULL
+ua	udkapi\com\sun\star\util		nmake	-	all	ua_uutil ua_lang ua_uno NULL
+ua	udkapi\com\sun\star\util\logging	nmake	-	all	ua_log		NULL
+ua	udkapi\com\sun\star\task		nmake	-	all	ua_task ua_uno		NULL
+ua	udkapi\com\sun\star			nmake	-	all	ua_star NULL
+ua	udkapi\util				nmake	-	all	ua_util ua_bean ua_brid ua_connect ua_cont ua_corba ua_giop ua_iiop ua_io ua_iop ua_java ua_lang ua_load ua_refl ua_regis ua_scrpt ua_test ua_tstbridge ua_tstperform ua_sec ua_uno ua_uutil ua_log ua_task ua_star NULL
diff --git a/udkapi/prj/d.lst b/udkapi/prj/d.lst
index 6ace69aea96f..847574fa04b6 100644
--- a/udkapi/prj/d.lst
+++ b/udkapi/prj/d.lst
@@ -1,46 +1,54 @@
-mkdir: %_DEST%\idl%_EXT%\com
-mkdir: %_DEST%\idl%_EXT%\com\sun
-mkdir: %_DEST%\idl%_EXT%\com\sun\star
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\beans
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\bridge
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\connection
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\container
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\io
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\java
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\lang
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\reflection
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\registry
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\loader
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\script
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\test
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\test\performance
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\test\bridge
-mkdir: %_DEST%\idl%_EXT%\com\sun\star\uno
+mkdir: %COMMON_DEST%\idl%_EXT%\com
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\container
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\io
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\java
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\script
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\security
+mkdir: %COMMON_DEST%\idl%_EXT%\com\sun\star\task
 
+..\%__SRC%\misc\udkapi.autodoc %_DEST%\idl%_EXT%\udkapi.autodoc
 ..\%__SRC%\ucr\udkapi.db %_DEST%\bin%_EXT%\udkapi.rdb
 ..\%__SRC%\ucrdoc\udkapi_doc.db %_DEST%\bin%_EXT%\udkapi_doc.rdb
 
-..\com\sun\star\beans\*.idl %_DEST%\idl%_EXT%\com\sun\star\beans\*.idl
-..\com\sun\star\bridge\*.idl %_DEST%\idl%_EXT%\com\sun\star\bridge\*.idl
-..\com\sun\star\connection\*.idl %_DEST%\idl%_EXT%\com\sun\star\connection\*.idl
-..\com\sun\star\container\*.idl %_DEST%\idl%_EXT%\com\sun\star\container\*.idl
-..\com\sun\star\io\*.idl %_DEST%\idl%_EXT%\com\sun\star\io\*.idl
-..\com\sun\star\java\*.idl %_DEST%\idl%_EXT%\com\sun\star\java\*.idl
-..\com\sun\star\lang\*.idl %_DEST%\idl%_EXT%\com\sun\star\lang\*.idl
-..\com\sun\star\reflection\*.idl %_DEST%\idl%_EXT%\com\sun\star\reflection\*.idl
-..\com\sun\star\registry\*.idl %_DEST%\idl%_EXT%\com\sun\star\registry\*.idl
-..\com\sun\star\loader\*.idl %_DEST%\idl%_EXT%\com\sun\star\loader\*.idl
-..\com\sun\star\script\*.idl %_DEST%\idl%_EXT%\com\sun\star\script\*.idl
-..\com\sun\star\test\*.idl %_DEST%\idl%_EXT%\com\sun\star\test\*.idl
-..\com\sun\star\test\performance\*.idl %_DEST%\idl%_EXT%\com\sun\star\test\performance\*.idl
-..\com\sun\star\test\bridge\*.idl %_DEST%\idl%_EXT%\com\sun\star\test\bridge\*.idl
-..\com\sun\star\text\*.idl %_DEST%\idl%_EXT%\com\sun\star\text\*.idl
-..\com\sun\star\uno\*.idl %_DEST%\idl%_EXT%\com\sun\star\uno\*.idl
-
+..\com\sun\star\beans\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\beans
+..\com\sun\star\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\bridge
+..\com\sun\star\connection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\connection
+..\com\sun\star\container\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\container
+..\com\sun\star\io\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\io
+..\com\sun\star\java\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\java
+..\com\sun\star\lang\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\lang
+..\com\sun\star\reflection\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\reflection
+..\com\sun\star\registry\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\registry
+..\com\sun\star\loader\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\loader
+..\com\sun\star\script\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\script
+..\com\sun\star\test\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test
+..\com\sun\star\test\performance\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\performance
+..\com\sun\star\test\bridge\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\test\bridge
+..\com\sun\star\text\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\text
+..\com\sun\star\uno\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\uno
+..\com\sun\star\util\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util
+..\com\sun\star\util\logging\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\util\logging
+..\com\sun\star\security\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\security
+..\com\sun\star\task\*.idl %COMMON_DEST%\idl%_EXT%\com\sun\star\task
 
 ..\%__SRC%\lib\lib*static*.dylib %_DEST%\lib%_EXT%\lib*static*.dylib
 ..\%__SRC%\misc\*staticdatamembers.cxx %_DEST%\inc%_EXT%\*staticdatamembers.cxx
-..\%__SRC%\misc\*staticdatamembers.h* %_DEST%\inc%_EXT%\*staticdatamembers.h*
+..\%__SRC%\misc\*staticdatamembers.h* %_DEST%\inc%_EXT%
 
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
 dos: sh -c "if test %OS% = MACOSX; then create-libstatic-link %_DEST%\lib%_EXT%; fi"
diff --git a/udkapi/prj/makefile.mk b/udkapi/prj/makefile.mk
index 5aa0b6d35fb9..47f807bac2a1 100644
--- a/udkapi/prj/makefile.mk
+++ b/udkapi/prj/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.3 $
+#   $Revision: 1.4 $
 #
-#   last change: $Author: mi $ $Date: 2003-01-21 13:17:34 $
+#   last change: $Author: hr $ $Date: 2003-03-27 17:37:30 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,6 +76,7 @@ INCLUDES= \
     com$/sun$/star$/beans$/makefile.mk \
     com$/sun$/star$/lang$/makefile.mk \
     com$/sun$/star$/uno$/makefile.mk \
+    com$/sun$/star$/uno$/util$/logging$/makefile.mk \
     com$/sun$/star$/corba$/makefile.mk			\
     com$/sun$/star$/corba$/iop$/makefile.mk 	\
     com$/sun$/star$/corba$/giop$/makefile.mk 	\