From 5e838ad7d9d9919a362497cf5f04bdb2e7c1c6f7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Apr 2010 23:02:51 +0200 Subject: CWS gnumake2: move delivered header files from sfx2/inc to sfx2/inc/sfx2; removed unused code; avoid delivering sfx.srs to solver --- sfx2/prj/d.lst | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index fe71b1715769..b36ec3fea06a 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -22,20 +22,33 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid ..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml ..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv -..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h ..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi ..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi + +..\inc\sfx2\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx +..\inc\sfx2\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx +..\inc\sfx2\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx +..\inc\sfx2\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx +..\inc\sfx2\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx +..\inc\sfx2\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx +..\inc\sfx2\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx +..\inc\sfx2\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx +..\inc\sfx2\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx +..\inc\sfx2\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx +..\inc\sfx2\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx +..\inc\sfx2\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx +..\inc\sfx2\sfxresid.hxx %_DEST%\inc%_EXT%\sfx2\sfxresid.hxx + +..\inc\sfx2\dllapi.h %_DEST%\inc%_EXT%\sfx2\dllapi.h ..\inc\sfx2\app.hxx %_DEST%\inc%_EXT%\sfx2\app.hxx ..\inc\sfx2\basedlgs.hxx %_DEST%\inc%_EXT%\sfx2\basedlgs.hxx ..\inc\sfx2\bindings.hxx %_DEST%\inc%_EXT%\sfx2\bindings.hxx -..\inc\brokenpackageint.hxx %_DEST%\inc%_EXT%\sfx2\brokenpackageint.hxx ..\inc\sfx2\chalign.hxx %_DEST%\inc%_EXT%\sfx2\chalign.hxx ..\inc\sfx2\childwin.hxx %_DEST%\inc%_EXT%\sfx2\childwin.hxx ..\inc\sfx2\ctrlitem.hxx %_DEST%\inc%_EXT%\sfx2\ctrlitem.hxx ..\inc\sfx2\dispatch.hxx %_DEST%\inc%_EXT%\sfx2\dispatch.hxx ..\inc\sfx2\dinfdlg.hxx %_DEST%\inc%_EXT%\sfx2\dinfdlg.hxx -..\inc\dinfedt.hxx %_DEST%\inc%_EXT%\sfx2\dinfedt.hxx ..\inc\sfx2\docinf.hxx %_DEST%\inc%_EXT%\sfx2\docinf.hxx ..\inc\sfx2\docfac.hxx %_DEST%\inc%_EXT%\sfx2\docfac.hxx ..\inc\sfx2\docfile.hxx %_DEST%\inc%_EXT%\sfx2\docfile.hxx @@ -53,15 +66,12 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\frmhtmlw.hxx %_DEST%\inc%_EXT%\sfx2\frmhtmlw.hxx ..\inc\sfx2\genlink.hxx %_DEST%\inc%_EXT%\sfx2\genlink.hxx ..\inc\sfx2\hintpost.hxx %_DEST%\inc%_EXT%\sfx2\hintpost.hxx -..\inc\imgmgr.hxx %_DEST%\inc%_EXT%\sfx2\imgmgr.hxx ..\inc\sfx2\imgdef.hxx %_DEST%\inc%_EXT%\sfx2\imgdef.hxx ..\inc\sfx2\ipclient.hxx %_DEST%\inc%_EXT%\sfx2\ipclient.hxx ..\inc\sfx2\macrconf.hxx %_DEST%\inc%_EXT%\sfx2\macrconf.hxx ..\inc\sfx2\topfrm.hxx %_DEST%\inc%_EXT%\sfx2\topfrm.hxx ..\inc\sfx2\mgetempl.hxx %_DEST%\inc%_EXT%\sfx2\mgetempl.hxx -..\inc\mieclip.hxx %_DEST%\inc%_EXT%\sfx2\mieclip.hxx ..\inc\sfx2\minarray.hxx %_DEST%\inc%_EXT%\sfx2\minarray.hxx -..\inc\minfitem.hxx %_DEST%\inc%_EXT%\sfx2\minfitem.hxx ..\inc\sfx2\minstack.hxx %_DEST%\inc%_EXT%\sfx2\minstack.hxx ..\inc\sfx2\mnuitem.hxx %_DEST%\inc%_EXT%\sfx2\mnuitem.hxx ..\inc\sfx2\module.hxx %_DEST%\inc%_EXT%\sfx2\module.hxx @@ -97,10 +107,8 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\tabdlg.hxx ..\inc\sfx2\tbxctrl.hxx %_DEST%\inc%_EXT%\sfx2\tbxctrl.hxx ..\inc\sfx2\templdlg.hxx %_DEST%\inc%_EXT%\sfx2\templdlg.hxx -..\inc\tplpitem.hxx %_DEST%\inc%_EXT%\sfx2\tplpitem.hxx ..\inc\sfx2\viewfrm.hxx %_DEST%\inc%_EXT%\sfx2\viewfrm.hxx ..\inc\sfx2\viewsh.hxx %_DEST%\inc%_EXT%\sfx2\viewsh.hxx -..\inc\viewfac.hxx %_DEST%\inc%_EXT%\sfx2\viewfac.hxx ..\inc\sfx2\appuno.hxx %_DEST%\inc%_EXT%\sfx2\appuno.hxx ..\inc\sfx2\sfxuno.hxx %_DEST%\inc%_EXT%\sfx2\sfxuno.hxx ..\inc\sfx2\sfxbasemodel.hxx %_DEST%\inc%_EXT%\sfx2\sfxbasemodel.hxx @@ -109,8 +117,6 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\srchitem.hxx %_DEST%\inc%_EXT%\sfx2\srchitem.hxx ..\inc\sfx2\srchdefs.hxx %_DEST%\inc%_EXT%\sfx2\srchdefs.hxx ..\inc\sfx2\cntids.hrc %_DEST%\inc%_EXT%\sfx2\cntids.hrc -..\inc\basmgr.hxx %_DEST%\inc%_EXT%\sfx2\basmgr.hxx -..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\sfx2\imagemgr.hxx ..\inc\sfx2\sfxdlg.hxx %_DEST%\inc%_EXT%\sfx2\sfxdlg.hxx ..\inc\sfx2\dialogs.hrc %_DEST%\inc%_EXT%\sfx2\dialogs.hrc ..\inc\sfx2\itemwrapper.hxx %_DEST%\inc%_EXT%\sfx2\itemwrapper.hxx @@ -121,9 +127,6 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\sfx2\linksrc.hxx %_DEST%\inc%_EXT%\sfx2\linksrc.hxx ..\inc\sfx2\querystatus.hxx %_DEST%\inc%_EXT%\sfx2\querystatus.hxx ..\inc\sfx2\sfxstatuslistener.hxx %_DEST%\inc%_EXT%\sfx2\sfxstatuslistener.hxx -..\inc\QuerySaveDocument.hxx %_DEST%\inc%_EXT%\sfx2\QuerySaveDocument.hxx -..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx -..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx ..\inc\sfx2\layout.hxx %_DEST%\inc%_EXT%\sfx2\layout.hxx ..\inc\sfx2\layout-tabdlg.hxx %_DEST%\inc%_EXT%\sfx2\layout-tabdlg.hxx ..\inc\sfx2\layout-post.hxx %_DEST%\inc%_EXT%\sfx2\layout-post.hxx -- cgit From 692dac6c6e964a64909f9adfba44f936810c2646 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 17 Apr 2010 12:41:17 +0200 Subject: CWS gnumake2: new gbuild system --- sfx2/prj/gbuild.lst | 4 + sfx2/prj/makefile.mk | 2 + sfx2/prj/target_lib_qstart.mk | 80 ++++++++++++ sfx2/prj/target_lib_sfx2.mk | 285 +++++++++++++++++++++++++++++++++++++++++ sfx2/prj/target_module_sfx2.mk | 47 +++++++ sfx2/prj/target_package_inc.mk | 159 +++++++++++++++++++++++ sfx2/prj/target_res_sfx2.mk | 76 +++++++++++ 7 files changed, 653 insertions(+) create mode 100644 sfx2/prj/gbuild.lst create mode 100644 sfx2/prj/makefile.mk create mode 100644 sfx2/prj/target_lib_qstart.mk create mode 100644 sfx2/prj/target_lib_sfx2.mk create mode 100644 sfx2/prj/target_module_sfx2.mk create mode 100644 sfx2/prj/target_package_inc.mk create mode 100644 sfx2/prj/target_res_sfx2.mk (limited to 'sfx2/prj') diff --git a/sfx2/prj/gbuild.lst b/sfx2/prj/gbuild.lst new file mode 100644 index 000000000000..7dc2a95cb994 --- /dev/null +++ b/sfx2/prj/gbuild.lst @@ -0,0 +1,4 @@ +sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL +sf sfx2 usr1 - all sf_mkout NULL +sf sfx2\prj nmake - all sf_prj NULL + diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk new file mode 100644 index 000000000000..a5f9aa9d8248 --- /dev/null +++ b/sfx2/prj/makefile.mk @@ -0,0 +1,2 @@ +all: + cd .. && make -sj9 diff --git a/sfx2/prj/target_lib_qstart.mk b/sfx2/prj/target_lib_qstart.mk new file mode 100644 index 000000000000..2da2ada42db3 --- /dev/null +++ b/sfx2/prj/target_lib_qstart.mk @@ -0,0 +1,80 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +#ifeq ($(OS),UNX) +$(eval $(call gb_Library_Library,qstart)) + +$(eval $(call gb_Library_set_include,qstart,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +#WTF: this nice code is currently found in the makefile.mk (unix part only) +# PKGCONFIG_MODULES=gtk+-2.0 +# .IF "$(PKGCONFIG_ROOT)"!="" +# PKG_CONFIG=$(PKGCONFIG_ROOT)/bin/pkg-config +# PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/pkgconfig +# .EXPORT : PKG_CONFIG_PATH +# PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT) +# .ELSE +# PKG_CONFIG*=pkg-config +# .ENDIF +# PKGCONFIG_CFLAGS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --cflags $(PKGCONFIG_MODULES)) +# PKGCONFIG_LIBS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --libs $(PKGCONFIG_MODULES)) +# CFLAGS+=$(PKGCONFIG_CFLAGS + +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_set_defs,qstart,\ + $$(DEFS) \ + -DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + +#todo: add libs +$(eval $(call gb_Library_add_linked_libs,qstart,\ + sfx \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,qstart,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) +$(eval $(call gb_Library_add_exception_objects,qstart,\ + sfx2/source/appl/shutdowniconunx.ob \ +)) +endif + +endif diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk new file mode 100644 index 000000000000..7770abef5a28 --- /dev/null +++ b/sfx2/prj/target_lib_sfx2.mk @@ -0,0 +1,285 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,sfx)) + +$(call gb_Library_get_headers_target,sfx) : $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) +$(call gb_Library_get_clean_target,sfx) : $(call gb_SdiTarget_get_clean_target,sfx2/sdi/sfxslots) + +$(eval $(call gb_Library_set_include,sfx,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/sfx2/sdi \ + -I$(WORKDIR)/inc/sfx2 \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/source/inc \ + -I$(SRCDIR)/sfx2/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ + $(LIBXML_CFLAGS) \ +)) + +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DSFX2_DLLIMPLEMENTATION \ + -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ +)) + +ifneq ($(OS),UNX) +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,sfx,\ + comphelper \ + i18nisolang1 \ + sb \ + sot \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + cppu \ + cppuhelper \ + sal \ + utl \ + vcl \ + vos3 \ + fwe \ + sax \ + xml2 \ + stl \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,sfx,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/appl/appcfg \ + sfx2/source/appl/imagemgr \ + sfx2/source/appl/appopen \ + sfx2/source/appl/appmain \ + sfx2/source/appl/appmisc \ + sfx2/source/appl/appinit \ + sfx2/source/appl/helpinterceptor \ + sfx2/source/appl/newhelp \ + sfx2/source/appl/sfxhelp \ + sfx2/source/appl/shutdownicon \ + sfx2/source/appl/shutdowniconw32 \ + sfx2/source/appl/sfxpicklist \ + sfx2/source/appl/helpdispatch \ + sfx2/source/appl/xpackcreator \ + sfx2/source/appl/app \ + sfx2/source/appl/appbas \ + sfx2/source/appl/appchild \ + sfx2/source/appl/appdata \ + sfx2/source/appl/appdde \ + sfx2/source/appl/appquit \ + sfx2/source/appl/appreg \ + sfx2/source/appl/appserv \ + sfx2/source/appl/appuno \ + sfx2/source/appl/appbaslib \ + sfx2/source/appl/childwin \ + sfx2/source/appl/imestatuswindow \ + sfx2/source/appl/impldde \ + sfx2/source/appl/linkmgr2 \ + sfx2/source/appl/linksrc \ + sfx2/source/appl/lnkbase2 \ + sfx2/source/appl/module \ + sfx2/source/appl/sfxdll \ + sfx2/source/appl/workwin \ + sfx2/source/appl/fwkhelper \ + sfx2/source/bastyp/sfxhtml \ + sfx2/source/bastyp/frmhtml \ + sfx2/source/bastyp/frmhtmlw \ + sfx2/source/bastyp/misc \ + sfx2/source/bastyp/progress \ + sfx2/source/bastyp/sfxresid \ + sfx2/source/bastyp/bitset \ + sfx2/source/bastyp/minarray \ + sfx2/source/bastyp/fltfnc \ + sfx2/source/bastyp/mieclip \ + sfx2/source/bastyp/fltlst \ + sfx2/source/bastyp/helper \ + sfx2/source/config/evntconf \ + sfx2/source/control/bindings \ + sfx2/source/control/ctrlitem \ + sfx2/source/control/dispatch \ + sfx2/source/control/macrconf \ + sfx2/source/control/macro \ + sfx2/source/control/minfitem \ + sfx2/source/control/msg \ + sfx2/source/control/msgpool \ + sfx2/source/control/objface \ + sfx2/source/control/querystatus \ + sfx2/source/control/request \ + sfx2/source/control/sfxstatuslistener \ + sfx2/source/control/shell \ + sfx2/source/control/sorgitm \ + sfx2/source/control/srchitem \ + sfx2/source/control/statcach \ + sfx2/source/control/unoctitm \ + sfx2/source/dialog/filedlghelper \ + sfx2/source/dialog/filtergrouping \ + sfx2/source/dialog/itemconnect \ + sfx2/source/dialog/mailmodel \ + sfx2/source/dialog/partwnd \ + sfx2/source/dialog/recfloat \ + sfx2/source/dialog/templdlg \ + sfx2/source/dialog/dinfdlg \ + sfx2/source/dialog/dockwin \ + sfx2/source/doc/printhelper \ + sfx2/source/doc/docinf \ + sfx2/source/doc/oleprops \ + sfx2/source/doc/iframe \ + sfx2/source/doc/plugin \ + sfx2/source/doc/docfile \ + sfx2/source/doc/objuno \ + sfx2/source/doc/frmdescr \ + sfx2/source/doc/objxtor \ + sfx2/source/doc/objmisc \ + sfx2/source/doc/objstor \ + sfx2/source/doc/objcont \ + sfx2/source/doc/objserv \ + sfx2/source/doc/objitem \ + sfx2/source/doc/ownsubfilterservice \ + sfx2/source/doc/docfac \ + sfx2/source/doc/docfilt \ + sfx2/source/doc/doctempl \ + sfx2/source/doc/doctemplates \ + sfx2/source/doc/doctemplateslocal \ + sfx2/source/doc/docvor \ + sfx2/source/doc/new \ + sfx2/source/doc/doctdlg \ + sfx2/source/doc/sfxbasemodel \ + sfx2/source/doc/guisaveas \ + sfx2/source/doc/objembed \ + sfx2/source/doc/graphhelp \ + sfx2/source/doc/QuerySaveDocument \ + sfx2/source/doc/opostponedtruncationstream \ + sfx2/source/doc/docinsert \ + sfx2/source/doc/docmacromode \ + sfx2/source/doc/SfxDocumentMetaData \ + sfx2/source/doc/Metadatable \ + sfx2/source/doc/DocumentMetadataAccess \ + sfx2/source/doc/sfxmodelfactory \ + sfx2/source/doc/sfxacldetect \ + sfx2/source/doc/docstoragemodifylistener \ + sfx2/source/doc/querytemplate \ + sfx2/source/explorer/nochaos \ + sfx2/source/inet/inettbc \ + sfx2/source/menu/mnumgr \ + sfx2/source/menu/virtmenu \ + sfx2/source/menu/objmnctl \ + sfx2/source/menu/mnuitem \ + sfx2/source/notify/eventsupplier \ + sfx2/source/statbar/stbitem \ + sfx2/source/toolbox/tbxitem \ + sfx2/source/toolbox/imgmgr \ + sfx2/source/view/ipclient \ + sfx2/source/view/viewsh \ + sfx2/source/view/frmload \ + sfx2/source/view/frame \ + sfx2/source/view/printer \ + sfx2/source/view/prnmon \ + sfx2/source/view/viewprn \ + sfx2/source/view/viewfac \ + sfx2/source/view/orgmgr \ + sfx2/source/view/viewfrm \ + sfx2/source/view/impframe \ + sfx2/source/view/topfrm \ + sfx2/source/view/sfxbasecontroller \ + sfx2/source/view/userinputinterception \ +)) + +$(eval $(call gb_Library_add_noexception_objects,sfx,\ + sfx2/source/dialog/about \ + sfx2/source/dialog/alienwarn \ + sfx2/source/dialog/basedlgs \ + sfx2/source/dialog/dinfedt \ + sfx2/source/dialog/intro \ + sfx2/source/dialog/mgetempl \ + sfx2/source/dialog/navigat \ + sfx2/source/dialog/newstyle \ + sfx2/source/dialog/passwd \ + sfx2/source/dialog/printopt \ + sfx2/source/dialog/sfxdlg \ + sfx2/source/dialog/sfxurl \ + sfx2/source/dialog/splitwin \ + sfx2/source/dialog/srchdlg \ + sfx2/source/dialog/styfitem \ + sfx2/source/dialog/styledlg \ + sfx2/source/dialog/tabdlg \ + sfx2/source/dialog/tplcitem \ + sfx2/source/dialog/tplpitem \ + sfx2/source/dialog/versdlg \ + sfx2/source/notify/hintpost \ +)) + +$(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx)) + +$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sfx2/inc/sfx2 \ + -I$(SRCDIR)/sfx2/inc \ + -I$(SRCDIR)/sfx2/sdi \ +)) + +ifeq ($(OS),OS2) +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/appl/shutdowniconOs2.ob \ +)) +endif +ifeq ($(OS),OSX) +$(eval $(call gb_Library_add_exception_objects,sfx,\ + sfx2/source/appl/shutdowniconaqua.ob \ +)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + advapi32 \ + gdi32 \ + kernel32 \ + msvcrt \ + oldnames \ + ole32 \ + shell32 \ + user32 \ + uuid \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: + diff --git a/sfx2/prj/target_module_sfx2.mk b/sfx2/prj/target_module_sfx2.mk new file mode 100644 index 000000000000..d3a1996bab05 --- /dev/null +++ b/sfx2/prj/target_module_sfx2.mk @@ -0,0 +1,47 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,sfx2,\ + $(call gb_AllLangResTarget_get_target,sfx) \ + $(call gb_Library_get_target,sfx) \ +)) + +$(eval $(call gb_Module_read_includes,sfx2,\ + lib_sfx2 \ + package_inc \ + res_sfx2 \ +)) + +#todo: map file? +#todo: source/appl ohne Optimierung? +#todo: source/control ohne Optimierung? +#todo: source/dialog BUILD_VER_STRING +#todo: source/doc SYSTEM_LIBXML2 +#todo: noopt for acldetect.cxx? +#todo: ENABLE_LAYOUT +#todo: quickstarter +#todo: link against cocoa on Mac diff --git a/sfx2/prj/target_package_inc.mk b/sfx2/prj/target_package_inc.mk new file mode 100644 index 000000000000..9661439ce35c --- /dev/null +++ b/sfx2/prj/target_package_inc.mk @@ -0,0 +1,159 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) + +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/topfrm.hxx,sfx2/topfrm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfxhelp.hxx,sfx2/sfxhelp.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/stbitem.hxx,sfx2/stbitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/srchitem.hxx,sfx2/srchitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/srchdefs.hxx,sfx2/srchdefs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sfx2/prj/target_res_sfx2.mk b/sfx2/prj/target_res_sfx2.mk new file mode 100644 index 000000000000..3feb0e2b9f6d --- /dev/null +++ b/sfx2/prj/target_res_sfx2.mk @@ -0,0 +1,76 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx)) + +$(eval $(call gb_AllLangResTarget_add_srs,sfx,\ + sfx/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) + +$(eval $(call gb_SrsTarget_set_include,sfx/res,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc \ + -I$(SRCDIR)/sfx2/source/dialog \ + -I$(SRCDIR)/sfx2/source/inc \ + -I$(SRCDIR)/sfx2/inc/ \ + -I$(SRCDIR)/sfx2/inc/sfx \ +)) + +$(eval $(call gb_SrsTarget_add_files,sfx/res,\ + sfx2/source/appl/app.src \ + sfx2/source/appl/newhelp.src \ + sfx2/source/appl/dde.src \ + sfx2/source/appl/sfx.src \ + sfx2/source/doc/doc.src \ + sfx2/source/doc/new.src \ + sfx2/source/doc/doctdlg.src \ + sfx2/source/doc/doctempl.src \ + sfx2/source/doc/graphhelp.src \ + sfx2/source/menu/menu.src \ + sfx2/source/view/view.src \ + sfx2/source/dialog/alienwarn.src \ + sfx2/source/dialog/dialog.src \ + sfx2/source/dialog/dinfdlg.src \ + sfx2/source/dialog/dinfedt.src \ + sfx2/source/dialog/filedlghelper.src \ + sfx2/source/dialog/mailwindow.src \ + sfx2/source/dialog/mgetempl.src \ + sfx2/source/dialog/newstyle.src \ + sfx2/source/dialog/passwd.src \ + sfx2/source/dialog/printopt.src \ + sfx2/source/dialog/recfloat.src \ + sfx2/source/dialog/srchdlg.src \ + sfx2/source/dialog/templdlg.src \ + sfx2/source/dialog/versdlg.src \ + sfx2/source/bastyp/bastyp.src \ + sfx2/source/bastyp/fltfnc.src \ +)) + + -- cgit From 3c7e8d23ffa624bd54f2817d0e6dcc317106edd8 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 19 Apr 2010 15:02:20 +0200 Subject: CWS gnumake2: made resource location in default_images customizable for nonconforming modules (toolkit,framework,sfx2) --- sfx2/prj/target_res_sfx2.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sfx2/prj') diff --git a/sfx2/prj/target_res_sfx2.mk b/sfx2/prj/target_res_sfx2.mk index 3feb0e2b9f6d..b51079559e82 100644 --- a/sfx2/prj/target_res_sfx2.mk +++ b/sfx2/prj/target_res_sfx2.mk @@ -27,6 +27,8 @@ $(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx)) +$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2)) + $(eval $(call gb_AllLangResTarget_add_srs,sfx,\ sfx/res \ )) -- cgit From d10ed4290570c12220c8fbdf1603a0ee4e1d1471 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Apr 2010 17:54:47 +0200 Subject: CWS gnumake2: removed files in svl; typo in svtools makefile; missing include in sfx2 makefile --- sfx2/prj/target_module_sfx2.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'sfx2/prj') diff --git a/sfx2/prj/target_module_sfx2.mk b/sfx2/prj/target_module_sfx2.mk index d3a1996bab05..37281b059595 100644 --- a/sfx2/prj/target_module_sfx2.mk +++ b/sfx2/prj/target_module_sfx2.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_Module,sfx2,\ $(call gb_AllLangResTarget_get_target,sfx) \ $(call gb_Library_get_target,sfx) \ + $(call gb_Package_get_target,sfx2_inc) \ )) $(eval $(call gb_Module_read_includes,sfx2,\ -- cgit From 9bc2851f0eefd96d06385410c4a0a7ed419acb0d Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:09:27 +0200 Subject: CWS gnumake2: various fixes after merging with DEV300_m76 --- sfx2/prj/build.lst | 23 +--------- sfx2/prj/d.lst | 31 ------------- sfx2/prj/target_lib_sfx2.mk | 31 +++++++------ sfx2/prj/target_module_sfx2.mk | 5 ++ sfx2/prj/target_package_inc.mk | 101 ++++++++++++++++++++--------------------- sfx2/prj/target_package_sdi.mk | 30 ++++++++++++ 6 files changed, 101 insertions(+), 120 deletions(-) create mode 100644 sfx2/prj/target_package_sdi.mk (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 89e618e8fc12..7dc2a95cb994 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,23 +1,4 @@ sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\win\res get - all sf_wres NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL +sf sfx2\prj nmake - all sf_prj NULL + diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 2b956707606a..8b137891791f 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -1,32 +1 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% -mkdir: %_DEST%\inc%_EXT%\sfx2 - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\slb\sfx.lib %_DEST%\lib%_EXT%\xsfx.lib -..\%__SRC%\lib\isfx.lib %_DEST%\lib%_EXT%\isfx.lib -..\%__SRC%\lib\debug.lib %_DEST%\lib%_EXT%\sfxdebug.lib -..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym -..\%__SRC%\bin\sfx?????.dll %_DEST%\bin%_EXT%\sfx?????.dll -..\%__SRC%\bin\sfx*.res %_DEST%\bin%_EXT%\sfx*.res -..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym -..\%__SRC%\misc\sfx?????.map %_DEST%\bin%_EXT%\sfx?????.map -..\%__SRC%\bin\elc?????.dll %_DEST%\bin%_EXT%\elc?????.dll -..\%__SRC%\srs\sfx.srs %_DEST%\res%_EXT%\sfx.srs -..\%COMMON_OUTDIR%\srs\sfx_srs.hid %COMMON_DEST%\res%_EXT%\sfx_srs.hid -..\%__SRC%\srs\sfxslots.srs %_DEST%\res%_EXT%\sfxslots.srs -..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid -..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml -..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv - -..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h -..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx -..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc - -..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi -..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index c08f563d2827..9d39fd1c0d50 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Library_Library,sfx)) $(call gb_Library_get_headers_target,sfx) : $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) +$(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) :| $(call gb_Library_get_external_headers_target,sfx) $(call gb_Library_get_clean_target,sfx) : $(call gb_SdiTarget_get_clean_target,sfx2/sdi/sfxslots) $(eval $(call gb_Library_set_include,sfx,\ @@ -59,24 +60,24 @@ endif $(eval $(call gb_Library_add_linked_libs,sfx,\ comphelper \ + cppu \ + cppuhelper \ + fwe \ i18nisolang1 \ + sal \ + sax \ sb \ sot \ + stl \ svl \ svt \ tk \ tl \ ucbhelper \ - cppu \ - cppuhelper \ - sal \ utl \ vcl \ vos3 \ - fwe \ - sax \ xml2 \ - stl \ )) $(eval $(call gb_Library_add_linked_system_libs,sfx,\ @@ -155,8 +156,8 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/dialog/about \ sfx2/source/dialog/alienwarn \ sfx2/source/dialog/basedlgs \ - sfx2/source/dialog/dinfedt \ sfx2/source/dialog/dinfdlg \ + sfx2/source/dialog/dinfedt \ sfx2/source/dialog/dockwin \ sfx2/source/dialog/filedlghelper \ sfx2/source/dialog/filtergrouping \ @@ -181,6 +182,10 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/dialog/tplcitem \ sfx2/source/dialog/tplpitem \ sfx2/source/dialog/versdlg \ + sfx2/source/doc/DocumentMetadataAccess \ + sfx2/source/doc/Metadatable \ + sfx2/source/doc/QuerySaveDocument \ + sfx2/source/doc/SfxDocumentMetaData \ sfx2/source/doc/docfac \ sfx2/source/doc/docfile \ sfx2/source/doc/docfilt \ @@ -188,17 +193,15 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/docinsert \ sfx2/source/doc/docmacromode \ sfx2/source/doc/docstoragemodifylistener \ + sfx2/source/doc/doctdlg \ sfx2/source/doc/doctempl \ sfx2/source/doc/doctemplates \ sfx2/source/doc/doctemplateslocal \ - sfx2/source/doc/doctdlg \ - sfx2/source/doc/DocumentMetadataAccess \ sfx2/source/doc/docvor \ sfx2/source/doc/frmdescr \ sfx2/source/doc/graphhelp \ sfx2/source/doc/guisaveas \ sfx2/source/doc/iframe \ - sfx2/source/doc/Metadatable \ sfx2/source/doc/new \ sfx2/source/doc/objcont \ sfx2/source/doc/objembed \ @@ -213,16 +216,14 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/doc/ownsubfilterservice \ sfx2/source/doc/plugin \ sfx2/source/doc/printhelper \ - sfx2/source/doc/QuerySaveDocument \ sfx2/source/doc/querytemplate \ sfx2/source/doc/sfxacldetect \ sfx2/source/doc/sfxbasemodel \ - sfx2/source/doc/SfxDocumentMetaData \ sfx2/source/doc/sfxmodelfactory \ sfx2/source/explorer/nochaos \ sfx2/source/inet/inettbc \ - sfx2/source/menu/mnumgr \ sfx2/source/menu/mnuitem \ + sfx2/source/menu/mnumgr \ sfx2/source/menu/objmnctl \ sfx2/source/menu/virtmenu \ sfx2/source/notify/eventsupplier \ @@ -239,10 +240,10 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/view/sfxbasecontroller \ sfx2/source/view/userinputinterception \ sfx2/source/view/viewfac \ - sfx2/source/view/viewprn \ - sfx2/source/view/viewsh \ sfx2/source/view/viewfrm \ sfx2/source/view/viewfrm2 \ + sfx2/source/view/viewprn \ + sfx2/source/view/viewsh \ )) $(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx)) diff --git a/sfx2/prj/target_module_sfx2.mk b/sfx2/prj/target_module_sfx2.mk index d3a1996bab05..3ec4e606795f 100644 --- a/sfx2/prj/target_module_sfx2.mk +++ b/sfx2/prj/target_module_sfx2.mk @@ -28,13 +28,18 @@ $(eval $(call gb_Module_Module,sfx2,\ $(call gb_AllLangResTarget_get_target,sfx) \ $(call gb_Library_get_target,sfx) \ + $(call gb_Package_get_target,sfx2_inc) \ + $(call gb_Package_get_target,sfx2_sdi) \ )) +# $(call gb_Library_get_target,qstart) \ $(eval $(call gb_Module_read_includes,sfx2,\ lib_sfx2 \ package_inc \ + package_sdi \ res_sfx2 \ )) +# lib_qstart \ #todo: map file? #todo: source/appl ohne Optimierung? diff --git a/sfx2/prj/target_package_inc.mk b/sfx2/prj/target_package_inc.mk index aa369dde5e0b..dd836b286f8b 100644 --- a/sfx2/prj/target_package_inc.mk +++ b/sfx2/prj/target_package_inc.mk @@ -26,74 +26,100 @@ #************************************************************************* $(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) - -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/topfrm.hxx,sfx2/topfrm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) @@ -101,42 +127,11 @@ $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) +$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) $(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/srchitem.hxx,sfx2/srchitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/srchdefs.hxx,sfx2/srchdefs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) - - - diff --git a/sfx2/prj/target_package_sdi.mk b/sfx2/prj/target_package_sdi.mk new file mode 100644 index 000000000000..63f2138adf4f --- /dev/null +++ b/sfx2/prj/target_package_sdi.mk @@ -0,0 +1,30 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,sfx2_sdi,$(SRCDIR)/sfx2/sdi)) +$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi)) +$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi)) -- cgit From 1aeb4427c8b6f174fd0f5280f4023209ab07af0a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 21 Apr 2010 14:55:42 +0200 Subject: CWS gnumake2: not using implicit rules --- sfx2/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index a5f9aa9d8248..2a0b99e72fd5 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -1,2 +1,2 @@ all: - cd .. && make -sj9 + cd .. && make -srj9 -- cgit From b8f0e80d0e60345015e99a4d93d5bef7ff05f82a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 22 Apr 2010 18:36:39 +0200 Subject: CWS gnumake2: Sdi deps should work now --- sfx2/prj/target_lib_sfx2.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sfx2/prj') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index 9d39fd1c0d50..a9b97e84e172 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,sfx)) +$(call gb_Library_get_headers_target,sfx) : $(call gb_Package_get_target,sfx2_inc) +$(call gb_Library_get_headers_target,sfx) : $(call gb_Package_get_target,sfx2_sdi) $(call gb_Library_get_headers_target,sfx) : $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) :| $(call gb_Library_get_external_headers_target,sfx) $(call gb_Library_get_clean_target,sfx) : $(call gb_SdiTarget_get_clean_target,sfx2/sdi/sfxslots) -- cgit From 44b27fb699c6541f9c85091983d1faa23079217a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 23 Apr 2010 15:15:43 +0200 Subject: CWS gnumake2: added cnvenience methods for adding package and sdi headers --- sfx2/prj/target_lib_sfx2.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index a9b97e84e172..0a93faf16f15 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -27,11 +27,12 @@ $(eval $(call gb_Library_Library,sfx)) -$(call gb_Library_get_headers_target,sfx) : $(call gb_Package_get_target,sfx2_inc) -$(call gb_Library_get_headers_target,sfx) : $(call gb_Package_get_target,sfx2_sdi) -$(call gb_Library_get_headers_target,sfx) : $(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) -$(call gb_SdiTarget_get_target,sfx2/sdi/sfxslots) :| $(call gb_Library_get_external_headers_target,sfx) -$(call gb_Library_get_clean_target,sfx) : $(call gb_SdiTarget_get_clean_target,sfx2/sdi/sfxslots) +$(eval $(call gb_Library_add_package_headers,sfx,\ + sfx2_inc \ + sfx2_sdi \ +)) + +$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_include,sfx,\ $$(INCLUDE) \ -- cgit From a406648e74b01e304b1371044d3d4fb00105604a Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 30 Apr 2010 19:46:04 +0200 Subject: gnumake2: sfx2: fix quickstarter build on MacOSX --- sfx2/prj/target_lib_sfx2.mk | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index 0a93faf16f15..d9b8c52e3736 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -54,13 +54,6 @@ $(eval $(call gb_Library_set_defs,sfx,\ -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ )) -ifneq ($(OS),UNX) -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ - -DENABLE_QUICKSTART_APPLET \ -)) -endif - $(eval $(call gb_Library_add_linked_libs,sfx,\ comphelper \ cppu \ @@ -258,14 +251,25 @@ $(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ -I$(SRCDIR)/sfx2/sdi \ )) +ifeq ($(OS),$(filter WNT MACOSX,$(OS))) +$(eval $(call gb_Library_set_defs,sfx,\ + $$(DEFS) \ + -DENABLE_QUICKSTART_APPLET \ +)) +endif + ifeq ($(OS),OS2) $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/appl/shutdowniconOs2.ob \ )) endif -ifeq ($(OS),OSX) -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/appl/shutdowniconaqua.ob \ +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_objcxxobjects,sfx,\ + sfx2/source/appl/shutdowniconaqua \ +)) +$(eval $(call gb_Library_add_linked_libs,sfx,\ + objc \ + Cocoa \ )) endif ifeq ($(OS),WNT) -- cgit From 137b283deb31f38a25d9996dc1a0c2057d39998a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 1 Jun 2010 17:28:33 +0200 Subject: CWS gnumake2: fitting sdi into the workdir structure --- sfx2/prj/target_lib_sfx2.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index d9b8c52e3736..952fb9ce05f5 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -35,14 +35,13 @@ $(eval $(call gb_Library_add_package_headers,sfx,\ $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_include,sfx,\ - $$(INCLUDE) \ - -I$(WORKDIR)/inc/sfx2/sdi \ - -I$(WORKDIR)/inc/sfx2 \ - -I$(WORKDIR)/inc/ \ -I$(SRCDIR)/sfx2/inc \ -I$(SRCDIR)/sfx2/inc/sfx2 \ -I$(SRCDIR)/sfx2/source/inc \ -I$(SRCDIR)/sfx2/inc/pch \ + -I$(WORKDIR)/SdiTarget/sfx2/sdi \ + -I$(WORKDIR)/inc/ \ + $$(INCLUDE) \ -I$(OUTDIR)/inc/offuh \ -I$(OUTDIR)/inc \ $(LIBXML_CFLAGS) \ -- cgit From 70d60072ed2b8d6a8a50b5a433954e67d32f5f6a Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Thu, 10 Jun 2010 14:30:42 +0200 Subject: sb123:#i111449# cleanups in sfx2 qa/complex tests --- sfx2/prj/build.lst | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 3e791fbc2000..de63edf7dd37 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,24 +1,29 @@ sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL -sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\win\res get - all sf_wres NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL +sf sfx2 usr1 - all sf_mkout NULL +sf sfx2\inc nmake - all sf_inc NULL +sf sfx2\prj get - all sf_prj NULL +sf sfx2\win\res get - all sf_wres NULL +sf sfx2\mac\res get - all sf_mres NULL +sf sfx2\source\inc get - all sf_sinc NULL +sf sfx2\sdi nmake - all sf_sdi NULL +sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL +sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL +sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL +sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL +sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL +sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL +sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL +sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL +sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL +sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL +sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL +sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL +sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL +sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL +sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL + sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL + +sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL +sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_util NULL +sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit From b25e198437049b3db6d70a4fb81713fd937b6f5a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 18 Jun 2010 19:03:40 +0200 Subject: CWS gnumake2: enabling precompiled headers where possible --- sfx2/prj/target_lib_sfx2.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sfx2/prj') diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk index 952fb9ce05f5..9c1dc852e69c 100644 --- a/sfx2/prj/target_lib_sfx2.mk +++ b/sfx2/prj/target_lib_sfx2.mk @@ -32,6 +32,8 @@ $(eval $(call gb_Library_add_package_headers,sfx,\ sfx2_sdi \ )) +#$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2)) + $(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) $(eval $(call gb_Library_set_include,sfx,\ -- cgit From 95f3d4c562939999afe323aca72ac070b466e15f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- sfx2/prj/target_lib_qstart.mk | 80 ----------- sfx2/prj/target_lib_sfx2.mk | 291 ----------------------------------------- sfx2/prj/target_module_sfx2.mk | 52 -------- sfx2/prj/target_package_inc.mk | 154 ---------------------- sfx2/prj/target_package_sdi.mk | 30 ----- sfx2/prj/target_res_sfx2.mk | 78 ----------- 6 files changed, 685 deletions(-) delete mode 100644 sfx2/prj/target_lib_qstart.mk delete mode 100644 sfx2/prj/target_lib_sfx2.mk delete mode 100644 sfx2/prj/target_module_sfx2.mk delete mode 100644 sfx2/prj/target_package_inc.mk delete mode 100644 sfx2/prj/target_package_sdi.mk delete mode 100644 sfx2/prj/target_res_sfx2.mk (limited to 'sfx2/prj') diff --git a/sfx2/prj/target_lib_qstart.mk b/sfx2/prj/target_lib_qstart.mk deleted file mode 100644 index 2da2ada42db3..000000000000 --- a/sfx2/prj/target_lib_qstart.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -#ifeq ($(OS),UNX) -$(eval $(call gb_Library_Library,qstart)) - -$(eval $(call gb_Library_set_include,qstart,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sfx2/inc \ - -I$(SRCDIR)/sfx2/inc/sfx2 \ - -I$(SRCDIR)/sfx2/inc/pch \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ -)) - -#WTF: this nice code is currently found in the makefile.mk (unix part only) -# PKGCONFIG_MODULES=gtk+-2.0 -# .IF "$(PKGCONFIG_ROOT)"!="" -# PKG_CONFIG=$(PKGCONFIG_ROOT)/bin/pkg-config -# PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)/lib/pkgconfig -# .EXPORT : PKG_CONFIG_PATH -# PKGCONFIG_PREFIX=--define-variable=prefix=$(PKGCONFIG_ROOT) -# .ELSE -# PKG_CONFIG*=pkg-config -# .ENDIF -# PKGCONFIG_CFLAGS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --cflags $(PKGCONFIG_MODULES)) -# PKGCONFIG_LIBS:=$(shell @$(PKG_CONFIG) $(PKGCONFIG_PREFIX) --libs $(PKGCONFIG_MODULES)) -# CFLAGS+=$(PKGCONFIG_CFLAGS - -ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_set_defs,qstart,\ - $$(DEFS) \ - -DDLL_NAME=libsfx$(DLLPOSTFIX)$(DLLPOST) \ - -DENABLE_QUICKSTART_APPLET \ -)) -endif - -#todo: add libs -$(eval $(call gb_Library_add_linked_libs,qstart,\ - sfx \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,qstart,\ - icuuc \ - dl \ - m \ - pthread \ -)) - -ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) -$(eval $(call gb_Library_add_exception_objects,qstart,\ - sfx2/source/appl/shutdowniconunx.ob \ -)) -endif - -endif diff --git a/sfx2/prj/target_lib_sfx2.mk b/sfx2/prj/target_lib_sfx2.mk deleted file mode 100644 index 9c1dc852e69c..000000000000 --- a/sfx2/prj/target_lib_sfx2.mk +++ /dev/null @@ -1,291 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Library_Library,sfx)) - -$(eval $(call gb_Library_add_package_headers,sfx,\ - sfx2_inc \ - sfx2_sdi \ -)) - -#$(eval $(call gb_Library_add_precompiled_header,sfx,$(SRCDIR)/sfx2/inc/pch/precompiled_sfx2)) - -$(eval $(call gb_Library_add_sdi_headers,sfx,sfx2/sdi/sfxslots)) - -$(eval $(call gb_Library_set_include,sfx,\ - -I$(SRCDIR)/sfx2/inc \ - -I$(SRCDIR)/sfx2/inc/sfx2 \ - -I$(SRCDIR)/sfx2/source/inc \ - -I$(SRCDIR)/sfx2/inc/pch \ - -I$(WORKDIR)/SdiTarget/sfx2/sdi \ - -I$(WORKDIR)/inc/ \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ - $(LIBXML_CFLAGS) \ -)) - -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ - -DSFX2_DLLIMPLEMENTATION \ - -DABOUTBMPNAMES="$(ABOUTBITMAPS)" \ -)) - -$(eval $(call gb_Library_add_linked_libs,sfx,\ - comphelper \ - cppu \ - cppuhelper \ - fwe \ - i18nisolang1 \ - sal \ - sax \ - sb \ - sot \ - stl \ - svl \ - svt \ - tk \ - tl \ - ucbhelper \ - utl \ - vcl \ - vos3 \ - xml2 \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,sfx,\ - icuuc \ - dl \ - m \ - pthread \ -)) - -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/appl/app \ - sfx2/source/appl/appbas \ - sfx2/source/appl/appbaslib \ - sfx2/source/appl/appcfg \ - sfx2/source/appl/appchild \ - sfx2/source/appl/appdata \ - sfx2/source/appl/appdde \ - sfx2/source/appl/appinit \ - sfx2/source/appl/appmain \ - sfx2/source/appl/appmisc \ - sfx2/source/appl/appopen \ - sfx2/source/appl/appquit \ - sfx2/source/appl/appreg \ - sfx2/source/appl/appserv \ - sfx2/source/appl/appuno \ - sfx2/source/appl/childwin \ - sfx2/source/appl/fileobj \ - sfx2/source/appl/fwkhelper \ - sfx2/source/appl/helpdispatch \ - sfx2/source/appl/helpinterceptor \ - sfx2/source/appl/imagemgr \ - sfx2/source/appl/imestatuswindow \ - sfx2/source/appl/impldde \ - sfx2/source/appl/linkmgr2 \ - sfx2/source/appl/linksrc \ - sfx2/source/appl/lnkbase2 \ - sfx2/source/appl/module \ - sfx2/source/appl/newhelp \ - sfx2/source/appl/opengrf \ - sfx2/source/appl/sfxdll \ - sfx2/source/appl/sfxhelp \ - sfx2/source/appl/sfxpicklist \ - sfx2/source/appl/shutdownicon \ - sfx2/source/appl/shutdowniconw32 \ - sfx2/source/appl/workwin \ - sfx2/source/appl/xpackcreator \ - sfx2/source/bastyp/bitset \ - sfx2/source/bastyp/fltfnc \ - sfx2/source/bastyp/fltlst \ - sfx2/source/bastyp/frmhtml \ - sfx2/source/bastyp/frmhtmlw \ - sfx2/source/bastyp/helper \ - sfx2/source/bastyp/mieclip \ - sfx2/source/bastyp/minarray \ - sfx2/source/bastyp/misc \ - sfx2/source/bastyp/progress \ - sfx2/source/bastyp/sfxhtml \ - sfx2/source/bastyp/sfxresid \ - sfx2/source/config/evntconf \ - sfx2/source/control/bindings \ - sfx2/source/control/ctrlitem \ - sfx2/source/control/dispatch \ - sfx2/source/control/macrconf \ - sfx2/source/control/macro \ - sfx2/source/control/minfitem \ - sfx2/source/control/msg \ - sfx2/source/control/msgpool \ - sfx2/source/control/objface \ - sfx2/source/control/querystatus \ - sfx2/source/control/request \ - sfx2/source/control/sfxstatuslistener \ - sfx2/source/control/shell \ - sfx2/source/control/sorgitm \ - sfx2/source/control/statcach \ - sfx2/source/control/unoctitm \ - sfx2/source/dialog/about \ - sfx2/source/dialog/alienwarn \ - sfx2/source/dialog/basedlgs \ - sfx2/source/dialog/dinfdlg \ - sfx2/source/dialog/dinfedt \ - sfx2/source/dialog/dockwin \ - sfx2/source/dialog/filedlghelper \ - sfx2/source/dialog/filtergrouping \ - sfx2/source/dialog/intro \ - sfx2/source/dialog/itemconnect \ - sfx2/source/dialog/mailmodel \ - sfx2/source/dialog/mgetempl \ - sfx2/source/dialog/navigat \ - sfx2/source/dialog/newstyle \ - sfx2/source/dialog/partwnd \ - sfx2/source/dialog/passwd \ - sfx2/source/dialog/printopt \ - sfx2/source/dialog/recfloat \ - sfx2/source/dialog/sfxdlg \ - sfx2/source/dialog/sfxurl \ - sfx2/source/dialog/splitwin \ - sfx2/source/dialog/srchdlg \ - sfx2/source/dialog/styfitem \ - sfx2/source/dialog/styledlg \ - sfx2/source/dialog/tabdlg \ - sfx2/source/dialog/templdlg \ - sfx2/source/dialog/tplcitem \ - sfx2/source/dialog/tplpitem \ - sfx2/source/dialog/versdlg \ - sfx2/source/doc/DocumentMetadataAccess \ - sfx2/source/doc/Metadatable \ - sfx2/source/doc/QuerySaveDocument \ - sfx2/source/doc/SfxDocumentMetaData \ - sfx2/source/doc/docfac \ - sfx2/source/doc/docfile \ - sfx2/source/doc/docfilt \ - sfx2/source/doc/docinf \ - sfx2/source/doc/docinsert \ - sfx2/source/doc/docmacromode \ - sfx2/source/doc/docstoragemodifylistener \ - sfx2/source/doc/doctdlg \ - sfx2/source/doc/doctempl \ - sfx2/source/doc/doctemplates \ - sfx2/source/doc/doctemplateslocal \ - sfx2/source/doc/docvor \ - sfx2/source/doc/frmdescr \ - sfx2/source/doc/graphhelp \ - sfx2/source/doc/guisaveas \ - sfx2/source/doc/iframe \ - sfx2/source/doc/new \ - sfx2/source/doc/objcont \ - sfx2/source/doc/objembed \ - sfx2/source/doc/objitem \ - sfx2/source/doc/objmisc \ - sfx2/source/doc/objserv \ - sfx2/source/doc/objstor \ - sfx2/source/doc/objuno \ - sfx2/source/doc/objxtor \ - sfx2/source/doc/oleprops \ - sfx2/source/doc/opostponedtruncationstream \ - sfx2/source/doc/ownsubfilterservice \ - sfx2/source/doc/plugin \ - sfx2/source/doc/printhelper \ - sfx2/source/doc/querytemplate \ - sfx2/source/doc/sfxacldetect \ - sfx2/source/doc/sfxbasemodel \ - sfx2/source/doc/sfxmodelfactory \ - sfx2/source/explorer/nochaos \ - sfx2/source/inet/inettbc \ - sfx2/source/menu/mnuitem \ - sfx2/source/menu/mnumgr \ - sfx2/source/menu/objmnctl \ - sfx2/source/menu/virtmenu \ - sfx2/source/notify/eventsupplier \ - sfx2/source/notify/hintpost \ - sfx2/source/statbar/stbitem \ - sfx2/source/toolbox/imgmgr \ - sfx2/source/toolbox/tbxitem \ - sfx2/source/view/frame \ - sfx2/source/view/frame2 \ - sfx2/source/view/frmload \ - sfx2/source/view/ipclient \ - sfx2/source/view/orgmgr \ - sfx2/source/view/printer \ - sfx2/source/view/sfxbasecontroller \ - sfx2/source/view/userinputinterception \ - sfx2/source/view/viewfac \ - sfx2/source/view/viewfrm \ - sfx2/source/view/viewfrm2 \ - sfx2/source/view/viewprn \ - sfx2/source/view/viewsh \ -)) - -$(eval $(call gb_SdiTarget_SdiTarget,sfx2/sdi/sfxslots,sfx2/sdi/sfx)) - -$(eval $(call gb_SdiTarget_set_include,sfx2/sdi/sfxslots,\ - $$(INCLUDE) \ - -I$(SRCDIR)/sfx2/inc/sfx2 \ - -I$(SRCDIR)/sfx2/inc \ - -I$(SRCDIR)/sfx2/sdi \ -)) - -ifeq ($(OS),$(filter WNT MACOSX,$(OS))) -$(eval $(call gb_Library_set_defs,sfx,\ - $$(DEFS) \ - -DENABLE_QUICKSTART_APPLET \ -)) -endif - -ifeq ($(OS),OS2) -$(eval $(call gb_Library_add_exception_objects,sfx,\ - sfx2/source/appl/shutdowniconOs2.ob \ -)) -endif -ifeq ($(OS),MACOSX) -$(eval $(call gb_Library_add_objcxxobjects,sfx,\ - sfx2/source/appl/shutdowniconaqua \ -)) -$(eval $(call gb_Library_add_linked_libs,sfx,\ - objc \ - Cocoa \ -)) -endif -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,sfx,\ - advapi32 \ - gdi32 \ - kernel32 \ - msvcrt \ - oldnames \ - ole32 \ - shell32 \ - user32 \ - uuid \ - uwinapi \ -)) -endif -# vim: set noet sw=4 ts=4: - diff --git a/sfx2/prj/target_module_sfx2.mk b/sfx2/prj/target_module_sfx2.mk deleted file mode 100644 index 3ec4e606795f..000000000000 --- a/sfx2/prj/target_module_sfx2.mk +++ /dev/null @@ -1,52 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Module_Module,sfx2,\ - $(call gb_AllLangResTarget_get_target,sfx) \ - $(call gb_Library_get_target,sfx) \ - $(call gb_Package_get_target,sfx2_inc) \ - $(call gb_Package_get_target,sfx2_sdi) \ -)) -# $(call gb_Library_get_target,qstart) \ - -$(eval $(call gb_Module_read_includes,sfx2,\ - lib_sfx2 \ - package_inc \ - package_sdi \ - res_sfx2 \ -)) -# lib_qstart \ - -#todo: map file? -#todo: source/appl ohne Optimierung? -#todo: source/control ohne Optimierung? -#todo: source/dialog BUILD_VER_STRING -#todo: source/doc SYSTEM_LIBXML2 -#todo: noopt for acldetect.cxx? -#todo: ENABLE_LAYOUT -#todo: quickstarter -#todo: link against cocoa on Mac diff --git a/sfx2/prj/target_package_inc.mk b/sfx2/prj/target_package_inc.mk deleted file mode 100644 index dd836b286f8b..000000000000 --- a/sfx2/prj/target_package_inc.mk +++ /dev/null @@ -1,154 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,sfx2_inc,$(SRCDIR)/sfx2/inc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/DocumentMetadataAccess.hxx,sfx2/DocumentMetadataAccess.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/Metadatable.hxx,sfx2/Metadatable.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/QuerySaveDocument.hxx,sfx2/QuerySaveDocument.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/XmlIdRegistry.hxx,sfx2/XmlIdRegistry.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/app.hxx,sfx2/app.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/appuno.hxx,sfx2/appuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basedlgs.hxx,sfx2/basedlgs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/basmgr.hxx,sfx2/basmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/bindings.hxx,sfx2/bindings.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/brokenpackageint.hxx,sfx2/brokenpackageint.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/chalign.hxx,sfx2/chalign.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/childwin.hxx,sfx2/childwin.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/cntids.hrc,sfx2/cntids.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/controlwrapper.hxx,sfx2/controlwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ctrlitem.hxx,sfx2/ctrlitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dialogs.hrc,sfx2/dialogs.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfdlg.hxx,sfx2/dinfdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dinfedt.hxx,sfx2/dinfedt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dispatch.hxx,sfx2/dispatch.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dllapi.h,sfx2/dllapi.h)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfac.hxx,sfx2/docfac.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfile.hxx,sfx2/docfile.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docfilt.hxx,sfx2/docfilt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinf.hxx,sfx2/docinf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docinsert.hxx,sfx2/docinsert.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/dockwin.hxx,sfx2/dockwin.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docmacromode.hxx,sfx2/docmacromode.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/docstoragemodifylistener.hxx,sfx2/docstoragemodifylistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctdlg.hxx,sfx2/doctdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/doctempl.hxx,sfx2/doctempl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/event.hxx,sfx2/event.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/evntconf.hxx,sfx2/evntconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/fcontnr.hxx,sfx2/fcontnr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/filedlghelper.hxx,sfx2/filedlghelper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frame.hxx,sfx2/frame.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmdescr.hxx,sfx2/frmdescr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtml.hxx,sfx2/frmhtml.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/frmhtmlw.hxx,sfx2/frmhtmlw.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/genlink.hxx,sfx2/genlink.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/hintpost.hxx,sfx2/hintpost.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imagemgr.hxx,sfx2/imagemgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgdef.hxx,sfx2/imgdef.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/imgmgr.hxx,sfx2/imgmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/ipclient.hxx,sfx2/ipclient.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemconnect.hxx,sfx2/itemconnect.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/itemwrapper.hxx,sfx2/itemwrapper.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-post.hxx,sfx2/layout-post.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-pre.hxx,sfx2/layout-pre.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout-tabdlg.hxx,sfx2/layout-tabdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/layout.hxx,sfx2/layout.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linkmgr.hxx,sfx2/linkmgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/linksrc.hxx,sfx2/linksrc.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/lnkbase.hxx,sfx2/lnkbase.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/macrconf.hxx,sfx2/macrconf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mailmodelapi.hxx,sfx2/mailmodelapi.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mgetempl.hxx,sfx2/mgetempl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mieclip.hxx,sfx2/mieclip.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minarray.hxx,sfx2/minarray.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minfitem.hxx,sfx2/minfitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/minstack.hxx,sfx2/minstack.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnuitem.hxx,sfx2/mnuitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/mnumgr.hxx,sfx2/mnumgr.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/module.hxx,sfx2/module.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msg.hxx,sfx2/msg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/msgpool.hxx,sfx2/msgpool.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/navigat.hxx,sfx2/navigat.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/new.hxx,sfx2/new.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/newstyle.hxx,sfx2/newstyle.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objface.hxx,sfx2/objface.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objitem.hxx,sfx2/objitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/objsh.hxx,sfx2/objsh.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/opengrf.hxx,sfx2/opengrf.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/passwd.hxx,sfx2/passwd.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printer.hxx,sfx2/printer.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/printopt.hxx,sfx2/printopt.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/prnmon.hxx,sfx2/prnmon.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/progress.hxx,sfx2/progress.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/querystatus.hxx,sfx2/querystatus.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/request.hxx,sfx2/request.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfx.hrc,sfx2/sfx.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasecontroller.hxx,sfx2/sfxbasecontroller.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxbasemodel.hxx,sfx2/sfxbasemodel.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdefs.hxx,sfx2/sfxdefs.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxdlg.hxx,sfx2/sfxdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhelp.hxx,sfx2/sfxhelp.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxhtml.hxx,sfx2/sfxhtml.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxmodelfactory.hxx,sfx2/sfxmodelfactory.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxresid.hxx,sfx2/sfxresid.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxsids.hrc,sfx2/sfxsids.hrc)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxstatuslistener.hxx,sfx2/sfxstatuslistener.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/sfxuno.hxx,sfx2/sfxuno.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/shell.hxx,sfx2/shell.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/signaturestate.hxx,sfx2/signaturestate.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/stbitem.hxx,sfx2/stbitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styfitem.hxx,sfx2/styfitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/styledlg.hxx,sfx2/styledlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tabdlg.hxx,sfx2/tabdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tbxctrl.hxx,sfx2/tbxctrl.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/templdlg.hxx,sfx2/templdlg.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/tplpitem.hxx,sfx2/tplpitem.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/unoctitm.hxx,sfx2/unoctitm.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/userinputinterception.hxx,sfx2/userinputinterception.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfac.hxx,sfx2/viewfac.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewfrm.hxx,sfx2/viewfrm.hxx)) -$(eval $(call gb_Package_add_file,sfx2_inc,inc/sfx2/viewsh.hxx,sfx2/viewsh.hxx)) - - - - - - - - - - - - - - - - - - - - diff --git a/sfx2/prj/target_package_sdi.mk b/sfx2/prj/target_package_sdi.mk deleted file mode 100644 index 63f2138adf4f..000000000000 --- a/sfx2/prj/target_package_sdi.mk +++ /dev/null @@ -1,30 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_Package_Package,sfx2_sdi,$(SRCDIR)/sfx2/sdi)) -$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfx.sdi,sfx.sdi)) -$(eval $(call gb_Package_add_file,sfx2_sdi,inc/sfx2/sfxitems.sdi,sfxitems.sdi)) diff --git a/sfx2/prj/target_res_sfx2.mk b/sfx2/prj/target_res_sfx2.mk deleted file mode 100644 index b51079559e82..000000000000 --- a/sfx2/prj/target_res_sfx2.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2009 by Sun Microsystems, Inc. -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,sfx)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,sfx,sfx2)) - -$(eval $(call gb_AllLangResTarget_add_srs,sfx,\ - sfx/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,sfx/res)) - -$(eval $(call gb_SrsTarget_set_include,sfx/res,\ - $$(INCLUDE) \ - -I$(OUTDIR)/inc \ - -I$(WORKDIR)/inc \ - -I$(SRCDIR)/sfx2/source/dialog \ - -I$(SRCDIR)/sfx2/source/inc \ - -I$(SRCDIR)/sfx2/inc/ \ - -I$(SRCDIR)/sfx2/inc/sfx \ -)) - -$(eval $(call gb_SrsTarget_add_files,sfx/res,\ - sfx2/source/appl/app.src \ - sfx2/source/appl/newhelp.src \ - sfx2/source/appl/dde.src \ - sfx2/source/appl/sfx.src \ - sfx2/source/doc/doc.src \ - sfx2/source/doc/new.src \ - sfx2/source/doc/doctdlg.src \ - sfx2/source/doc/doctempl.src \ - sfx2/source/doc/graphhelp.src \ - sfx2/source/menu/menu.src \ - sfx2/source/view/view.src \ - sfx2/source/dialog/alienwarn.src \ - sfx2/source/dialog/dialog.src \ - sfx2/source/dialog/dinfdlg.src \ - sfx2/source/dialog/dinfedt.src \ - sfx2/source/dialog/filedlghelper.src \ - sfx2/source/dialog/mailwindow.src \ - sfx2/source/dialog/mgetempl.src \ - sfx2/source/dialog/newstyle.src \ - sfx2/source/dialog/passwd.src \ - sfx2/source/dialog/printopt.src \ - sfx2/source/dialog/recfloat.src \ - sfx2/source/dialog/srchdlg.src \ - sfx2/source/dialog/templdlg.src \ - sfx2/source/dialog/versdlg.src \ - sfx2/source/bastyp/bastyp.src \ - sfx2/source/bastyp/fltfnc.src \ -)) - - -- cgit From aba206910970f804423bebb27a07c47004e9a127 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 02:05:52 +0200 Subject: CWS gnumake2: reaching through verbosity and max processes --- sfx2/prj/makefile.mk | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index 2a0b99e72fd5..967bfea90d3c 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -1,2 +1,35 @@ +#************************************************************************* +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +.IF $(VERBOSE) +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + all: - cd .. && make -srj9 + @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 5a55565739b5a13d395c690b871d108d11f419cd Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Thu, 1 Jul 2010 13:19:11 +0200 Subject: sb123:#i111449# cleanups in build.lst for qa/complex tests --- sfx2/prj/build.lst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index fdc2999a781e..3a99e7fae347 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -25,5 +25,6 @@ sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_util NULL +sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL +sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit From b7c1a7a78bcf1c1824e893e2b4f4620def043c9c Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Fri, 23 Jul 2010 12:20:26 +0200 Subject: sb123:#i111449# fix all run through problems for qa/complex tests --- sfx2/prj/build.lst | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 3a99e7fae347..7d2b52e3a9e7 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -24,7 +24,10 @@ sf sfx2\util sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL -sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL -sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL +# fails on unxsoli4 +# sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL + +# subdir has to remove +# sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL +# sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit From 9899711e43c99d81b9472c61c1190ab57230371d Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 27 Jul 2010 14:23:19 +0200 Subject: sb123: #i111449# disabled sfx2/qa/complex/docinfo again for now --- sfx2/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 7d2b52e3a9e7..d2964afdc3ee 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -30,4 +30,4 @@ sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL # subdir has to remove # sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL # sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL -sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL +# sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit From b5ff94fde0cc506d9c3c17c2762101a0c7a657e4 Mon Sep 17 00:00:00 2001 From: Lars Langhans Date: Mon, 23 Aug 2010 10:38:44 +0200 Subject: sb123:#i111449# remove all subdirs in complex tests --- sfx2/prj/build.lst | 2 -- 1 file changed, 2 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index d2964afdc3ee..1e471312c6cf 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -27,7 +27,5 @@ sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -# subdir has to remove -# sf sfx2\qa\complex\framework\DocHelper nmake - all sf_qa_complex_framework_dochelper sf_util NULL # sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL # sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit From 6c520fd3411696ca2c46e9687d1cce33b34af935 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Thu, 8 Jul 2010 13:58:34 +0200 Subject: CWS gnumake2: using gnu make directly from build.pl --- sfx2/prj/build.lst | 23 ++--------------------- sfx2/prj/gbuild.lst | 4 ---- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 sfx2/prj/gbuild.lst (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 89e618e8fc12..7dc2a95cb994 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,23 +1,4 @@ sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\win\res get - all sf_wres NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL +sf sfx2\prj nmake - all sf_prj NULL + diff --git a/sfx2/prj/gbuild.lst b/sfx2/prj/gbuild.lst deleted file mode 100644 index 7dc2a95cb994..000000000000 --- a/sfx2/prj/gbuild.lst +++ /dev/null @@ -1,4 +0,0 @@ -sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL -sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\prj nmake - all sf_prj NULL - -- cgit From 17381ec4f0f9aa1b0283ff3096e15bac86413c4d Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 20 Jul 2010 16:48:23 +0200 Subject: CWS gnumake2: using GNUMAKE variable from configure --- sfx2/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index 967bfea90d3c..8b00cb5a5818 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -32,4 +32,4 @@ VERBOSEFLAG := -s .ENDIF all: - @cd .. && make $(VERBOSEFLAG) -r -j$(MAXPROCESS) + @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From e401e6846b174c3f5deda3b3e19d89de2e4ac78a Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 23 Jul 2010 12:48:45 +0200 Subject: gnumake2: some more checks for module makefiles --- sfx2/prj/makefile.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index 8b00cb5a5818..3b1b54d4357f 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -25,11 +25,16 @@ # #************************************************************************* -.IF $(VERBOSE) +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" VERBOSEFLAG := .ELSE VERBOSEFLAG := -s .ENDIF all: - @cd .. && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 9551bf5a1ee5c9275a26f8ec4021e0b7f5665176 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 10 Sep 2010 13:10:07 +0200 Subject: sb129: #i113189# change UNO components to use passive registration --- sfx2/prj/d.lst | 1 + 1 file changed, 1 insertion(+) (limited to 'sfx2/prj') diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 0748aa19cd65..0768000425eb 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -44,3 +44,4 @@ mkdir: %_DEST%\inc%_EXT%\sfx2 ..\inc\mailmodelapi.hxx %_DEST%\inc%_EXT%\sfx2\mailmodelapi.hxx ..\inc\docinsert.hxx %_DEST%\inc%_EXT%\sfx2\docinsert.hxx +..\%__SRC%\misc\sfx.component %_DEST%\xml%_EXT%\sfx.component -- cgit From eed23e3d2da3fe09c121723b07e089c680caffaa Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 14 Oct 2010 16:40:31 +0200 Subject: undoapi: sfx2/qa: fixed some NetBeans 6.9 warnings, removed some dead files, refactored for easier usage --- sfx2/prj/build.lst | 57 +++++++++++++++++++++++++----------------------------- 1 file changed, 26 insertions(+), 31 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 1e471312c6cf..f8e01c7bcf05 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,31 +1,26 @@ -sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL -sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\workben\custompanel nmake - all sf_wb_custompanel NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL - -# fails on unxsoli4 -# sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL - -# sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL -# sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL +sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 test NULL +sf sfx2 usr1 - all sf_mkout NULL +sf sfx2\inc nmake - all sf_inc NULL +sf sfx2\prj get - all sf_prj NULL +sf sfx2\mac\res get - all sf_mres NULL +sf sfx2\source\inc get - all sf_sinc NULL +sf sfx2\sdi nmake - all sf_sdi NULL +sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL +sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL +sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL +sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL +sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL +sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL +sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL +sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL +sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL +sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL +sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL +sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL +sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL +sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL +sf sfx2\workben\custompanel nmake - all sf_wb_custompanel NULL +sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL +sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL +sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL +sf sfx2\qa\complex\sfx2 nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit From 1885dddbdd2382f95aef15df15d4cd110f8d7854 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 22 Oct 2010 10:37:46 +0200 Subject: sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt --- sfx2/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 1e471312c6cf..e75b328c5930 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,4 +1,4 @@ -sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL +sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL sf sfx2 usr1 - all sf_mkout NULL sf sfx2\inc nmake - all sf_inc NULL sf sfx2\prj get - all sf_prj NULL -- cgit From 4f40fd2727a826d5d0b06617e5179829d66df5d2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 29 Oct 2010 15:36:30 +0200 Subject: CWS gnumake2: resolve conflicts and make sources buildable on Linux --- sfx2/prj/build.lst | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index d3f687fbc4af..85763aab9258 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,38 +1,11 @@ sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL sf sfx2 usr1 - all sf_mkout NULL -<<<<<<< local sf sfx2\prj nmake - all sf_prj NULL -======= -sf sfx2\inc nmake - all sf_inc NULL -sf sfx2\prj get - all sf_prj NULL -sf sfx2\mac\res get - all sf_mres NULL -sf sfx2\source\inc get - all sf_sinc NULL -sf sfx2\sdi nmake - all sf_sdi NULL -sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL -sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL -sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL -sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL -sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL -sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL -sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL -sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL -sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL -sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL -sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL -sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL -sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL -sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL -sf sfx2\workben\custompanel nmake - all sf_wb_custompanel NULL -sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit sf_util NULL ->>>>>>> other -<<<<<<< local -======= + # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL # sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL # sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL ->>>>>>> other + -- cgit From 534546649af815f149a3b03abdd46a50091b8477 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 10 Nov 2010 15:26:03 +0100 Subject: gnumake2: first try at local build dirs --- sfx2/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index 3b1b54d4357f..3d495209d74a 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install -- cgit From e8ff22fc99a7807455041f731cd337215a667c7f Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 19 Nov 2010 11:47:42 +0100 Subject: gnumake2: clean up d.lst of switched modules; fix svl/Package_inc.mk --- sfx2/prj/d.lst | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 50a7f6134f67..e69de29bb2d1 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -1,33 +0,0 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% -mkdir: %_DEST%\inc%_EXT%\sfx2 - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib -..\%__SRC%\slb\sfx.lib %_DEST%\lib%_EXT%\xsfx.lib -..\%__SRC%\lib\isfx.lib %_DEST%\lib%_EXT%\isfx.lib -..\%__SRC%\lib\debug.lib %_DEST%\lib%_EXT%\sfxdebug.lib -..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym -..\%__SRC%\bin\sfx?????.dll %_DEST%\bin%_EXT%\sfx?????.dll -..\%__SRC%\bin\sfx*.res %_DEST%\bin%_EXT%\sfx*.res -..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym -..\%__SRC%\misc\sfx?????.map %_DEST%\bin%_EXT%\sfx?????.map -..\%__SRC%\bin\elc?????.dll %_DEST%\bin%_EXT%\elc?????.dll -..\%__SRC%\srs\sfx.srs %_DEST%\res%_EXT%\sfx.srs -..\%COMMON_OUTDIR%\srs\sfx_srs.hid %COMMON_DEST%\res%_EXT%\sfx_srs.hid -..\%__SRC%\srs\sfxslots.srs %_DEST%\res%_EXT%\sfxslots.srs -..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid -..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml -..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv - -..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h -..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx -..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc - -..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi -..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi - -..\%__SRC%\misc\sfx.component %_DEST%\xml%_EXT%\sfx.component -- cgit From 892e4b46d856af0bdc7d065ac22b7f21e2a97cb1 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Mon, 22 Nov 2010 13:40:19 +0100 Subject: gnumake2: getting rid of obsolete install and uninstall targets --- sfx2/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index 3d495209d74a..3b1b54d4357f 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) install + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) -- cgit From 4791068063b3fa2ce656e09b106cc9ee2c927ca1 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Tue, 23 Nov 2010 14:24:46 +0100 Subject: gnumake2: enable packmodule in setsolar mws builds --- sfx2/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index 3b1b54d4357f..c73a3d944bbf 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) -- cgit From 67668c8264a7b0f7b699534b4ab9046812d2c3da Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Thu, 23 Dec 2010 11:34:45 +0100 Subject: undoapi: re-did the CWS'es changes in the new build system --- sfx2/prj/build.lst | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 56d3917be93a..effb93864c92 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,10 +1,3 @@ -sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL +sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt test NULL sf sfx2 usr1 - all sf_mkout NULL sf sfx2\prj nmake - all sf_prj NULL - - -# fails on unxsoli4 -# sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL - -# sf sfx2\qa\complex\framework nmake - all sf_qa_complex_framework sf_qa_complex_framework_dochelper NULL -# sf sfx2\qa\complex\docinfo nmake - all sf_qa_complex_docinfo sf_util NULL -- cgit From a1ea9395421c26d0e10a78348724c0066edb3318 Mon Sep 17 00:00:00 2001 From: sb Date: Wed, 5 Jan 2011 10:15:25 +0100 Subject: sb135: recreated tests that had erroneously been deleted by CWS gnumake2 --- sfx2/prj/build.lst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index f8fddef145a6..76f87fa844c8 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,7 +1,8 @@ sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL sf sfx2 usr1 - all sf_mkout NULL sf sfx2\prj nmake - all sf_prj NULL - +sf sfx2\qa\cppunit nmake - all sf_qa_cppunit NULL +sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -- cgit From 6797ce4a0ee33c311885b55d73747575639a1055 Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Mon, 10 Jan 2011 12:50:14 +0100 Subject: undoapi: re-enabled the complex test cases in sfx2, using the old build system for the moment, until the new system has JUnit support --- sfx2/prj/build.lst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index db451d58a59f..a352d08beab8 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,5 +1,6 @@ -sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt test NULL -sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\prj nmake - all sf_prj NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL +sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt test NULL +sf sfx2 usr1 - all sf_mkout NULL +sf sfx2\prj nmake - all sf_prj NULL +sf sfx2\qa\cppunit nmake - all sf_qa_cppunit NULL +sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL +sf sfx2\qa\complex\sfx2 nmake - all sf_qa_complex NULL -- cgit From d1d8b2619b4ddd60fdb658240e48fa223d5b53ae Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 31 Jan 2011 14:12:13 +0100 Subject: CWS gnumake3: workaround for cygwin coredump; don't create deliverlog in parallel --- sfx2/prj/makefile.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/makefile.mk b/sfx2/prj/makefile.mk index c73a3d944bbf..e312a7ccab65 100644 --- a/sfx2/prj/makefile.mk +++ b/sfx2/prj/makefile.mk @@ -37,4 +37,4 @@ VERBOSEFLAG := -s .ENDIF all: - cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog -- cgit From d171285f3780a4b1b1e0cad4b40b8b9bc52b62f9 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 1 Feb 2011 19:21:09 +0100 Subject: gnumake3: remove dmake files for tests in converted modules --- sfx2/prj/build.lst | 3 --- 1 file changed, 3 deletions(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 76f87fa844c8..bc82cc405fc5 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,8 +1,5 @@ sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL -sf sfx2 usr1 - all sf_mkout NULL sf sfx2\prj nmake - all sf_prj NULL -sf sfx2\qa\cppunit nmake - all sf_qa_cppunit NULL -sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL # fails on unxsoli4 # sf sfx2\qa\complex\standalonedocumentinfo nmake - all sf_qa_complex_standalonedocumentinfo sf_util NULL -- cgit From a1a2a5a68046e75aba3dfd6ba06083a314f12182 Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Wed, 2 Feb 2011 11:16:02 +0100 Subject: #i10000# temporarily disable test --- sfx2/prj/build.lst | 1 - 1 file changed, 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index a352d08beab8..dc0b094ac4fb 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -3,4 +3,3 @@ sf sfx2 usr1 - all sf_mkout NULL sf sfx2\prj nmake - all sf_prj NULL sf sfx2\qa\cppunit nmake - all sf_qa_cppunit NULL sf sfx2\qa\unoapi nmake - all sf_qa_unoapi NULL -sf sfx2\qa\complex\sfx2 nmake - all sf_qa_complex NULL -- cgit From 4fba42e5f98fcc0fa9addf41a793c1d7f11602c8 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 22 Feb 2011 19:07:34 +0100 Subject: masterfix DEV300: #i10000# usage of L10N build_type --- sfx2/prj/build.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/prj') diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index ca582c0aaf12..f25e991f84f4 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,3 +1,3 @@ -sf sfx2 : l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL +sf sfx2 : L10N:l10n idl basic xmlscript framework readlicense_oo shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 LIBXSLT:libxslt NULL sf sfx2\prj nmake - all sf_prj NULL -- cgit