From ba1f609d0dd77c5adc2504e90e341c306b5ee8f5 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 14 Dec 2011 19:57:14 +0100 Subject: extensions: convert update stuff to gbuild The updchk is renamed to updatecheckui so it does not collide with updchk.uno. --- postprocess/packcomponents/makefile.mk | 6 +++--- postprocess/packregistry/makefile.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index fe829fa4799f..74dbb16f9d39 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,6 +173,9 @@ my_components += \ component/desktop/source/migration/services/migrationoo3 \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ + component/extensions/source/update/check/updchk.uno \ + component/extensions/source/update/feed/updatefeed \ + component/extensions/source/update/ui/updchk \ dbp \ fpicker \ fps_office \ @@ -183,9 +186,6 @@ my_components += \ syssh \ tvhlp1 \ ucpchelp1 \ - updatefeed \ - updchk \ - updchk.uno \ xmx .ENDIF diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 84cbfa114f59..2041bbda8ee6 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 -- cgit From ec0240cffc35ca74fa874f7b57b4eee787a66f4e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 14 Dec 2011 20:10:08 +0100 Subject: extensions: convert ole automation bridge to gbuild Of course not tested at all (WNT only) --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 74dbb16f9d39..9850d3f1647a 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -321,7 +321,7 @@ my_components += \ .IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == "" my_components += \ emser \ - oleautobridge + component/extensions/source/ole/oleautobridge .END .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" -- cgit From aaa2f8f7e1ad4d85e901912d6bbc2ed99ae37a7b Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 14 Dec 2011 20:52:33 +0100 Subject: extensions: convert scanner to gbuild --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 9850d3f1647a..d2496ea342dc 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,6 +173,7 @@ my_components += \ component/desktop/source/migration/services/migrationoo3 \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ + component/extensions/source/scanner/scn \ component/extensions/source/update/check/updchk.uno \ component/extensions/source/update/feed/updatefeed \ component/extensions/source/update/ui/updchk \ @@ -182,7 +183,6 @@ my_components += \ log \ pcr \ res \ - scn \ syssh \ tvhlp1 \ ucpchelp1 \ -- cgit From 4b4c583b90d61865de30de1a88074f600654b627 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 14 Dec 2011 20:54:38 +0100 Subject: extensions: convert pcr to gbuild --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index d2496ea342dc..2ffa9775cc87 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,6 +173,7 @@ my_components += \ component/desktop/source/migration/services/migrationoo3 \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ + component/extensions/source/propctrlr/pcr \ component/extensions/source/scanner/scn \ component/extensions/source/update/check/updchk.uno \ component/extensions/source/update/feed/updatefeed \ @@ -181,7 +182,6 @@ my_components += \ fpicker \ fps_office \ log \ - pcr \ res \ syssh \ tvhlp1 \ -- cgit From a80a5ab4f6b243b94e89f1720b1c8c58e8611e93 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 17 Dec 2011 22:11:57 +0100 Subject: extensions: convert plugin to gbuild --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 2ffa9775cc87..c9e7a2df68f6 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -272,7 +272,7 @@ my_components += ldapbe2 .END .IF "$(WITH_MOZILLA)" != "NO" -my_components += pl +my_components += component/extensions/source/plugin/pl .END .IF "$(ENABLE_XMLSEC)" == "YES" -- cgit From 87612dadc166fb078074e50796cc864dc981b483 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 17 Dec 2011 23:33:32 +0100 Subject: extensions: convert ldap to gbuild --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index c9e7a2df68f6..36bcee6091c1 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -268,7 +268,7 @@ my_components += \ .END .IF "$(WITH_LDAP)" == "YES" -my_components += ldapbe2 +my_components += component/extensions/source/config/ldap/ldapbe2 .END .IF "$(WITH_MOZILLA)" != "NO" -- cgit From ac8733d8bed779b40af1606afe5c753676abc68b Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 17 Dec 2011 23:47:32 +0100 Subject: extensions: convert bibliography to gbuild --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 36bcee6091c1..1a52db095ccd 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -166,13 +166,13 @@ my_components = \ .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 \ + component/extensions/source/bibliography/bib \ component/extensions/source/propctrlr/pcr \ component/extensions/source/scanner/scn \ component/extensions/source/update/check/updchk.uno \ -- cgit From 2e6705a7287cdd046ed73e4e81dddd9b87d9279e Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 17 Dec 2011 23:58:52 +0100 Subject: extensions: convert logging to gbuild --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 1a52db095ccd..a03dd331d454 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,6 +173,7 @@ my_components += \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ component/extensions/source/bibliography/bib \ + component/extensions/source/logging/log \ component/extensions/source/propctrlr/pcr \ component/extensions/source/scanner/scn \ component/extensions/source/update/check/updchk.uno \ @@ -181,7 +182,6 @@ my_components += \ dbp \ fpicker \ fps_office \ - log \ res \ syssh \ tvhlp1 \ -- cgit From ead4cd1fa535f1bdbda4c99217e727903f058e50 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 18 Dec 2011 00:13:28 +0100 Subject: extensions: convert dbpilots to gbuild --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index a03dd331d454..1865bfdfcb40 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,13 +173,13 @@ my_components += \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ component/extensions/source/bibliography/bib \ + component/extensions/source/dbpilots/dbp \ component/extensions/source/logging/log \ component/extensions/source/propctrlr/pcr \ component/extensions/source/scanner/scn \ component/extensions/source/update/check/updchk.uno \ component/extensions/source/update/feed/updatefeed \ component/extensions/source/update/ui/updchk \ - dbp \ fpicker \ fps_office \ res \ -- cgit From bc4fda7310c25b202b0e65a16bbc6f600931cbe4 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 18 Dec 2011 00:23:55 +0100 Subject: extensions: convert abpilot to gbuild --- postprocess/packcomponents/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 1865bfdfcb40..1dfc4c9c40df 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -165,13 +165,13 @@ my_components = \ .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" my_components += \ - abp \ 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 \ + component/extensions/source/abpilot/abp \ component/extensions/source/bibliography/bib \ component/extensions/source/dbpilots/dbp \ component/extensions/source/logging/log \ -- cgit From 42506a1cfdad85ead9620b363de99d7475a8fb08 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 18 Dec 2011 00:47:43 +0100 Subject: extensions: convert resource, xmlextract to gbuild --- postprocess/packcomponents/makefile.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'postprocess') diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 1dfc4c9c40df..4b8c290abd23 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -176,17 +176,18 @@ my_components += \ 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/extensions/source/xmlextract/xmx \ fpicker \ fps_office \ - res \ syssh \ tvhlp1 \ ucpchelp1 \ - xmx + .ENDIF .IF "$(DISABLE_PYTHON)" != "TRUE" -- cgit From f55b5ef370f6e477e2540636aa3b24f9b8de5a09 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sun, 18 Dec 2011 02:10:12 +0100 Subject: extensions: add to tail_build --- postprocess/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index 50f4f60a998d..af13689d64e0 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility 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 :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm 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 usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL -- cgit From 37fbc0a00982be908f7b5ea5e7151a48043df9df Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 17 Dec 2011 18:21:39 -0500 Subject: add scaddins to tail_build --- postprocess/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index af13689d64e0..d188780f8b00 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm 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 :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges 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 usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL -- cgit From e12f8d4a632cf2d63e5e918e1c7549f70faeed51 Mon Sep 17 00:00:00 2001 From: Peter Foley Date: Sat, 17 Dec 2011 18:40:01 -0500 Subject: add dtrans to tail_build --- postprocess/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'postprocess') diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst index d188780f8b00..92dff0cdd208 100644 --- a/postprocess/prj/build.lst +++ b/postprocess/prj/build.lst @@ -1,4 +1,4 @@ -po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges 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 :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges 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 usr1 - all po_mkout NULL po postprocess\checkxml nmake - all po_checkxml NULL po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL -- cgit