Merge branch 'master' into feature/gnumake4

Conflicts:
postprocess/packcomponents/makefile.mk

8 files changed, 65 insertions, 63 deletions

diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index d7588fda14f4..de240f7de32e 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -77,7 +77,7 @@ sub get_globals
 
     # set global variables according to environnment
     $platform      = $ENV{INPATH};
-    $srcrootdir    = $ENV{SOURCE_ROOT_DIR};
+    $srcrootdir    = "$ENV{SRC_ROOT}/clone";
     $solverdir     = $ENV{SOLARVERSION};
     $milestoneext  = $ENV{UPDMINOREXT};
 
diff --git a/postprocess/checkdeliver/makefile.mk b/postprocess/checkdeliver/makefile.mk
index dfbd5c317de1..ad6f5c0db524 100644
--- a/postprocess/checkdeliver/makefile.mk
+++ b/postprocess/checkdeliver/makefile.mk
@@ -38,6 +38,7 @@ TARGET=checkdeliver
 ALLTAR : $(MISC)$/checkdeliver.done
 
 $(MISC)$/checkdeliver.done .PHONY:
-    @-$(RM) $(MISC)$/checkdeliver_log.txt
-    $(PERL) checkdeliver.pl  -l $(MISC)$/checkdeliver_log.txt && $(TOUCH) $@
+    # FIXME: the output was always ignored until ooo320-m15; it would be nice to check it though
+    # $(PERL) checkdeliver.pl && $(TOUCH) $@
+    $(TOUCH) $@
 
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 26da9dcd84f2..619e335bc193 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -48,32 +48,42 @@ my_components = \
     bib \
     cached1 \
     calc \
-    chartcontroller \
-    chartmodel \
-    charttools \
-    chartview \
+    component/chart2/source/controller/chartcontroller \
+    component/chart2/source/model/chartmodel \
+    component/chart2/source/tools/charttools \
+    component/chart2/source/view/chartview \
     component/canvas/source/factory/canvasfactory \
     component/canvas/source/simplecanvas/simplecanvas \
     component/canvas/source/vcl/vclcanvas \
     component/comphelper/util/comphelp \
-	component/dbaccess/source/ext/adabas/adabasui \
-	component/dbaccess/source/ext/macromigration/dbmm \
-	component/dbaccess/source/filter/xml/dbaxml \
-	component/dbaccess/util/dba \
-	component/dbaccess/util/dbu \
-	component/dbaccess/util/sdbt \
+    component/cui/util/cui \
+    component/dbaccess/source/ext/adabas/adabasui \
+    component/dbaccess/source/ext/macromigration/dbmm \
+    component/dbaccess/source/filter/xml/dbaxml \
+    component/dbaccess/util/dba \
+    component/dbaccess/util/dbu \
+    component/dbaccess/util/sdbt \
+    component/fileaccess/source/fileacc \
+    component/forms/util/frm \
+    component/formula/util/for \
     component/framework/util/fwk \
     component/framework/util/fwl \
     component/framework/util/fwm \
-    component/linguistic/source/lng \
-    component/oox/oox \
-	component/reportdesign/source/filter/xml/rptxml \
-   	component/reportdesign/util/rpt \
-    	component/reportdesign/util/rptui \
-    component/vbahelper/util/msforms \
-    component/sax/source/expatwrap/expwrap \
-    component/sax/source/fastparser/fastsax \
+    component/hwpfilter/source/hwp \
+    component/lotuswordpro/util/lwpfilter \
+    component/oox/util/oox \
+    component/reportdesign/util/rpt \
+    component/reportdesign/util/rptui \
+    component/reportdesign/util/rptxml \
+    component/sc/util/sc \
+    component/sc/util/scd \
+    component/sc/util/scfilt \
+    component/sc/util/vbaobj \
+    component/sd/util/sd \
+    component/sd/util/sdd \
+    component/sd/util/sdfilt \
     component/sfx2/util/sfx \
+    component/slideshow/util/slideshow \
     component/sot/util/sot \
     component/starmath/util/sm \
     component/starmath/util/smd \
@@ -92,8 +102,11 @@ my_components = \
     component/sw/util/vbaswobj \
     component/unotools/util/utl \
     component/toolkit/util/tk \
+    component/unotools/util/utl \
     component/unoxml/source/rdf/unordf \
     component/unoxml/source/service/unoxml \
+    component/vbahelper/util/msforms \
+    component/vcl/vcl \
     component/writerfilter/util/writerfilter \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
@@ -110,16 +123,12 @@ my_components = \
     dlgprov \
     embobj \
     evtatt \
-    fileacc \
     filterconfig1 \
     flash \
     flat \
-    for \
     fpicker \
     fps_office \
-    frm \
     guesslang \
-    hwp \
     hyphen \
     i18npool \
     i18nsearch \
@@ -128,9 +137,12 @@ my_components = \
     log \
     mcnttype \
     migrationoo2 \
+    mtfrenderer \
     msfilter \
+    msworksfilter \
     mysql \
     odbc \
+    odfflatxml \
     offacc \
     oooimprovecore \
     package2 \
@@ -139,18 +151,11 @@ my_components = \
     placeware \
     preload \
     protocolhandler \
-    pythonloader \
-    pythonscript \
     res \
     sb \
-    sc \
-    scd \
     scn \
     scriptframe \
-    sd \
     sdbc2 \
-    sdd \
-    slideshow \
     solver \
     spell \
     spl \
@@ -174,8 +179,9 @@ my_components = \
     updchk.uno \
     uui \
     vbaevents \
-    vbaobj \
+    visiofilter \
     wpft \
+    wpgfilter \
     xmlfa \
     xmlfd \
     xmx \
@@ -183,16 +189,14 @@ my_components = \
     xsltfilter \
     xstor
 
-.IF "$(OS)" == "MACOSX"
-my_components += component/vcl/vcl.macosx
-.ELSE
-.IF "$(OS)" == "WNT"
-my_components += component/vcl/vcl.windows
-.ELSE
-my_components += component/vcl/vcl.unx
-.ENDIF
+.IF "$(DISABLE_PYTHON)" != "TRUE"
+my_components += pythonloader
 .ENDIF
 
+.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX"
+my_components += splash
+.ENDIF
+    
 .IF "$(BUILD_SPECIAL)" != ""
 my_components += oooimprovement
 .END
@@ -234,20 +238,22 @@ my_components += kde4be1
 .END
 
 .IF "$(ENABLE_OGL)" == "TRUE"
-my_components += ogltrans
+my_components += component/slideshow/source/engine/OGLTrans/ogltrans
 .END
 
 .IF "$(ENABLE_SVCTAGS)" == "YES"
 my_components += productregistration.jar
 .END
 
+.IF "$(ENABLE_LOMENUBAR)" == "TRUE"
+my_components += component/framework/util/lomenubar
+.END
+
 .IF "$(SOLAR_JAVA)" == "TRUE"
 my_components += \
     LuceneHelpWrapper \
     ScriptFramework \
-    ScriptProviderForBeanShell \
     ScriptProviderForJava \
-    ScriptProviderForJavaScript \
     XMergeBridge \
     XSLTFilter.jar \
     XSLTValidate \
@@ -354,7 +360,7 @@ my_components += evoab
 .END
 
 .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
-my_components += avmediagst
+my_components += avmediagstreamer
 .END
 
 .IF "$(OS)" != "WNT" && "$(SOLAR_JAVA)" == "TRUE"
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 60bb9f3cd579..50a509781846 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -39,6 +39,7 @@ MY_XCDS = \
     $(MISC)/calc.xcd \
     $(MISC)/cjk.xcd \
     $(MISC)/ctl.xcd \
+    $(MISC)/ctlseqcheck.xcd \
     $(MISC)/draw.xcd \
     $(MISC)/graphicfilter.xcd \
     $(MISC)/impress.xcd \
@@ -52,7 +53,6 @@ MY_XCDS = \
     $(MISC)/pocketexcel.xcd \
     $(MISC)/pocketword.xcd \
     $(MISC)/pyuno.xcd \
-    $(MISC)/w4w.xcd \
     $(MISC)/writer.xcd \
     $(MISC)/xsltfilter.xcd
 
@@ -326,6 +326,7 @@ MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu
 .END
 .IF "$(ENABLE_EVOAB2)" == "TRUE"
 MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
 .END
 .IF "$(SOLAR_JAVA)" == "TRUE"
 MY_FILES_main += \
@@ -390,11 +391,6 @@ MY_DEPS_pyuno = main
 MY_FILES_pyuno = \
     $(MY_MOD)/org/openoffice/Office/Scripting-python.xcu
 
-MY_DEPS_w4w = main
-MY_FILES_w4w = \
-    $(MY_MOD)/fcfg_w4w_filters.xcu \
-    $(MY_MOD)/fcfg_w4w_types.xcu
-
 MY_DEPS_writer = main
 MY_FILES_writer = \
     $(MY_XCS)/Office/UI/WriterCommands.xcs \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 555ae33cba91..b17851c404cc 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 librsvg 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 smoketestdoc uui writerfilter oox MYSQLC:mysqlc LIBXSLT:libxslt NULL
+po      postprocess     ::      accessibility automation basctl bean BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras filter forms fpicker helpcontent2 hwpfilter io LIBRSVG:librsvg lingucomponent lotuswordpro MATHMLDTD:MathMLDTD ODK:odk officecfg package psprint_config remotebridges scaddins sccomp scp2 scripting setup_native sysui testtools ucb UnoControls ure wizards xmerge xmlsecurity MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt tail_build NULL
 po	postprocess			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index 9bfe12b9ac8f..603802446552 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -1,7 +1,7 @@
-mkdir: %_DEST%\xml%_EXT%\ooo
-..\%__SRC%\bin\uiconfig.zip %_DEST%\bin%_EXT%\uiconfig.zip
-..\%__SRC%\misc\*.xcd %_DEST%\xml%_EXT%\
-..\%__SRC%\misc\lang\*.xcd %_DEST%\xml%_EXT%\
-..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml%_EXT%\ooo\services.rdb
-..\%__SRC%\misc\services.input %_DEST%\xml%_EXT%\services.input
-..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\services.rdb
+mkdir: %_DEST%\xml\ooo
+..\%__SRC%\bin\uiconfig.zip %_DEST%\bin\uiconfig.zip
+..\%__SRC%\misc\*.xcd %_DEST%\xml\
+..\%__SRC%\misc\lang\*.xcd %_DEST%\xml\
+..\%__SRC%\misc\ooo-services.rdb %_DEST%\xml\ooo\services.rdb
+..\%__SRC%\misc\services.input %_DEST%\xml\services.input
+..\%__SRC%\misc\services.rdb %_DEST%\xml\services.rdb
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 27999d2c4cbb..199a8944be24 100755..100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -224,7 +224,6 @@ reg3.dll         0x00000000607e0000 0x00020000
 reg4allmsdoc.dll 0x0000000060790000 0x00040000
 regactivex.dll   0x0000000060710000 0x00020000
 regpatchactivex.dll 0x0000000060690000 0x00020000
-relnotes.dll     0x0000000060660000 0x00020000
 remotebridge.uno.dll 0x0000000060640000 0x00010000
 resmi.dll        0x0000000060610000 0x00020000
 resourcemodel.dll 0x0000000060580000 0x00080000
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk
index d9d6d10c8961..0ccfa6bf49a0 100755..100644
--- a/postprocess/rebase/makefile.mk
+++ b/postprocess/rebase/makefile.mk
@@ -44,14 +44,14 @@ IMAGENAMES=$(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll
 ALLTAR : REBASE
 
 REBASE .PHONY : $(BASEADDRESSES)
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)$(CPU)"=="WNTI"
 .IF "$(product)"=="full"
     $(PERL) rebase.pl -C $(BASEADDRESSES) -b $(STARTADDRESS) -d -e 10000 -l $(LOGFILE) -m $(MISC) -v -R $(SOLARBINDIR) -N $(EXCLUDELIST) $(IMAGENAMES)
 .ELSE	# "$(product)"=="full"
     @echo Doing nothing on non product builds ...
 .ENDIF	# "$(product)"=="full"
-.ELSE	# "$(GUI)"=="WNT"
-    @echo Nothing to do, 'rebase' is windows only.
+.ELSE	# "$(GUI)"=="WNTI"
+    @echo We do rebasing on 32-bit Windows only.
 .ENDIF
 
 $(BASEADDRESSES) : coffbase.txt