diff options
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/README | 3 | ||||
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 114 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 10 | ||||
| -rw-r--r-- | postprocess/prj/build.lst | 2 | ||||
| -rw-r--r-- | postprocess/rebase/coffbase.txt | 1 |
5 files changed, 73 insertions, 57 deletions
diff --git a/postprocess/README b/postprocess/README new file mode 100644 index 000000000000..197d6cbf5b8a --- /dev/null +++ b/postprocess/README @@ -0,0 +1,3 @@ +Postprocessing and checking of files delivered by other modules. + +This module hast to be the last one before creating install sets in module 'instset_native'. diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 78a7b0cbf925..c79a28a57de6 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -32,12 +32,9 @@ TARGET = packcomponents .INCLUDE: settings.mk my_components = \ - cached1 \ calc \ component/animations/source/animcore/animcore \ component/avmedia/util/avmedia \ - component/basctl/util/basctl \ - component/basic/util/sb \ component/chart2/source/controller/chartcontroller \ component/chart2/source/model/chartmodel \ component/chart2/source/tools/charttools \ @@ -94,17 +91,9 @@ my_components = \ component/sc/util/sc \ component/sc/util/scd \ component/sc/util/scfilt \ - component/sc/util/vbaobj \ component/scaddins/source/analysis/analysis \ component/scaddins/source/datefunc/date \ component/sccomp/source/solver/solver \ - component/scripting/source/basprov/basprov \ - component/scripting/source/dlgprov/dlgprov \ - component/scripting/source/protocolhandler/protocolhandler \ - component/scripting/source/pyprov/mailmerge \ - component/scripting/source/stringresource/stringresource \ - component/scripting/source/vbaevents/vbaevents \ - component/scripting/util/scriptframe \ component/sd/util/sd \ component/sd/util/sdd \ component/sd/util/sdfilt \ @@ -124,13 +113,23 @@ my_components = \ component/sw/util/msword \ component/sw/util/sw \ component/sw/util/swd \ - component/sw/util/vbaswobj \ component/toolkit/util/tk \ + component/ucb/source/sorter/srtrs1 \ + component/ucb/source/core/ucb1 \ + component/ucb/source/cacher/cached1 \ + component/ucb/source/ucp/cmis/ucpcmis1 \ + component/ucb/source/ucp/expand/ucpexpand1 \ + component/ucb/source/ucp/ext/ucpext \ + component/ucb/source/ucp/file/ucpfile1 \ + component/ucb/source/ucp/ftp/ucpftp1 \ + component/ucb/source/ucp/hierarchy/ucphier1 \ + component/ucb/source/ucp/package/ucppkg1 \ + component/ucb/source/ucp/tdoc/ucptdoc1 \ + component/UnoControls/util/ctl \ component/unotools/util/utl \ component/unoxml/source/rdf/unordf \ component/unoxml/source/service/unoxml \ component/uui/util/uui \ - component/vbahelper/util/msforms \ component/writerfilter/util/writerfilter \ component/writerperfect/util/msworksfilter \ component/writerperfect/util/visiofilter \ @@ -142,7 +141,6 @@ my_components = \ component/xmlscript/util/xcr \ component/xmlsecurity/util/xmlsecurity \ component/xmlsecurity/util/xsec_fw \ - ctl \ dbase \ dbpool2 \ dbtools \ @@ -152,41 +150,49 @@ my_components = \ mysql \ odbc \ sdbc2 \ - srtrs1 \ - ucb1 \ - ucpexpand1 \ - ucpext \ - ucpfile1 \ - ucpftp1 \ - ucphier1 \ - ucppkg1 \ - ucptdoc1 \ - ucpcmis1 \ .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" my_components += \ - abp \ - bib \ component/desktop/source/deployment/deployment \ component/desktop/source/deployment/gui/deploymentgui \ component/desktop/source/migration/services/migrationoo2 \ component/desktop/source/migration/services/migrationoo3 \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ - dbp \ - fpicker \ - fps_office \ - log \ - pcr \ - res \ - scn \ + component/extensions/source/abpilot/abp \ + component/extensions/source/bibliography/bib \ + component/extensions/source/dbpilots/dbp \ + component/extensions/source/logging/log \ + component/extensions/source/propctrlr/pcr \ + component/extensions/source/resource/res \ + component/extensions/source/scanner/scn \ + component/extensions/source/update/check/updchk.uno \ + component/extensions/source/update/feed/updatefeed \ + component/extensions/source/update/ui/updchk \ + component/fpicker/source/generic/fpicker \ + component/fpicker/source/office/fps_office \ syssh \ tvhlp1 \ ucpchelp1 \ - updatefeed \ - updchk \ - updchk.uno \ - xmx + +.ENDIF + +.IF "$(OS)" != "IOS" + +my_components += \ + component/basctl/util/basctl \ + component/basic/util/sb \ + component/sc/util/vbaobj \ + component/scripting/source/basprov/basprov \ + component/scripting/source/dlgprov/dlgprov \ + component/scripting/source/protocolhandler/protocolhandler \ + component/scripting/source/pyprov/mailmerge \ + component/scripting/source/stringresource/stringresource \ + component/scripting/source/vbaevents/vbaevents \ + component/scripting/util/scriptframe \ + component/sw/util/vbaswobj \ + component/vbahelper/util/msforms + .ENDIF .IF "$(DISABLE_PYTHON)" != "TRUE" @@ -202,7 +208,7 @@ my_components += emboleobj .END .IF "$(DISABLE_NEON)" != "TRUE" -my_components += ucpdav1 +my_components += component/ucb/source/ucp/webdav/ucpdav1 .END .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE" @@ -214,11 +220,11 @@ my_components += gconfbe1 .END .IF "$(ENABLE_GIO)" != "" -my_components += ucpgio +my_components += component/ucb/source/ucp/gio/ucpgio .END .IF "$(ENABLE_GNOMEVFS)" != "" -my_components += ucpgvfs +my_components += component/ucb/source/ucp/gvfs/ucpgvfs .END .IF "$(ENABLE_KAB)" != "" @@ -242,8 +248,11 @@ my_components += component/framework/util/lomenubar .END .IF "$(SOLAR_JAVA)" == "TRUE" +.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" +my_components += \ + LuceneHelpWrapper +.ENDIF my_components += \ - LuceneHelpWrapper \ component/xmerge/source/bridge/XMergeBridge \ component/filter/source/xsltfilter/XSLTFilter.jar \ component/filter/source/xsltvalidate/XSLTValidate \ @@ -268,11 +277,11 @@ my_components += \ .END .IF "$(WITH_LDAP)" == "YES" -my_components += ldapbe2 +my_components += component/extensions/source/config/ldap/ldapbe2 .END .IF "$(WITH_MOZILLA)" != "NO" -my_components += pl +my_components += component/extensions/source/plugin/pl .END .IF "$(ENABLE_XMLSEC)" == "YES" @@ -285,9 +294,9 @@ my_components += component/xmlsecurity/util/xsec_xmlsec .IF "$(OS)" == "MACOSX" my_components += \ - fps_aqua \ macab1 \ macbe1 \ + component/fpicker/source/aqua/fps_aqua \ component/vcl/vcl.macosx .END @@ -300,16 +309,19 @@ my_components += \ .IF "$(OS)" == "WNT" my_components += \ ado \ - fop \ - fps \ smplmail \ wininetbe1 \ - component/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge \ component/dtrans/source/generic/dtrans \ component/dtrans/util/dnd \ component/dtrans/util/ftransl \ component/dtrans/util/sysdtrans \ + component/fpicker/util/fop \ + component/fpicker/util/fps \ component/vcl/vcl.windows +.IF "$(SOLAR_JAVA)" == "TRUE" +my_components += \ + component/accessibility/bridge/org/openoffice/accessibility/java_uno_accessbridge +.END .END .IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID" @@ -321,7 +333,7 @@ my_components += \ .IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == "" my_components += \ emser \ - oleautobridge + component/extensions/source/ole/oleautobridge .END .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" @@ -331,10 +343,6 @@ my_components += \ component/canvas/source/directx/gdipluscanvas .END -.IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" && "$(USE_DIRECTX5)" != "" -my_components += component/canvas/source/directx/directx5canvas -.END - .IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \ "$(WITH_MOZILLA)" != "NO" my_components += mozab @@ -343,7 +351,7 @@ my_components += mozbootstrap .END .IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != "" -my_components += fps_kde4 +my_components += component/fpicker/source/unx/kde4/fps_kde4 .END .IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 84cbfa114f59..b542843e2c02 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -356,8 +356,8 @@ MY_FILES_math = \ .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" MY_DEPS_onlineupdate = main MY_FILES_onlineupdate = \ - $(MY_MOD)/org/openoffice/Office/Addons/Addons-onlineupdate.xcu \ - $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu + $(MY_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \ + $(MY_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu .ENDIF MY_DEPS_palm = main @@ -432,6 +432,12 @@ MY_FILES_binfilter = \ $(MY_MOD)/fcfg_writer_bf_types.xcu .END +.IF "$(BUILD_POSTGRESQL_SDBC)" == "YES" +MY_XCDS += $(MISC)/postgresqlsdbc.xcd +MY_DEPS_postgresqlsdbc = main +MY_FILES_postgresqlsdbc = $(MY_MOD)/DataAccess/postgresql.xcu +.END + .IF "$(GUIBASE)" == "unx" && \ (("$(ENABLE_GCONF)" == "TRUE" && "$(ENABLE_LOCKDOWN)" == "YES") || \ "$(ENABLE_GIO)" == "TRUE") diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 8088ea040d6f..aa756e528fa3 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL +po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL po postprocess usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt index 7c6961aef708..76e2ef304208 100644 --- a/postprocess/rebase/coffbase.txt +++ b/postprocess/rebase/coffbase.txt @@ -329,7 +329,6 @@ xmergesync.dll 0x000000005b690000 0x00020000 xmlfami.dll 0x000000005b670000 0x00010000 xmlfdmi.dll 0x000000005b650000 0x00010000 xmlsecurity.dll 0x000000005b600000 0x00040000 -xmxmi.dll 0x000000005b5e0000 0x00010000 xofmi.dll 0x000000005b580000 0x00050000 xomi.dll 0x000000005b2b0000 0x002c0000 xsec_fw.dll 0x000000005b280000 0x00020000 |