[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 68 commits - postprocess/checkdeliver postprocess/packcomponents postprocess/prj postprocess/rebase

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Wed Mar 9 14:25:58 PST 2011


 postprocess/checkdeliver/checkdeliver.pl |    5 
 postprocess/packcomponents/makefile.mk   |  380 +++++++++++++++++++++++++++++++
 postprocess/prj/build.lst                |    3 
 postprocess/prj/d.lst                    |    4 
 postprocess/rebase/coffbase.txt          |    1 
 5 files changed, 389 insertions(+), 4 deletions(-)

New commits:
commit 50b5b44a86c95f6f553da48c2b4f13a29e324cc3
Merge: 5cb9d4d... 2c63b5a...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Mar 9 16:25:45 2011 -0600

    Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
    
    * commit 'ooo/DEV300_m101': (27 commits)
      masterfix DEV300: #i10000# buildtype removed
      mav59: #i116806# remove syntax that is not supported on solaris
      gnumake3: remove comphelper version; fix including extract.hxx
      CWS gnumake3: fix component location for msforms; change library name for msforms; change file names for gengal
      ause129: #i116325# don't process .<basename>.xcu, created on mac
      dr77: post rebase fixes
      #i10000# workaround strange out of memory error on mac
      #i10000# reenable checkdeliver
      #i10000# create some dependencies...
      #i10000# add dependency to trigger rebuild
      gnumake2: removing duplicate msword entry in postprocess/packcomponents caused by resync to DEV300_m95
      gnumake2: fixing msword component file location in postprocess
      #i115608# msword component registration
      gnumake2: disabling postprocess/checkdeliver as it consistently fails on unxmacxi
      gnumake2: fixed component file location in outdir
      gnumake2: added component registration
      dba34b: #i110409# remove DataSourceMigration
      sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt
      #i114970#
      DEV300 masterfix: #i10000#: wrong regexp
      ...
    
    Conflicts:
    	postprocess/prj/build.lst

diff --cc postprocess/prj/build.lst
index 6ed189d,20de2ed..8cdb8a5
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,4 -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 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 pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 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     ::      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 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 pyuno readlicense_oo unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder reportdesign LANGUAGETOOL:languagetool SDEXT:sdext SWEXT:swext uui writerfilter oox MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport 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
commit 2c63b5a4d131d3be38e09ae51594c989092d773d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Mon Feb 21 12:41:39 2011 +0100

    masterfix DEV300: #i10000# buildtype removed

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 9fbfc70..49fa9e1 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -171,6 +171,7 @@ my_components = \
     utl \
     uui \
     vbaobj \
+    vbaevents \
     vcl \
     vclcanvas \
     wpft \
@@ -231,10 +232,6 @@ my_components += ogltrans
 my_components += productregistration.jar
 .END
 
-.IF "$(ENABLE_VBA)" == "YES"
-my_components += vbaevents
-.END
-
 .IF "$(SOLAR_JAVA)" == "TRUE"
 my_components += \
     LuceneHelpWrapper \
commit a4a6e2b1858958dbd088a6f52bcafbfcc6825670
Merge: 0fc06df... f2d32e2...
Author: Jens-Heiner Rechtien [hr] <jens-heiner.rechtien at oracle.com>
Date:   Thu Feb 10 14:56:23 2011 +0100

    CWS-TOOLING: integrate CWS mav59

commit f2d32e2194530736b1f255f131481f76fb913cc4
Author: Mikhail Voytenko <mav at openoffice.org>
Date:   Fri Feb 4 16:44:03 2011 +0100

    mav59: #i116806# remove syntax that is not supported on solaris

diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 4109bfd..a688178 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -522,7 +522,7 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
     cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
     - $(RM) $(MISC)/$(@:b).list
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip -name [^.]\*.xcu -size +0c -print) \
+        find $(@:b).unzip -name \*.xcu -size +0c -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
@@ -541,7 +541,7 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
         unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
     - $(RM) $(MISC)/$(@:b).list
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip fcfg_drivers_$*.unzip -name [^.]\*.xcu -print) \
+        find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
commit 0fc06dfe13d3fb5e394307c0946d174ec5ae9819
Merge: 428df89... 16abc90...
Author: Mathias Bauer <mba at openoffice.org>
Date:   Thu Feb 3 15:53:56 2011 +0100

    CWS gnumake3: resync to m99

commit 16abc90027702d93b716b148401deb9e7c9893fe
Merge: e57925d... d8c970e...
Author: Vladimir Glazunov <vg at openoffice.org>
Date:   Tue Feb 1 11:12:15 2011 +0100

    CWS-TOOLING: integrate CWS dba34b

commit 428df89b40e15bbebc05701ab1e2a18d6a8248c8
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Fri Jan 28 12:49:53 2011 +0100

    gnumake3: remove comphelper version; fix including extract.hxx

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 75204c6..de68f39 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -54,7 +54,7 @@ my_components = \
     chartmodel \
     charttools \
     chartview \
-    comphelp4 \
+    component/comphelper/util/comphelp \
     component/framework/util/fwk \
     component/framework/util/fwl \
     component/framework/util/fwm \
commit 5e81c7d32ee971baaa24681ac105692adee2e0ff
Author: Mathias Bauer <mba at openoffice.org>
Date:   Wed Jan 26 16:15:19 2011 +0100

    CWS gnumake3: fix component location for msforms; change library name for msforms; change file names for gengal

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index d1be23d..75204c6 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -58,7 +58,9 @@ my_components = \
     component/framework/util/fwk \
     component/framework/util/fwl \
     component/framework/util/fwm \
+    component/vbahelper/util/msforms \
     component/sfx2/util/sfx \
+    component/sot/util/sot \
     component/svl/source/fsstor/fsstorage \
     component/svl/source/passwordcontainer/passwordcontainer \
     component/svl/util/svl \
@@ -113,7 +115,6 @@ my_components = \
     mcnttype \
     migrationoo2 \
     msfilter \
-    msforms \
     mysql \
     odbc \
     offacc \
@@ -146,7 +147,6 @@ my_components = \
     sm \
     smd \
     solver \
-    sot \
     spell \
     spl \
     srtrs1 \
commit 597dd14162885e1bd037e7aca1067562cbcdca03
Merge: bb21cea... e57925d...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Wed Jan 19 16:36:58 2011 +0100

    gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing

diff --cc postprocess/packcomponents/makefile.mk
index 537a62b,3ca8a15..d1be23d
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -65,6 -65,6 +65,9 @@@ my_components = 
      component/svtools/source/hatchwindow/hatchwindowfactory \
      component/svtools/source/productregistration/productregistration.uno \
      component/svtools/util/svt \
++    component/svx/util/svx \
++    component/svx/util/svxcore \
++    component/svx/util/textconversiondlgs \
      component/sw/util/msword \
      component/sw/util/sw \
      component/sw/util/swd \
@@@ -148,11 -149,11 +152,8 @@@
      srtrs1 \
      stringresource \
      svgfilter \
--    svx \
--    svxcore \
      syssh \
      t602filter \
--    textconversiondlgs \
      tvhlp1 \
      ucb1 \
      ucpchelp1 \
commit e57925d5eba56a094c8f1954fc9a56379e9ea8d2
Merge: 9ca3c37... a74da57...
Author: Vladimir Glazunov <vg at openoffice.org>
Date:   Sat Jan 8 11:26:08 2011 +0100

    CWS-TOOLING: integrate CWS ause129

commit a74da57e20b631f08e9d4e4f79a083039d76ae8c
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Thu Jan 6 12:34:08 2011 +0100

    ause129: #i116325# don't process .<basename>.xcu, created on mac

diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index a688178..4109bfd 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -522,7 +522,7 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
     cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
     - $(RM) $(MISC)/$(@:b).list
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip -name \*.xcu -size +0c -print) \
+        find $(@:b).unzip -name [^.]\*.xcu -size +0c -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
@@ -541,7 +541,7 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
         unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
     - $(RM) $(MISC)/$(@:b).list
     echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
-        find $(@:b).unzip fcfg_drivers_$*.unzip -name \*.xcu -print) \
+        find $(@:b).unzip fcfg_drivers_$*.unzip -name [^.]\*.xcu -print) \
         '<filename>$i</filename>') '</list>' > $(MISC)/$(@:b).list
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
         $(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
commit bb21ceaf088dedeb7b79808b50e9dde7f5623a3b
Merge: ea2b767... f9702fe...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Wed Jan 5 13:32:46 2011 +0100

    gnumake3: resync to DEV300_m96

commit d8c970e28ca351c36d33a89aba1c990a49ff0bb3
Merge: 9cdda77... f9702fe...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date:   Wed Jan 5 10:07:18 2011 +0100

    dba34b: merged DEV300m96

commit 9ca3c37a76d41b0166479d1e6acfdabf412d4207
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date:   Tue Dec 28 17:59:34 2010 +0100

    dr77: post rebase fixes

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 537a62b..3ca8a15 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -109,6 +109,7 @@ my_components = \
     log \
     mcnttype \
     migrationoo2 \
+    msfilter \
     msforms \
     mysql \
     odbc \
commit 2f119d5fe5919a25544616d6e0c5ba5dc4a53bbf
Merge: 894d8dc... f9702fe...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date:   Mon Dec 27 12:33:29 2010 +0100

    dr77: rebase to DEV300m96

commit f9702fe7e9f832296fef167b9feb631d567bbe73
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Tue Dec 21 12:44:03 2010 +0100

    #i10000# workaround strange out of memory error on mac

diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 05db6f3..140e1be 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/ ) {
commit 65f17a5f4e00467a8fcaa5018b84e9379d6d6422
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon Dec 20 18:07:42 2010 +0100

    #i10000# reenable checkdeliver

diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index f9600fc..20de2ed 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,6 +1,7 @@
 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
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
 po      postprocess\packregistry        nmake   -       all     po_packregistry NULL
 po      postprocess\packcomponents      nmake   -       all     po_packcomponents NULL
commit a29e95b984cd61bf0e09650f4aac42261a46ecb7
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon Dec 20 16:35:56 2010 +0100

    #i10000# create some dependencies...

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index bcb045b..537a62b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -366,7 +366,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>' \
         > $@
commit 7b7732fe8a280b2ae34fe59ff53ce86804a18cef
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Mon Dec 20 13:59:36 2010 +0100

    #i10000# add dependency to trigger rebuild

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index df1449f..bcb045b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -377,7 +377,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>' > $@
commit ea2b767fe50c66ddc43cc79bfba9846ab3f0928e
Merge: 882a209... 49ba34a...
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Fri Dec 17 16:18:53 2010 +0100

    CWS-TOOLING: integrate CWS sb131

diff --cc postprocess/prj/build.lst
index edbee80,20de2ed..f9600fc
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@@ -1,6 -1,7 +1,6 @@@
- 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
  po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
  po      postprocess\packregistry        nmake   -       all     po_packregistry NULL
  po      postprocess\packcomponents      nmake   -       all     po_packcomponents NULL
commit 882a20957c2e395155aba28db245bbbae14988e6
Merge: b86c767... 466007a...
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date:   Fri Dec 17 12:43:22 2010 +0100

    CWS-TOOLING: integrate CWS gnumake2

commit 466007a5ef17d5fe346573b05d0db70561248df0
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Thu Dec 9 11:07:26 2010 +0100

    gnumake2: removing duplicate msword entry in postprocess/packcomponents caused by resync to DEV300_m95

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 55a4e82..df1449f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -110,7 +110,6 @@ my_components = \
     mcnttype \
     migrationoo2 \
     msforms \
-    msword \
     mysql \
     odbc \
     offacc \
commit 994638315ea76dd045aa349d64d1ecc90b2c5909
Merge: 01f2748... b86c767...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Wed Dec 8 14:12:49 2010 +0100

    gnumake2: resync to DEV300_m95

commit 01f2748bf7acdab65eb9244ff9a681ea877071aa
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Sun Dec 5 11:56:12 2010 +0100

    gnumake2: fixing msword component file location in postprocess

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index e043fee..df1449f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -65,6 +65,7 @@ my_components = \
     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 \
@@ -109,7 +110,6 @@ my_components = \
     mcnttype \
     migrationoo2 \
     msforms \
-    msword \
     mysql \
     odbc \
     offacc \
commit 96c977d76b9f4fcacd873354d8035a0b7f64de50
Merge: d174980... 79ee62f...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Fri Dec 3 23:25:58 2010 +0100

    gnumake2: merging in os144

commit b86c767c4afe7a11163453d29f129c95253e01ff
Merge: 1feb93a... 79ee62f...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Fri Dec 3 11:31:00 2010 +0100

    CWS-TOOLING: integrate CWS os144

commit d1749800237b7674229dcbd320099e8f72b6702e
Merge: b48baca... 1feb93a...
Author: Mathias Bauer <mba at openoffice.org>
Date:   Fri Nov 26 15:27:38 2010 +0100

    CWS gnumake2: resync to m94

commit 9cdda77d95d65ee4f48ff70480d11aee1fffa807
Merge: dc15e53... 1feb93a...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date:   Mon Nov 22 14:30:32 2010 +0100

    dba34b: merge after pulling DEV300.m94

commit 49ba34a09c70b7005b34ffdfc44de3307a207463
Merge: 1863a38... 1feb93a...
Author: sb <sb at openoffice.org>
Date:   Fri Nov 19 11:35:41 2010 +0100

    sb131: merged in re/DEV300_next towards DEV300_m94

commit 79ee62f978b17776ff608877b480c35d5abff692
Author: os <os at openoffice.org>
Date:   Thu Nov 18 08:26:12 2010 +0100

    #i115608# msword component registration

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 521b69a..4cc5742 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -98,6 +98,7 @@ my_components = \
     mcnttype \
     migrationoo2 \
     msforms \
+    msword \
     mysql \
     odbc \
     offacc \
commit 41ed95c3c1116e32e6e2c33a5640a9b1783a0167
Merge: a106538... 1feb93a...
Author: os <os at openoffice.org>
Date:   Wed Nov 17 07:23:52 2010 +0100

    merged DEV300:m93

commit b48baca02bec1454a035cea640f71dbe94a0a906
Merge: 8031314... bae0c44...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Sat Nov 13 00:29:13 2010 +0100

    gnumake2: merging minibranches

commit bae0c44dd937b9848d13e61e1ffcd1cb226f638b
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Sat Nov 13 00:07:21 2010 +0100

    gnumake2: disabling postprocess/checkdeliver as it consistently fails on unxmacxi

diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4ac374f..edbee80 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,7 +1,6 @@
 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			    	usr1	-	all	po_mkout NULL
 po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
-po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
 po      postprocess\packregistry        nmake   -       all     po_packregistry NULL
 po      postprocess\packcomponents      nmake   -       all     po_packcomponents NULL
commit 8031314cfe4c539114f73eda8db6c0367cfac98e
Merge: 38fb331... 2b8b1f3...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Wed Nov 10 17:21:00 2010 +0100

    gnumake2: mergeing minibranches

commit 2b8b1f3d36ad3c80e509cfee354fba535a6dc2d5
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Wed Nov 10 16:02:26 2010 +0100

    gnumake2: fixed component file location in outdir

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index b052449..7be6905 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -55,6 +55,22 @@ 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/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 \
@@ -81,12 +97,7 @@ my_components = \
     fpicker \
     fps_office \
     frm \
-    svl/source/fsstor/fsstorage \
-    framework/util/fwk \
-    framework/util/fwl \
-    framework/util/fwm \
     guesslang \
-    svtools/source/hatchwindow/hatchwindowfactory \
     hwp \
     hyphen \
     i18npool \
@@ -104,12 +115,10 @@ my_components = \
     oooimprovecore \
     oox \
     package2 \
-    svl/source/passwordcontainer/passwordcontainer \
     pcr \
     pdffilter \
     placeware \
     preload \
-    svtools/source/productregistration/productregistration.uno \
     protocolhandler \
     pythonloader \
     pythonscript \
@@ -127,7 +136,6 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
-    sfx2/util/sfx \
     simplecanvas \
     slideshow \
     sm \
@@ -139,16 +147,11 @@ my_components = \
     srtrs1 \
     stringresource \
     svgfilter \
-    svl/util/svl \
-    svtools/util/svt \
     svx \
     svxcore \
-    sw/util/sw \
-    sw/util/swd \
     syssh \
     t602filter \
     textconversiondlgs \
-    toolkit/util/tk \
     tvhlp1 \
     ucb1 \
     ucpchelp1 \
@@ -167,7 +170,6 @@ my_components = \
     utl \
     uui \
     vbaobj \
-    sw/util/vbaswobj \
     vcl \
     vclcanvas \
     wpft \
@@ -176,8 +178,6 @@ my_components = \
     xmlfa \
     xmlfd \
     xmx \
-    xmloff/util/xo \
-    xmloff/source/transform/xof \
     xsltdlg \
     xsltfilter \
     xstor
commit 894d8dcf1346436b94b85be56fc34fd8b72a7669
Merge: 70b56d3... 1feb93a...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date:   Tue Nov 9 15:15:30 2010 +0100

    dr77: rebase to DEV300m92

commit 38fb3319f64df68b942e0f6e4a2f5c1a55f98343
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Sat Nov 6 15:58:44 2010 +0100

    gnumake2: added component registration

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 521b69a..b052449 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -81,12 +81,12 @@ my_components = \
     fpicker \
     fps_office \
     frm \
-    fsstorage \
-    fwk \
-    fwl \
-    fwm \
+    svl/source/fsstor/fsstorage \
+    framework/util/fwk \
+    framework/util/fwl \
+    framework/util/fwm \
     guesslang \
-    hatchwindowfactory \
+    svtools/source/hatchwindow/hatchwindowfactory \
     hwp \
     hyphen \
     i18npool \
@@ -104,12 +104,12 @@ my_components = \
     oooimprovecore \
     oox \
     package2 \
-    passwordcontainer \
+    svl/source/passwordcontainer/passwordcontainer \
     pcr \
     pdffilter \
     placeware \
     preload \
-    productregistration.uno \
+    svtools/source/productregistration/productregistration.uno \
     protocolhandler \
     pythonloader \
     pythonscript \
@@ -127,7 +127,7 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
-    sfx \
+    sfx2/util/sfx \
     simplecanvas \
     slideshow \
     sm \
@@ -139,16 +139,16 @@ my_components = \
     srtrs1 \
     stringresource \
     svgfilter \
-    svl \
-    svt \
+    svl/util/svl \
+    svtools/util/svt \
     svx \
     svxcore \
-    sw \
-    swd \
+    sw/util/sw \
+    sw/util/swd \
     syssh \
     t602filter \
     textconversiondlgs \
-    tk \
+    toolkit/util/tk \
     tvhlp1 \
     ucb1 \
     ucpchelp1 \
@@ -167,7 +167,7 @@ my_components = \
     utl \
     uui \
     vbaobj \
-    vbaswobj \
+    sw/util/vbaswobj \
     vcl \
     vclcanvas \
     wpft \
@@ -176,8 +176,8 @@ my_components = \
     xmlfa \
     xmlfd \
     xmx \
-    xo \
-    xof \
+    xmloff/util/xo \
+    xmloff/source/transform/xof \
     xsltdlg \
     xsltfilter \
     xstor
commit dc15e53e2bf5f33f713d85ccac578b161142484d
Author: Ocke.Janssen <Ocke.Janssen at oracle.com>
Date:   Thu Nov 4 11:22:46 2010 +0100

    dba34b: #i110409# remove DataSourceMigration

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 521b69a..059619e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -59,7 +59,6 @@ my_components = \
     ctl \
     date \
     dba \
-    dbacfg \
     dbase \
     dbaxml \
     dbmm \
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 9098ab2..f915b29 100755
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -55,7 +55,6 @@ cppuhelper3msc.dll 0x00000000656c0000 0x00070000
 ctlmi.dll        0x0000000065680000 0x00030000
 cuimi.dll        0x00000000654a0000 0x001d0000
 datemi.dll       0x0000000065470000 0x00020000
-dbacfgmi.dll     0x0000000065440000 0x00020000
 dbami.dll        0x00000000652e0000 0x00150000
 dbasemi.dll      0x0000000065280000 0x00050000
 dbaxmlmi.dll     0x0000000065230000 0x00040000
commit 1feb93a75251b579c42baf986601dd8e09984d50
Merge: a106538... f63cd68...
Author: Vladimir Glazunov <vg at openoffice.org>
Date:   Mon Nov 1 15:58:31 2010 +0100

    #i10000# changes from OOO330 m13

commit 0c050193b347b7916889068816c7f7652d8f3e0f
Merge: 4284be0... a106538...
Author: Mathias Bauer <mba at openoffice.org>
Date:   Thu Oct 28 23:02:10 2010 +0200

    CWS gnumake: resync to m91; conflicts unresolved

commit af7eca95a243c87105f54d2d02873e97cbd41bf4
Merge: 5cbf389... 6663cbc...
Author: Ocke.Janssen <Ocke.Janssen at oracle.com>
Date:   Thu Oct 28 15:12:07 2010 +0200

    Automated merge with http://hg.services.openoffice.org/cws/dba34b

commit 1863a38f243c9ab5a7377106d3f0ff771dcc2d00
Author: sb <sb at openoffice.org>
Date:   Fri Oct 22 10:37:46 2010 +0200

    sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt

diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 4ac374f..20de2ed 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
commit a8dbedcf89c90a64cf703f71e17fccffba5b9a58
Merge: 7593aff... 6663cbc...
Author: sb <sb at openoffice.org>
Date:   Thu Oct 21 16:44:33 2010 +0200

    sb131: merged in DEV300_m90

commit a10653842b42ba01802e5236f686cd8b78c5afdd
Merge: 580fedc... 6663cbc...
Author: Mathias Bauer <mba at openoffice.org>
Date:   Thu Oct 21 15:10:42 2010 +0200

    CWS changehid: resync to m90

commit 6663cbc7aa473bcb03fdbdea4cb872e2382b7465
Author: Vladimir Glazunov <vg at openoffice.org>
Date:   Mon Oct 18 14:46:06 2010 +0200

    #i114970#

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 8763026..521b69a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -203,7 +203,7 @@ my_components += gconfbe1
 .END
 
 .IF "$(ENABLE_GIO)" != ""
-my_components += ucpgio1
+my_components += ucpgio
 .END
 
 .IF "$(ENABLE_GNOMEVFS)" != ""
commit 580fedc87cdabc6ee653008568e98678307bf80b
Merge: 7c10f1f... c4535b3...
Author: Mathias Bauer <mba at openoffice.org>
Date:   Sat Oct 9 18:56:58 2010 +0200

    CWS changehid: resync to m89

commit 5cbf3898e6bda05ba5d35cbd5b4833245907cf34
Merge: 6dc19c3... c4535b3...
Author: sb <sb at openoffice.org>
Date:   Mon Oct 4 17:38:17 2010 +0200

    sb132: merged in DEV300_m89

commit c4535b320202c9fc507d2ea31518e0a151fde87e
Merge: 70d7679... cb81d51...
Author: Vladimir Glazunov <vg at openoffice.org>
Date:   Fri Oct 1 16:02:03 2010 +0200

    #i10000#

commit cb81d51c4b2a949ae5c6981181f521dc877bb663
Merge: 70d7679... 7593aff...
Author: Vladimir Glazunov <vg at openoffice.org>
Date:   Wed Sep 29 10:24:13 2010 +0200

    CWS-TOOLING: integrate CWS sb129

commit 70b56d31b28bc3b50860456b5287dc38afa18b0b
Merge: 8b8a8ef... 70d7679...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date:   Tue Sep 28 20:30:05 2010 +0200

    dr77: rebase to DEV300_m88

commit 6dc19c3537fcaeed2d2488d2d4f26c7e9d5a8320
Merge: 7b994a3... 70d7679...
Author: sb <sb at openoffice.org>
Date:   Wed Sep 22 15:59:47 2010 +0200

    sb123: merged in DEV300_m88

commit 7593affa8b4eaa4e2bfe201674567a4b7ccbe91d
Merge: c9de7bc... 70d7679...
Author: sb <sb at openoffice.org>
Date:   Wed Sep 22 10:27:02 2010 +0200

    sb129: merged in DEV300_m88

commit 70d76792bfb82b460db7cb54011475523d69f369
Author: Release Engineering <releng at openoffice.org>
Date:   Mon Sep 20 18:22:00 2010 +0200

    DEV300 masterfix: #i10000#: wrong regexp

diff --git a/postprocess/checkdeliver/checkdeliver.pl b/postprocess/checkdeliver/checkdeliver.pl
index 3b07f78..05db6f3 100644
--- a/postprocess/checkdeliver/checkdeliver.pl
+++ b/postprocess/checkdeliver/checkdeliver.pl
@@ -165,7 +165,8 @@ sub check
     foreach ( <DELIVERLOG> ) {
         next if ( /^LINK / );
         # What's this modules' repository?
-        if ( /COPY (\w[\w\s-]*?)\/$module\/prj\/build.lst/ ) {
+        if ( /COPY\s+(.+?)\/$module\/prj\/build.lst/ ) {
+#        if ( /COPY (\w[\w\s-]*?)\/$module\/prj\/build.lst/ ) {
             $repository = $1;
         }
         # For now we concentrate on binaries, located in 'bin' or 'lib' and 'misc/build/<...>/[bin|lib]'.
commit c9de7bc129b3bc901227cb423f31c030c68af47e
Author: sb <sb at openoffice.org>
Date:   Wed Sep 15 11:45:04 2010 +0200

    sb129: #i113189# cleaned up makefile rules; deliver services.input to have it modifiable for special one-off products

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 6f02d10..8763026 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -365,8 +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 .ERRREMOVE :
-    - $(RM) $@
+$(MISC)/services.input :
     echo \
         '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
         > $@
@@ -377,8 +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 .ERRREMOVE :
-    - $(RM) $@
+$(MISC)/ooo-services.input :
     echo '<list>' \
         '$(my_ooo_components:^"<filename>":+".component</filename>")' \
         '</list>' > $@
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index 28c0a7e..9bfe12b 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -3,4 +3,5 @@ mkdir: %_DEST%\xml%_EXT%\ooo
 ..\%__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
commit 0b1e75de1ac87dfb6e2e57db922977ec740aa779
Author: sb <sb at openoffice.org>
Date:   Tue Sep 14 17:10:47 2010 +0200

    sb129: #i113189# move mailmerge to brand specific services.rdb

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index ab3797c..6f02d10 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -354,11 +354,11 @@ my_components += avmediagst
 my_components += avmedia.jar
 .END
 
-my_components += mailmerge #TODO: OOo mailmerge vs. OOO email
+my_ooo_components = mailmerge
 
 .INCLUDE: target.mk
 
-ALLTAR : $(MISC)/services.rdb
+ALLTAR : $(MISC)/services.rdb $(MISC)/ooo-services.rdb
 
 $(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
         $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component")
@@ -370,3 +370,15 @@ $(MISC)/services.input .ERRREMOVE :
     echo \
         '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
         > $@
+
+$(MISC)/ooo-services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/ooo-services.input \
+        $(my_ooo_components:^"$(SOLARXMLDIR)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/ooo-services.input
+
+$(MISC)/ooo-services.input .ERRREMOVE :
+    - $(RM) $@
+    echo '<list>' \
+        '$(my_ooo_components:^"<filename>":+".component</filename>")' \
+        '</list>' > $@
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index 27f2b9c..28c0a7e 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -1,4 +1,6 @@
+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.rdb %_DEST%\xml%_EXT%\services.rdb
commit 949312eef1c3fd142dad033f3c58160722129138
Author: sb <sb at openoffice.org>
Date:   Fri Sep 10 16:47:14 2010 +0200

    sb123: #i113189# brand-specific services.rdb

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index fa6dbe0..ab3797c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -355,11 +355,6 @@ my_components += avmedia.jar
 .END
 
 my_components += mailmerge #TODO: OOo mailmerge vs. OOO email
-#TODO: OOO i18n
-#TODO: OOO migrationoo3
-#TODO: OOO printcompat
-#TODO: OOO socomp
-#TODO: OOO tab2
 
 .INCLUDE: target.mk
 
commit 4cfb32684ceae9674c0e278519e69a74c3955cd3
Author: sb <sb at openoffice.org>
Date:   Fri Sep 10 14:59:09 2010 +0200

    sb123: #i113189# support for --disable-binfilter

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 2360244..fa6dbe0 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -46,9 +46,7 @@ my_components = \
     avmedia \
     basctl \
     basprov \
-    bf_migratefilter \
     bib \
-    bindet \
     cached1 \
     calc \
     canvasfactory \
@@ -258,6 +256,12 @@ my_components += \
     web
 .END
 
+.IF "$(WITH_BINFILTER)" != "NO"
+my_components += \
+    bf_migratefilter \
+    bindet
+.END
+
 .IF "$(WITH_LDAP)" == "YES"
 my_components += ldapbe2
 .END
commit 51715e5a0326e6f8f7d173ca4b4d5281ea9da78c
Author: sb <sb at openoffice.org>
Date:   Fri Sep 10 13:10:07 2010 +0200

    sb129: #i113189# change UNO components to use passive registration

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
new file mode 100644
index 0000000..2360244
--- /dev/null
+++ b/postprocess/packcomponents/makefile.mk
@@ -0,0 +1,373 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#***********************************************************************/
+
+PRJ = ..
+PRJNAME = postprocess
+TARGET = packcomponents
+
+.INCLUDE: settings.mk
+
+#TODO (copied from scp2/source/ooo/makefile.mk):
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_GTK)" != ""
+PKGCONFIG_MODULES=gtk+-2.0
+.INCLUDE: pkg_config.mk
+GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
+.END
+
+my_components = \
+    abp \
+    adabasui \
+    analysis \
+    animcore \
+    avmedia \
+    basctl \
+    basprov \
+    bf_migratefilter \
+    bib \
+    bindet \
+    cached1 \
+    calc \
+    canvasfactory \
+    chartcontroller \
+    chartmodel \
+    charttools \
+    chartview \
+    comphelp4 \
+    configmgr \
+    ctl \
+    date \
+    dba \
+    dbacfg \
+    dbase \
+    dbaxml \
+    dbmm \
+    dbp \
+    dbpool2 \
+    dbtools \
+    dbu \
+    deployment \
+    deploymentgui \
+    dlgprov \
+    embobj \
+    evtatt \
+    fastsax \
+    fileacc \
+    filterconfig1 \
+    flash \
+    flat \
+    for \
+    fpicker \
+    fps_office \
+    frm \
+    fsstorage \
+    fwk \
+    fwl \
+    fwm \
+    guesslang \
+    hatchwindowfactory \
+    hwp \
+    hyphen \
+    i18npool \
+    i18nsearch \
+    lng \
+    lnth \
+    localebe1 \
+    log \
+    mcnttype \
+    migrationoo2 \
+    msforms \
+    mysql \
+    odbc \
+    offacc \
+    oooimprovecore \
+    oox \
+    package2 \
+    passwordcontainer \
+    pcr \
+    pdffilter \
+    placeware \
+    preload \
+    productregistration.uno \
+    protocolhandler \
+    pythonloader \
+    pythonscript \
+    res \
+    rpt \
+    rptui \
+    rptxml \
+    sax \
+    sb \
+    sc \
+    scd \
+    scn \
+    scriptframe \
+    sd \
+    sdbc2 \
+    sdbt \
+    sdd \
+    sfx \
+    simplecanvas \
+    slideshow \
+    sm \
+    smd \
+    solver \
+    sot \
+    spell \
+    spl \
+    srtrs1 \
+    stringresource \
+    svgfilter \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    sw \
+    swd \
+    syssh \
+    t602filter \
+    textconversiondlgs \
+    tk \
+    tvhlp1 \
+    ucb1 \
+    ucpchelp1 \
+    ucpexpand1 \
+    ucpext \
+    ucpfile1 \
+    ucpftp1 \
+    ucphier1 \
+    ucppkg1 \
+    ucptdoc1 \
+    unordf \
+    unoxml \
+    updatefeed \
+    updchk \
+    updchk.uno \
+    utl \
+    uui \
+    vbaobj \
+    vbaswobj \
+    vcl \
+    vclcanvas \
+    wpft \
+    writerfilter \
+    xcr \
+    xmlfa \
+    xmlfd \
+    xmx \
+    xo \
+    xof \
+    xsltdlg \
+    xsltfilter \
+    xstor
+
+.IF "$(BUILD_SPECIAL)" != ""
+my_components += oooimprovement
+.END
+
+.IF "$(DISABLE_ATL)" == ""
+my_components += emboleobj
+.END
+
+.IF "$(DISABLE_NEON)" != "TRUE"
+my_components += ucpdav1
+.END
+
+.IF "$(ENABLE_CAIRO)" == "TRUE"
+my_components += cairocanvas
+.END
+
+.IF "$(ENABLE_GCONF)" != ""
+my_components += gconfbe1
+.END
+
+.IF "$(ENABLE_GIO)" != ""
+my_components += ucpgio1
+.END
+
+.IF "$(ENABLE_GNOMEVFS)" != ""
+my_components += ucpgvfs
+.END
+
+.IF "$(ENABLE_KAB)" != ""
+my_components += kab1
+.END
+
+.IF "$(ENABLE_KDE)" != ""
+my_components += kdebe1
+.END
+
+.IF "$(ENABLE_KDE4)" != ""
+my_components += kde4be1
+.END
+
+.IF "$(ENABLE_OGL)" == "TRUE"
+my_components += ogltrans
+.END
+
+.IF "$(ENABLE_SVCTAGS)" == "YES"
+my_components += productregistration.jar
+.END
+
+.IF "$(ENABLE_VBA)" == "YES"
+my_components += vbaevents
+.END
+
+.IF "$(SOLAR_JAVA)" == "TRUE"
+my_components += \
+    LuceneHelpWrapper \
+    ScriptFramework \
+    ScriptProviderForBeanShell \
+    ScriptProviderForJava \
+    ScriptProviderForJavaScript \
+    XMergeBridge \
+    XSLTFilter.jar \
+    XSLTValidate \
+    agenda \
+    fax \
+    form \
+    hsqldb \
+    jdbc \
+    letter \
+    query \
+    report \
+    table \
+    web
+.END
+
+.IF "$(WITH_LDAP)" == "YES"
+my_components += ldapbe2
+.END
+
+.IF "$(WITH_MOZILLA)" != "NO"
+my_components += \
+    xmlsecurity \
+    xsec_fw \
+    xsec_xmlsec \
+    pl
+.END
+
+.IF "$(OS)" == "MACOSX"
+my_components += \
+    MacOSXSpell \
+    avmediaQuickTime \
+    fps_aqua \
+    macab1 \
+    macbe1
+.END
+
+.IF "$(OS)" == "WNT"
+my_components += \
+    ado \
+    dnd \
+    dtrans \
+    fop \
+    fps \
+    ftransl \
+    java_uno_accessbridge \
+    smplmail \
+    sysdtrans \
+    wininetbe1
+.END
+
+.IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == ""
+my_components += \
+    emser \
+    oleautobridge
+.END
+
+.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
+my_components += \
+    avmediawin \
+    directx9canvas \
+    gdipluscanvas
+.END
+
+.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
+my_components += directx5canvas
+.END
+
+.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
+    ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "WNT"
+my_components += adabas
+.END
+
+.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
+    "$(WITH_MOZILLA)" != "NO"
+my_components += mozab
+.ELSE
+my_components += mozbootstrap
+.END
+
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT"
+my_components += desktopbe1
+.END
+
+.IF "$(GTK_TWO_FOUR)" != ""
+my_components += fps_gnome
+.END
+
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != ""
+my_components += fps_kde4
+.END
+
+.IF "$(OS)" != "WNT"
+my_components += cmdmail
+.END
+
+.IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != ""
+my_components += evoab
+.END
+
+.IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != ""
+my_components += avmediagst
+.END
+
+.IF "$(OS)" != "WNT" && "$(SOLAR_JAVA)" == "TRUE"
+my_components += avmedia.jar
+.END
+
+my_components += mailmerge #TODO: OOo mailmerge vs. OOO email
+#TODO: OOO i18n
+#TODO: OOO migrationoo3
+#TODO: OOO printcompat
+#TODO: OOO socomp
+#TODO: OOO tab2
+
+.INCLUDE: target.mk
+
+ALLTAR : $(MISC)/services.rdb
+
+$(MISC)/services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/services.input $(my_components:^"$(SOLARXMLDIR)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/services.input
+
+$(MISC)/services.input .ERRREMOVE :
+    - $(RM) $@
+    echo \
+        '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
+        > $@
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index c40d984..4ac374f 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -4,5 +4,6 @@ po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
 po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
 po	postprocess\packconfig		nmake	-	all	po_packconfig po_checkxml NULL
 po      postprocess\packregistry        nmake   -       all     po_packregistry NULL
+po      postprocess\packcomponents      nmake   -       all     po_packcomponents NULL
 po	postprocess\rebase	    	nmake	-	w	po_rebase NULL
 po	postprocess\signing	    	nmake	-	w,sign	po_signing po_rebase.w NULL
diff --git a/postprocess/prj/d.lst b/postprocess/prj/d.lst
index fd8a49d..27f2b9c 100644
--- a/postprocess/prj/d.lst
+++ b/postprocess/prj/d.lst
@@ -1,3 +1,4 @@
 ..\%__SRC%\bin\uiconfig.zip %_DEST%\bin%_EXT%\uiconfig.zip
 ..\%__SRC%\misc\*.xcd %_DEST%\xml%_EXT%\
 ..\%__SRC%\misc\lang\*.xcd %_DEST%\xml%_EXT%\
+..\%__SRC%\misc\services.rdb %_DEST%\xml%_EXT%\services.rdb
commit 7b994a37a37c91512bd076353494e31c86d0f669
Merge: 32abcd6... 94b3f46...
Author: sb <sb at openoffice.org>
Date:   Fri Sep 10 11:13:28 2010 +0200

    sb123: merged in DEV300_m87

commit 8b8a8ef50dad17848c2ff11816516dc30cdc1aa6
Merge: 78ceb72... 94b3f46...
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date:   Mon Aug 30 19:25:43 2010 +0200

    dr77: rebase to DEV300m87

commit 94b3f4600e665db760fc8c372b0247e73b4c517e
Merge: 323ec3d... a78c84f...
Author: Vladimir Glazunov <vg at openoffice.org>
Date:   Wed Aug 25 17:13:00 2010 +0200

    CWS-TOOLING: integrate CWS cmcfixes77

commit 323ec3de5073ced5af824736b68e3ecb1759bc0a
Merge: 78ceb72... dc22f04...
Author: Vladimir Glazunov <vg at openoffice.org>
Date:   Wed Aug 25 16:13:14 2010 +0200

    DEV300: changesets OOO330 up to m5

commit a78c84f2e25ee35bd79241092bf72f58d6223499
Author: Caolán McNamara <cmc at openoffice.org>
Date:   Fri Jul 16 14:44:32 2010 +0100

    cmcfixes77: #i80021# system libtextcat

diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 48af6d1..35b608f 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -343,10 +343,10 @@ MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
 MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
 .END
 .END
-.IF "$(SYSTEM_LIBTEXTCAT)" != "YES"
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcat.xcu
+.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcatdata.xcu
 .ELSE
-MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcat.xcu
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcatdata.xcu
 .END
 
 MY_DEPS_math = main
commit ddcd4cfd95044ad098a201641b78a24b30e6e276
Author: Caolán McNamara <cmc at openoffice.org>
Date:   Fri Jul 16 08:47:44 2010 +0100

    cmcfixes77: #i80021# system libtextcat

diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 002cea5..48af6d1 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -343,6 +343,11 @@ MY_FILES_main += $(MY_MOD)/DataAccess/mozab.xcu
 MY_FILES_main += $(MY_MOD)/DataAccess/mozab2.xcu
 .END
 .END
+.IF "$(SYSTEM_LIBTEXTCAT)" != "YES"
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-internallibtextcat.xcu
+.ELSE
+MY_FILES_main += $(MY_MOD)/org/openoffice/Office/Paths-externallibtextcat.xcu
+.END
 
 MY_DEPS_math = main
 MY_FILES_math = \
commit 7c10f1f4f42c898c1e41a34386578274512837d4
Merge: cbf1fd7... 78ceb72...
Author: Mathias Bauer <mba at openoffice.org>
Date:   Tue Jul 13 14:38:37 2010 +0200

    CWS changehid: resync to m84

commit 4284be0a22bc8c9c40ed23096dbd1a3136204ad1
Merge: eb77ebe... 78ceb72...
Author: Bjoern Michaelsen <b_michaelsen at openoffice.org>
Date:   Tue Jul 13 14:36:24 2010 +0200

    CWS gnumake2: resync to DEV300_m84

commit 32abcd609d72b63c4a25274424c3faa52226a954
Merge: 2131517... 78ceb72...
Author: Lars Langhans <lla at openoffice.org>
Date:   Mon Jul 12 13:38:01 2010 +0200

    sb123:merge

commit eb77ebee75155956e0eba9df4edd00c2ebaa0b42
Merge: 0089f8e... acc189b...
Author: Mathias Bauer <mba at openoffice.org>
Date:   Sat Apr 17 20:34:49 2010 +0200

    CWS gnumake2: rebase to DEV300_m76; fix build problems



More information about the Libreoffice-commits mailing list