[Libreoffice-commits] .: 20 commits - postprocess/packcomponents

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:49:52 PDT 2011


 postprocess/packcomponents/makefile.mk |   59 ++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 29 deletions(-)

New commits:
commit 1e46f2b286b06d86ff26a8b141ad7775f985cf28
Merge: 8f586ea... b31b807...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Jul 21 18:57:35 2011 +0200

    resyncing to master

diff --cc postprocess/packcomponents/makefile.mk
index 2e125f4,d71cf40..96288ba
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -148,9 -147,9 +148,8 @@@ my_components = 
      pcr \
      pdffilter \
      placeware \
-     preload \
      protocolhandler \
      res \
 -    sax \
      sb \
      scn \
      scriptframe \
commit 8f586ea935b0a67219355bc3e8ce65d15449f8f5
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Jul 12 22:51:59 2011 +0200

    Add vcl and lng components to packcomponents makefile

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index f3842c0..2e125f4 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -69,6 +69,7 @@ my_components = \
     component/framework/util/fwl \
     component/framework/util/fwm \
     component/hwpfilter/source/hwp \
+    component/linguistic/source/lng \
     component/lotuswordpro/util/lwpfilter \
     component/oox/util/oox \
     component/reportdesign/util/rpt \
@@ -291,7 +292,8 @@ my_components += \
     avmediaQuickTime \
     fps_aqua \
     macab1 \
-    macbe1
+    macbe1 \
+    component/vcl/vcl.macosx
 .END
 
 .IF "$(OS)" == "WNT"
@@ -305,7 +307,14 @@ my_components += \
     java_uno_accessbridge \
     smplmail \
     sysdtrans \
-    wininetbe1
+    wininetbe1 \
+    component/vcl/vcl.windows
+.END
+
+.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT"
+my_components += \
+    desktopbe1 \
+    component/vcl/vcl.unx
 .END
 
 .IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == ""
@@ -337,10 +346,6 @@ my_components += mozab
 my_components += mozbootstrap
 .END
 
-.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT"
-my_components += desktopbe1
-.END
-
 .IF "$(GTK_TWO_FOUR)" != ""
 my_components += fps_gnome
 .END
commit c79f31ab4ea3bca5a1b32b85d5ce789524ed8cf8
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Jul 12 19:58:03 2011 +0200

    Pack also forgotten components from sax

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 31cf1b0..f3842c0 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -74,6 +74,8 @@ my_components = \
     component/reportdesign/util/rpt \
     component/reportdesign/util/rptui \
     component/reportdesign/util/rptxml \
+    component/sax/source/expatwrap/expwrap \
+    component/sax/source/fastparser/fastsax \
     component/sc/util/sc \
     component/sc/util/scd \
     component/sc/util/scfilt \
commit 7ee98f78f325404ecfaff38fc24b56f1473a0e9b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Jul 12 15:52:28 2011 +0200

    List component/unotools/util/utl just once
    
    Duplicate entries cause problems with loading services.rdb in nestRegistries()

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 61f5f07..31cf1b0 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -99,7 +99,6 @@ my_components = \
     component/sw/util/sw \
     component/sw/util/swd \
     component/sw/util/vbaswobj \
-    component/unotools/util/utl \
     component/toolkit/util/tk \
     component/unotools/util/utl \
     component/unoxml/source/rdf/unordf \
commit 757313a0ea7386091c948881ba96ea5d32dada1b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Jun 22 14:33:12 2011 +0200

    gnumake4: adjust postprocess to gbuild

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 619e335..61f5f07 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -57,7 +57,6 @@ my_components = \
     component/canvas/source/vcl/vclcanvas \
     component/comphelper/util/comphelp \
     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 \
@@ -106,7 +105,6 @@ my_components = \
     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 \
@@ -137,7 +135,6 @@ my_components = \
     log \
     mcnttype \
     migrationoo2 \
-    mtfrenderer \
     msfilter \
     msworksfilter \
     mysql \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index b17851c..f344e41 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-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     ::      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 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
commit 8a124d2e43e6fe8733f24d635724c4880dc43b44
Merge: 1d371bb... 32e816d...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jun 20 10:22:22 2011 +0200

    Merge branch 'master' into feature/gnumake4
    
    Conflicts:
    	postprocess/packcomponents/makefile.mk

diff --cc postprocess/packcomponents/makefile.mk
index 26da9dc,9a4eeae..619e335
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@@ -48,20 -48,22 +48,24 @@@ my_components = 
      bib \
      cached1 \
      calc \
-     chartcontroller \
-     chartmodel \
-     charttools \
-     chartview \
 -    canvasfactory \
+     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 \
@@@ -90,10 -98,12 +100,13 @@@
      component/sw/util/sw \
      component/sw/util/swd \
      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,7 -119,7 +123,6 @@@
      dlgprov \
      embobj \
      evtatt \
-     fileacc \
 -    fastsax \
      filterconfig1 \
      flash \
      flat \
@@@ -139,18 -149,13 +151,11 @@@
      placeware \
      preload \
      protocolhandler \
-     pythonloader \
-     pythonscript \
      res \
 -    sax \
      sb \
-     sc \
-     scd \
      scn \
      scriptframe \
-     sd \
      sdbc2 \
-     sdd \
-     slideshow \
 -    simplecanvas \
      solver \
      spell \
      spl \
@@@ -174,8 -179,11 +179,9 @@@
      updchk.uno \
      uui \
      vbaevents \
-     vbaobj \
 -    vclcanvas \
+     visiofilter \
      wpft \
+     wpgfilter \
 -    xcr \
      xmlfa \
      xmlfd \
      xmx \
commit 1d371bbf90bada4dd58dd7bc9e1ee22feca0a045
Author: Michael Stahl <mst at openoffice.org>
Date:   Tue Apr 19 14:52:55 2011 +0000

    gnumake4: postprocess: adapt dbaccess/reportdesign components [hg:d2515b2e3f56]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 1505c59..26da9dc 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -40,7 +40,6 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
 
 my_components = \
     abp \
-    adabasui \
     analysis \
     animcore \
     avmedia \
@@ -57,6 +56,9 @@ my_components = \
     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 \
@@ -65,9 +67,9 @@ my_components = \
     component/framework/util/fwm \
     component/linguistic/source/lng \
     component/oox/oox \
-	component/reportdesign/util/rpt \
-	component/reportdesign/util/rptui \
-	component/reportdesign/util/rptxml \
+	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 \
@@ -100,8 +102,6 @@ my_components = \
     ctl \
     date \
     dbase \
-    dbaxml \
-    dbmm \
     dbp \
     dbpool2 \
     dbtools \
@@ -142,9 +142,6 @@ my_components = \
     pythonloader \
     pythonscript \
     res \
-    rpt \
-    rptui \
-    rptxml \
     sb \
     sc \
     scd \
commit 93674933b8d9f56132e68f005285950ee67023bd
Author: Daniel Rentz [dr] <daniel.rentz at oracle.com>
Date:   Mon Mar 7 13:07:44 2011 +0100

    [mq]: oox_gmake.patch [hg:d0beb4a8aa40]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 21e689e..1505c59 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -64,6 +64,7 @@ my_components = \
     component/framework/util/fwl \
     component/framework/util/fwm \
     component/linguistic/source/lng \
+    component/oox/oox \
 	component/reportdesign/util/rpt \
 	component/reportdesign/util/rptui \
 	component/reportdesign/util/rptxml \
@@ -132,7 +133,6 @@ my_components = \
     odbc \
     offacc \
     oooimprovecore \
-    oox \
     package2 \
     pcr \
     pdffilter \
commit 3639f54727ea8fc4b2d5d02a80cebdce12145511
Author: Michael Stahl <mst at openoffice.org>
Date:   Wed Feb 2 13:10:20 2011 +0100

    writerfilter10: convert writerfilter to gbuild [hg:1013d9bf5d0a]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 883f6b9..21e689e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -91,6 +91,7 @@ my_components = \
     component/toolkit/util/tk \
     component/unoxml/source/rdf/unordf \
     component/unoxml/source/service/unoxml \
+    component/writerfilter/util/writerfilter \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
     component/xmlscript/util/xcr \
@@ -178,7 +179,6 @@ my_components = \
     vbaevents \
     vbaobj \
     wpft \
-    writerfilter \
     xmlfa \
     xmlfd \
     xmx \
commit 1afb47193b7a03ad32b03f275978634daa3c8892
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date:   Fri Apr 15 12:23:36 2011 +0200

    gnumake4: fix to use new add rules [hg:76c825726ff2]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 13d4abf..883f6b9 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -57,10 +57,16 @@ my_components = \
     component/canvas/source/simplecanvas/simplecanvas \
     component/canvas/source/vcl/vclcanvas \
     component/comphelper/util/comphelp \
+	component/dbaccess/util/dba \
+	component/dbaccess/util/dbu \
+	component/dbaccess/util/sdbt \
     component/framework/util/fwk \
     component/framework/util/fwl \
     component/framework/util/fwm \
     component/linguistic/source/lng \
+	component/reportdesign/util/rpt \
+	component/reportdesign/util/rptui \
+	component/reportdesign/util/rptxml \
     component/vbahelper/util/msforms \
     component/sax/source/expatwrap/expwrap \
     component/sax/source/fastparser/fastsax \
@@ -91,14 +97,12 @@ my_components = \
     configmgr \
     ctl \
     date \
-    dba \
     dbase \
     dbaxml \
     dbmm \
     dbp \
     dbpool2 \
     dbtools \
-    dbu \
     deployment \
     deploymentgui \
     dlgprov \
@@ -147,7 +151,6 @@ my_components = \
     scriptframe \
     sd \
     sdbc2 \
-    sdbt \
     sdd \
     slideshow \
     solver \
commit bc97715a3a7a92ab27dc7021848cb3b03aa96542
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date:   Tue Apr 12 20:37:07 2011 +0200

    ooo340fixes: #i117804# differentiate between ENABLE_CAIRO and ENABLE_CAIRO_CANVAS [hg:e09be3339384]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index c8bd41c..13d4abf 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -205,7 +205,7 @@ my_components += emboleobj
 my_components += ucpdav1
 .END
 
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 my_components += component/canvas/source/cairo/cairocanvas
 .END
 
commit d2a1c6fad46e7a8af70908d80d12277aa48b0317
Author: Michael Stahl <mst at openoffice.org>
Date:   Mon Mar 14 17:45:57 2011 +0100

    gnumake4: fix uses of sax components [hg:4f7ea9a34847]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index eb88e5e..c8bd41c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -140,7 +140,6 @@ my_components = \
     rpt \
     rptui \
     rptxml \
-    sax \
     sb \
     sc \
     scd \
commit 2322b5b855a08a86b09b3fea3af00ff7f0f885f0
Author: Mathias Bauer <mba at openoffice.org>
Date:   Wed Mar 2 13:22:42 2011 +0100

    CWS gnumake4: convert sax to new build system [hg:389d236eb6b2]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 5286988..eb88e5e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -62,6 +62,8 @@ my_components = \
     component/framework/util/fwm \
     component/linguistic/source/lng \
     component/vbahelper/util/msforms \
+    component/sax/source/expatwrap/expwrap \
+    component/sax/source/fastparser/fastsax \
     component/sfx2/util/sfx \
     component/sot/util/sot \
     component/starmath/util/sm \
@@ -102,7 +104,6 @@ my_components = \
     dlgprov \
     embobj \
     evtatt \
-    fastsax \
     fileacc \
     filterconfig1 \
     flash \
commit 4f6bf0ee0fec7303e7ecf4cd67f8aab56017356e
Author: Mathias Bauer <mba at openoffice.org>
Date:   Wed Mar 2 11:54:18 2011 +0100

    CWS gnumake4: convert xmlscript to new build system [hg:d4df54d61f2a]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index f908a1e..5286988 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -85,6 +85,7 @@ my_components = \
     component/unoxml/source/service/unoxml \
     component/xmloff/source/transform/xof \
     component/xmloff/util/xo \
+    component/xmlscript/util/xcr \
     configmgr \
     ctl \
     date \
@@ -175,7 +176,6 @@ my_components = \
     vbaobj \
     wpft \
     writerfilter \
-    xcr \
     xmlfa \
     xmlfd \
     xmx \
commit aaa3f7ccfd6084d3c84d24f018bace5724b9d4fb
Author: Mathias Bauer <mba at openoffice.org>
Date:   Mon Feb 28 17:34:42 2011 +0100

    CWS gnumake4: some fixes for basegfx+canvas [hg:8c299b2d4484]

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index e7d863b..f908a1e 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -314,7 +314,7 @@ my_components += \
 my_components += \
     avmediawin \
     component/canvas/source/directx/directx9canvas \
-    gdipluscanvas
+    component/canvas/source/directx/gdipluscanvas
 .END
 
 .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
commit 875e346df133489e54986d5cf24d10d8b3c01f72
Author: Mathias Bauer <mba at openoffice.org>
Date:   Fri Feb 25 16:51:24 2011 +0100

    CWS gnumake4: convert canvas to new build system

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index cba050f..e7d863b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -49,11 +49,13 @@ my_components = \
     bib \
     cached1 \
     calc \
-    canvasfactory \
     chartcontroller \
     chartmodel \
     charttools \
     chartview \
+    component/canvas/source/factory/canvasfactory \
+    component/canvas/source/simplecanvas/simplecanvas \
+    component/canvas/source/vcl/vclcanvas \
     component/comphelper/util/comphelp \
     component/framework/util/fwk \
     component/framework/util/fwl \
@@ -146,7 +148,6 @@ my_components = \
     sdbc2 \
     sdbt \
     sdd \
-    simplecanvas \
     slideshow \
     solver \
     spell \
@@ -172,7 +173,6 @@ my_components = \
     uui \
     vbaevents \
     vbaobj \
-    vclcanvas \
     wpft \
     writerfilter \
     xcr \
@@ -206,7 +206,7 @@ my_components += ucpdav1
 .END
 
 .IF "$(ENABLE_CAIRO)" == "TRUE"
-my_components += cairocanvas
+my_components += component/canvas/source/cairo/cairocanvas
 .END
 
 .IF "$(ENABLE_GCONF)" != ""
@@ -313,12 +313,12 @@ my_components += \
 .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != ""
 my_components += \
     avmediawin \
-    directx9canvas \
+    component/canvas/source/directx/directx9canvas \
     gdipluscanvas
 .END
 
 .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != ""
-my_components += directx5canvas
+my_components += component/canvas/source/directx/directx5canvas
 .END
 
 .IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
commit ddcd6977649110995df6c3b57a0b8bdff669675d
Author: Mathias Bauer <mba at openoffice.org>
Date:   Thu Feb 24 18:41:13 2011 +0100

    CWS gnumake4: convert unotools to new build system

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 92734d5..cba050f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -77,6 +77,7 @@ my_components = \
     component/sw/util/sw \
     component/sw/util/swd \
     component/sw/util/vbaswobj \
+    component/unotools/util/utl \
     component/toolkit/util/tk \
     component/unoxml/source/rdf/unordf \
     component/unoxml/source/service/unoxml \
@@ -168,7 +169,6 @@ my_components = \
     updatefeed \
     updchk \
     updchk.uno \
-    utl \
     uui \
     vbaevents \
     vbaobj \
commit 5f8d245233697664afc96c122da43a1f6d8b0a7a
Author: Mathias Bauer <mba at openoffice.org>
Date:   Thu Feb 24 17:08:10 2011 +0100

    CWS gnumake4: convert linguistic to new build system

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a582850..92734d5 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -58,6 +58,7 @@ my_components = \
     component/framework/util/fwk \
     component/framework/util/fwl \
     component/framework/util/fwm \
+    component/linguistic/source/lng \
     component/vbahelper/util/msforms \
     component/sfx2/util/sfx \
     component/sot/util/sot \
@@ -111,7 +112,6 @@ my_components = \
     hyphen \
     i18npool \
     i18nsearch \
-    lng \
     lnth \
     localebe1 \
     log \
commit 79927113c136cb40ad810b757f69ca724e15dd5f
Author: Mathias Bauer <mba at openoffice.org>
Date:   Wed Feb 23 18:44:19 2011 +0100

    CWS gnumake4: convert starmath to new build system

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 6e55914..a582850 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -61,6 +61,8 @@ my_components = \
     component/vbahelper/util/msforms \
     component/sfx2/util/sfx \
     component/sot/util/sot \
+    component/starmath/util/sm \
+    component/starmath/util/smd \
     component/svl/source/fsstor/fsstorage \
     component/svl/source/passwordcontainer/passwordcontainer \
     component/svl/util/svl \
@@ -145,8 +147,6 @@ my_components = \
     sdd \
     simplecanvas \
     slideshow \
-    sm \
-    smd \
     solver \
     spell \
     spl \
commit 8cee891eaeb5fdc7402e7b0d9c132ea97baf4097
Author: Mathias Bauer <mba at openoffice.org>
Date:   Tue Feb 22 09:53:58 2011 +0100

    CWS gnumake4: convert wizards to new build system

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index e6bd27b..6e55914 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -251,16 +251,16 @@ my_components += \
     XMergeBridge \
     XSLTFilter.jar \
     XSLTValidate \
-    agenda \
-    fax \
-    form \
+    component/wizards/com/sun/star/wizards/agenda/agenda \
+    component/wizards/com/sun/star/wizards/fax/fax \
+    component/wizards/com/sun/star/wizards/form/form \
     hsqldb \
     jdbc \
-    letter \
-    query \
-    report \
-    table \
-    web
+    component/wizards/com/sun/star/wizards/letter/letter \
+    component/wizards/com/sun/star/wizards/query/query \
+    component/wizards/com/sun/star/wizards/report/report \
+    component/wizards/com/sun/star/wizards/table/table \
+    component/wizards/com/sun/star/wizards/web/web
 .END
 
 .IF "$(WITH_BINFILTER)" != "NO"


More information about the Libreoffice-commits mailing list