dba34b: merged DEV300m96

3 files changed, 21 insertions, 20 deletions

diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 45005591c9a2..d7588fda14f4 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -162,7 +162,7 @@ sub check
         print_logged( "Error: cannot open file \'$listname\'\n$!" );
         exit 2;
     }
-    foreach ( <DELIVERLOG> ) {
+    while ( <DELIVERLOG> ) {
         next if ( /^LINK / );
         # What's this modules' repository?
         if ( /COPY\s+(.+?)\/$module\/prj\/build.lst/ ) {
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 059619e8c949..64ccae6d6d93 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -55,6 +55,23 @@ my_components = \
     charttools \
     chartview \
     comphelp4 \
+    component/framework/util/fwk \
+    component/framework/util/fwl \
+    component/framework/util/fwm \
+    component/sfx2/util/sfx \
+    component/svl/source/fsstor/fsstorage \
+    component/svl/source/passwordcontainer/passwordcontainer \
+    component/svl/util/svl \
+    component/svtools/source/hatchwindow/hatchwindowfactory \
+    component/svtools/source/productregistration/productregistration.uno \
+    component/svtools/util/svt \
+    component/sw/util/msword \
+    component/sw/util/sw \
+    component/sw/util/swd \
+    component/sw/util/vbaswobj \
+    component/toolkit/util/tk \
+    component/xmloff/source/transform/xof \
+    component/xmloff/util/xo \
     configmgr \
     ctl \
     date \
@@ -80,12 +97,7 @@ my_components = \
     fpicker \
     fps_office \
     frm \
-    fsstorage \
-    fwk \
-    fwl \
-    fwm \
     guesslang \
-    hatchwindowfactory \
     hwp \
     hyphen \
     i18npool \
@@ -103,12 +115,10 @@ my_components = \
     oooimprovecore \
     oox \
     package2 \
-    passwordcontainer \
     pcr \
     pdffilter \
     placeware \
     preload \
-    productregistration.uno \
     protocolhandler \
     pythonloader \
     pythonscript \
@@ -126,7 +136,6 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
-    sfx \
     simplecanvas \
     slideshow \
     sm \
@@ -138,16 +147,11 @@ my_components = \
     srtrs1 \
     stringresource \
     svgfilter \
-    svl \
-    svt \
     svx \
     svxcore \
-    sw \
-    swd \
     syssh \
     t602filter \
     textconversiondlgs \
-    tk \
     tvhlp1 \
     ucb1 \
     ucpchelp1 \
@@ -166,7 +170,6 @@ my_components = \
     utl \
     uui \
     vbaobj \
-    vbaswobj \
     vcl \
     vclcanvas \
     wpft \
@@ -175,8 +178,6 @@ my_components = \
     xmlfa \
     xmlfd \
     xmx \
-    xo \
-    xof \
     xsltdlg \
     xsltfilter \
     xstor
@@ -364,7 +365,7 @@ $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
     $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
         $(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input
 
-$(MISC)/services.input :
+$(MISC)/services.input : makefile.mk
     echo \
         '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
         > $@
@@ -375,7 +376,7 @@ $(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
     $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
         $(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
 
-$(MISC)/ooo-services.input :
+$(MISC)/ooo-services.input : makefile.mk
     echo '<list>' \
         '$(my_ooo_components:^"<filename>":+".component</filename>")' \
         '</list>' > $@
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4ac374f91a07..20de2ed6d40f 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NULL
+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep cui dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL