diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2011-07-31 16:53:30 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2011-08-08 23:48:43 +0200 |
commit | c39a2440ea2cce75154fea544ace879c25c7e5aa (patch) | |
tree | 9d2ce52daf9a02b542c5800b2af0ac3510fb02f8 | |
parent | Nah, we cannot build binaryurp_cppunittester_all (for iOS) here (diff) | |
download | core-c39a2440ea2cce75154fea544ace879c25c7e5aa.tar.gz core-c39a2440ea2cce75154fea544ace879c25c7e5aa.zip |
convert dtrans to gbuilb
-rw-r--r-- | Repository.mk | 10 | ||||
-rw-r--r-- | RepositoryModule_ooo.mk | 1 | ||||
-rw-r--r-- | dtrans/Library_dnd.mk | 74 | ||||
-rw-r--r-- | dtrans/Library_dtrans.mk (renamed from dtrans/source/win32/dnd/makefile.mk) | 53 | ||||
-rw-r--r-- | dtrans/Library_ftransl.mk (renamed from dtrans/source/win32/clipb/makefile.mk) | 57 | ||||
-rw-r--r-- | dtrans/Library_mcnttype.mk (renamed from dtrans/source/win32/misc/makefile.mk) | 58 | ||||
-rw-r--r-- | dtrans/Library_sysdtrans.mk | 81 | ||||
-rw-r--r-- | dtrans/Makefile (renamed from dtrans/source/win32/mtaole/makefile.mk) | 37 | ||||
-rw-r--r-- | dtrans/Module_dtrans.mk (renamed from dtrans/source/win32/ftransl/makefile.mk) | 39 | ||||
-rw-r--r-- | dtrans/Package_xml.mk (renamed from dtrans/source/cnttype/makefile.mk) | 36 | ||||
-rw-r--r-- | dtrans/StaticLibrary_dtobj.mk | 51 | ||||
-rw-r--r-- | dtrans/prj/build.lst | 15 | ||||
-rw-r--r-- | dtrans/prj/d.lst | 14 | ||||
-rw-r--r-- | dtrans/prj/makefile.mk (renamed from dtrans/inc/makefile.mk) | 29 | ||||
-rw-r--r-- | dtrans/source/cnttype/exports.dxp | 1 | ||||
-rw-r--r-- | dtrans/source/generic/exports.dxp | 1 | ||||
-rw-r--r-- | dtrans/source/generic/makefile.mk | 75 | ||||
-rw-r--r-- | dtrans/source/win32/clipb/exports.dxp | 1 | ||||
-rw-r--r-- | dtrans/source/win32/dnd/exports.dxp | 1 | ||||
-rw-r--r-- | dtrans/source/win32/dtobj/makefile.mk | 76 | ||||
-rw-r--r-- | dtrans/source/win32/ftransl/exports.dxp | 1 | ||||
-rw-r--r-- | dtrans/util/exports.dxp | 1 | ||||
-rw-r--r-- | dtrans/util/makefile.mk | 190 | ||||
-rw-r--r-- | postprocess/packcomponents/makefile.mk | 10 |
24 files changed, 358 insertions, 554 deletions
diff --git a/Repository.mk b/Repository.mk index 590fd7ff6f33..fd4962871e8a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -149,10 +149,20 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + mcnttype \ test \ fileacc \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + dnd \ + dtrans \ + ftransl \ + sysdtrans \ +)) +endif + ifeq ($(OS),IOS) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ sal_textenc \ diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk index e8b5533e26bf..60c14d92a0d2 100644 --- a/RepositoryModule_ooo.mk +++ b/RepositoryModule_ooo.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ cui \ dbaccess \ drawinglayer \ + dtrans \ editeng \ fileaccess \ forms \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk new file mode 100644 index 000000000000..68ce8c63ed85 --- /dev/null +++ b/dtrans/Library_dnd.mk @@ -0,0 +1,74 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,dnd)) + +$(eval $(call gb_Library_add_precompiled_header,dnd,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) + +$(eval $(call gb_Library_set_componentfile,dnd,dtrans/util/dnd)) + +$(eval $(call gb_Library_set_include,dnd,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dtrans/inc/pch) \ +)) + +$(eval $(call gb_Library_add_api,dnd,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,dnd,\ + advapi32 \ + cppu \ + cppuhelper \ + gdi32 \ + ole32 \ + oleaut32 \ + sal \ + shell32 \ + uuid \ + uwinapi \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_linked_static_libs,dnd,\ + dtobj \ +)) + +$(eval $(call gb_Library_add_exception_objects,dnd,\ + dtrans/source/win32/dnd/dndentry \ + dtrans/source/win32/dnd/globals \ + dtrans/source/win32/dnd/idroptarget \ + dtrans/source/win32/dnd/sourcecontext \ + dtrans/source/win32/dnd/source \ + dtrans/source/win32/dnd/target \ + dtrans/source/win32/dnd/targetdragcontext \ + dtrans/source/win32/dnd/targetdropcontext \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/dnd/makefile.mk b/dtrans/Library_dtrans.mk index 4dda72007d15..e409227fca8b 100644 --- a/dtrans/source/win32/dnd/makefile.mk +++ b/dtrans/Library_dtrans.mk @@ -1,8 +1,9 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,35 +26,33 @@ # #************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=dtrans -TARGET=dnd -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) -USE_BOUNDCHK= - -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF +$(eval $(call gb_Library_Library,dtrans)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_Library_add_precompiled_header,dtrans,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) -.INCLUDE : settings.mk +$(eval $(call gb_Library_set_componentfile,dtrans,dtrans/source/generic/dtrans)) -# ------------------------------------------------------------------ +$(eval $(call gb_Library_set_include,dtrans,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dtrans/inc/pch) \ +)) -SLOFILES= $(SLO)$/dndentry.obj \ - $(SLO)$/target.obj \ - $(SLO)$/idroptarget.obj \ - $(SLO)$/source.obj \ - $(SLO)$/globals.obj \ - $(SLO)$/targetdropcontext.obj \ - $(SLO)$/targetdragcontext.obj \ - $(SLO)$/sourcecontext.obj +$(eval $(call gb_Library_add_api,dtrans,\ + udkapi \ + offapi \ +)) +$(eval $(call gb_Library_add_linked_libs,dtrans,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) -# --- Targets ------------------------------------------------------ +$(eval $(call gb_Library_add_exception_objects,dtrans,\ + dtrans/source/generic/clipboardmanager \ + dtrans/source/generic/dtrans \ + dtrans/source/generic/generic_clipboard \ +)) -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/clipb/makefile.mk b/dtrans/Library_ftransl.mk index 28f426d9296e..b9502b52d633 100644 --- a/dtrans/source/win32/clipb/makefile.mk +++ b/dtrans/Library_ftransl.mk @@ -1,8 +1,9 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,35 +26,37 @@ # #************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=dtrans -TARGET=sysdtrans -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) -USE_BOUNDCHK= - -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF - -# --- Settings ----------------------------------------------------- +$(eval $(call gb_Library_Library,ftransl)) -.INCLUDE : settings.mk +$(eval $(call gb_Library_add_precompiled_header,ftransl,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) -# ------------------------------------------------------------------ +$(eval $(call gb_Library_set_componentfile,ftransl,dtrans/util/ftransl)) -.IF "$(COM)" != "GCC" -CFLAGS+=-GR -.ENDIF -CFLAGS+=-DUNICODE -D_UNICODE +$(eval $(call gb_Library_set_include,ftransl,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dtrans/inc/pch) \ +)) -SLOFILES=$(SLO)$/WinClipboard.obj \ - $(SLO)$/WinClipbImpl.obj \ - $(SLO)$/wcbentry.obj +$(eval $(call gb_Library_add_api,ftransl,\ + udkapi \ + offapi \ +)) +$(eval $(call gb_Library_add_linked_libs,ftransl,\ + advapi32 \ + cppu \ + cppuhelper \ + gdi32 \ + ole32 \ + sal \ + uwinapi \ + $(gb_STDLIBS) \ +)) -# --- Targets ------------------------------------------------------ +$(eval $(call gb_Library_add_exception_objects,ftransl,\ + dtrans/source/win32/misc/ImplHelper \ + dtrans/source/win32/ftransl/ftransl \ + dtrans/source/win32/ftransl/ftranslentry \ +)) -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/misc/makefile.mk b/dtrans/Library_mcnttype.mk index 6e9ebb82ece1..0ada8504f1e3 100644 --- a/dtrans/source/win32/misc/makefile.mk +++ b/dtrans/Library_mcnttype.mk @@ -1,8 +1,9 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,36 +26,39 @@ # #************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=dtrans -TARGET=dtutils -LIBTARGET=NO -USE_BOUNDCHK= -ENABLE_EXCEPTIONS=YES - -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF - -# --- Settings ----------------------------- - -.INCLUDE : settings.mk +$(eval $(call gb_Library_Library,mcnttype)) -#------------------------------------------- -# files to compile to obj's +$(eval $(call gb_Library_add_precompiled_header,mcnttype,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) -SLOFILES= $(SLO)$/ImplHelper.obj +$(eval $(call gb_Library_set_componentfile,mcnttype,dtrans/util/mcnttype)) -#------------------------------------------- -# build a static library +$(eval $(call gb_Library_set_include,mcnttype,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dtrans/inc/pch) \ +)) -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) +$(eval $(call gb_Library_add_api,mcnttype,\ + udkapi \ + offapi \ +)) +$(eval $(call gb_Library_add_linked_libs,mcnttype,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) -# --- Targets ------------------------------ +$(eval $(call gb_Library_add_exception_objects,mcnttype,\ + dtrans/source/cnttype/mcnttfactory \ + dtrans/source/cnttype/mcnttype \ + dtrans/source/cnttype/mctfentry \ +)) -.INCLUDE : target.mk +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_linked_libs,mcnttype,\ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk new file mode 100644 index 000000000000..bb3b15bae0bb --- /dev/null +++ b/dtrans/Library_sysdtrans.mk @@ -0,0 +1,81 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,sysdtrans)) + +$(eval $(call gb_Library_add_precompiled_header,sysdtrans,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) + +$(eval $(call gb_Library_set_componentfile,sysdtrans,dtrans/util/sysdtrans)) + +$(eval $(call gb_Library_set_include,sysdtrans,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dtrans/inc/pch) \ +)) + +$(eval $(call gb_Library_add_api,sysdtrans,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_defs,sysdtrans,\ + -D_UNICODE \ + -DUNICODE \ +)) + +$(eval $(call gb_Library_add_linked_libs,sysdtrans,\ + advapi32 \ + cppu \ + cppuhelper \ + gdi32 \ + ole32 \ + oleaut32 \ + sal \ + shell32 \ + uuid \ + uwinapi \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_linked_static_libs,sysdtrans,\ + dtobj \ +)) + +$(eval $(call gb_Library_add_exception_objects,sysdtrans,\ + dtrans/source/win32/clipb/WinClipbImpl \ + dtrans/source/win32/clipb/WinClipboard \ + dtrans/source/win32/clipb/wcbentry \ + dtrans/source/win32/mtaole/MtaOleClipb \ +)) + +ifeq ($(COM),GCC) +$(eval $(call gb_Library_add_exception_objects,sysdtrans,\ + source/win32/dtobj/XNotifyingDataObject \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/mtaole/makefile.mk b/dtrans/Makefile index 3316f1a190fe..a1b344d72564 100644 --- a/dtrans/source/win32/mtaole/makefile.mk +++ b/dtrans/Makefile @@ -1,8 +1,9 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,30 +26,14 @@ # #************************************************************************* -PRJ=..$/..$/.. -PRJNAME=dtrans -TARGET=mtaolecb -LIBTARGET=NO -ENABLE_EXCEPTIONS=YES - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Targets ---------------------------------- - -.IF "$(GUI)"=="WNT" - -# --- static lib -------------------------- - -# don't do this in the source file. breaks pch -CDEFS+=-DUNICODE +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -SLOFILES=$(SLO)$/MtaOleClipb.obj +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -.ENDIF +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/ftransl/makefile.mk b/dtrans/Module_dtrans.mk index bc6294a90f93..0900e6bb24ae 100644 --- a/dtrans/source/win32/ftransl/makefile.mk +++ b/dtrans/Module_dtrans.mk @@ -1,8 +1,9 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,27 +26,19 @@ # #************************************************************************* -PRJ=..$/..$/.. -PRJNAME=dtrans -TARGET=ftransl -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) -USE_BOUNDCHK= - -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ +$(eval $(call gb_Module_Module,dtrans)) -SLOFILES=$(SLO)$/ftranslentry.obj \ - $(SLO)$/ftransl.obj +$(eval $(call gb_Module_add_targets,dtrans,\ + Library_mcnttype \ +)) -# --- Targets ------------------------------------------------------ +ifeq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,dtrans,\ + Library_dnd \ + Library_dtrans \ + Library_ftransl \ + Library_sysdtrans \ +)) +endif -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/cnttype/makefile.mk b/dtrans/Package_xml.mk index d99b8d4c9ac6..acf6b5093f2d 100644 --- a/dtrans/source/cnttype/makefile.mk +++ b/dtrans/Package_xml.mk @@ -1,8 +1,9 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,29 +26,12 @@ # #************************************************************************* -PRJ=..$/.. - -PRJNAME=dtrans -TARGET=mcnttype -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) -USE_BOUNDCHK= - -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES=$(SLO)$/mctfentry.obj \ - $(SLO)$/mcnttfactory.obj \ - $(SLO)$/mcnttype.obj +$(eval $(call gb_Package_Package,dtrans_xml,$(SRCDIR)/dtrans/source)) -# --- Targets ------------------------------------------------------ +$(eval $(call gb_Package_add_file,dtrans_xml,xml/dnd.xml,win32/dnd/dnd.xml)) +$(eval $(call gb_Package_add_file,dtrans_xml,xml/dtrans.xml,generic/dtrans.xml)) +$(eval $(call gb_Package_add_file,dtrans_xml,xml/ftransl.xml,win32/ftransl/ftransl.xml)) +$(eval $(call gb_Package_add_file,dtrans_xml,xml/mcnttype.xml,cnttype/mcnttype.xml)) +$(eval $(call gb_Package_add_file,dtrans_xml,xml/sysdtrans.xml,win32/clipb/sysdtrans.xml)) -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk new file mode 100644 index 000000000000..a10daee9de35 --- /dev/null +++ b/dtrans/StaticLibrary_dtobj.mk @@ -0,0 +1,51 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_StaticLibrary_StaticLibrary,dtobj)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\ + dtrans/source/win32/dtobj/APNDataObject \ + dtrans/source/win32/dtobj/DataFmtTransl \ + dtrans/source/win32/dtobj/DOTransferable \ + dtrans/source/win32/dtobj/DtObjFactory \ + dtrans/source/win32/dtobj/DTransHelper \ + dtrans/source/win32/dtobj/Fetc \ + dtrans/source/win32/dtobj/FetcList \ + dtrans/source/win32/dtobj/FmtFilter \ + dtrans/source/win32/dtobj/TxtCnvtHlp \ + dtrans/source/win32/dtobj/XTDataObject \ + dtrans/source/win32/misc/ImplHelper \ +)) + +ifneq ($(COM),GCC) +$(eval $(call gb_StaticLibrary_add_exception_objects,dtobj,\ + source/win32/dtobj/XNotifyingDataObject \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst index 519e1fda37c8..61443afa2a19 100644 --- a/dtrans/prj/build.lst +++ b/dtrans/prj/build.lst @@ -1,15 +1,2 @@ dr dtrans : unotools offapi DESKTOP:rdbmaker stoc LIBXSLT:libxslt NULL -dr dtrans usr1 - all dr_mkout NULL -dr dtrans\inc nmake - all dr_inc NULL -dr dtrans\source\cnttype nmake - all dr_cnttype dr_generic dr_inc NULL -dr dtrans\source\win32\misc nmake - w dr_win32_misc dr_inc NULL -dr dtrans\source\win32\mtaole nmake - w dr_win32_mtaole dr_inc NULL -dr dtrans\source\win32\ftransl nmake - w dr_win32_ftransl dr_cnttype dr_win32_misc.w dr_inc NULL -dr dtrans\source\win32\clipb nmake - w dr_win32_clipb dr_win32_misc.w dr_inc NULL -dr dtrans\source\win32\dnd nmake - w dr_win32_dnd dr_cnttype dr_win32_misc.w dr_win32_dtobj.w dr_inc NULL -dr dtrans\source\win32\dtobj nmake - w dr_win32_dtobj dr_win32_clipb.w dr_win32_misc.w dr_win32_ftransl.w dr_inc NULL -dr dtrans\source\os2\clipb nmake - p dr_os2_clipb dr_inc NULL -dr dtrans\util nmake - all dr_util dr_cnttype dr_win32_misc.w dr_win32_mtaole.w dr_win32_ftransl.w dr_win32_clipb.w dr_win32_dnd.w dr_win32_dtobj.w dr_inc NULL -dr dtrans\source\generic nmake - all dr_generic dr_inc NULL - - +dr dtrans\prj nmake - all dr_prj NULL diff --git a/dtrans/prj/d.lst b/dtrans/prj/d.lst index d2332c2802ea..e69de29bb2d1 100644 --- a/dtrans/prj/d.lst +++ b/dtrans/prj/d.lst @@ -1,14 +0,0 @@ -..\%__SRC%\lib\lib*.so %_DEST%\lib -..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib - -..\source\win32\clipb\sysdtrans.xml %_DEST%\xml\sysdtrans.xml -..\source\win32\dnd\dnd.xml %_DEST%\xml\dnd.xml -..\source\win32\ftransl\ftransl.xml %_DEST%\xml\ftransl.xml -..\source\cnttype\mcnttype.xml %_DEST%\xml\mcnttype.xml -..\source\generic\dtrans.xml %_DEST%\xml\dtrans.xml -..\%__SRC%\misc\dnd.component %_DEST%\xml\dnd.component -..\%__SRC%\misc\dtrans.component %_DEST%\xml\dtrans.component -..\%__SRC%\misc\ftransl.component %_DEST%\xml\ftransl.component -..\%__SRC%\misc\mcnttype.component %_DEST%\xml\mcnttype.component -..\%__SRC%\misc\sysdtrans.component %_DEST%\xml\sysdtrans.component diff --git a/dtrans/inc/makefile.mk b/dtrans/prj/makefile.mk index 2738985607cb..d30ff8a47e6b 100644 --- a/dtrans/inc/makefile.mk +++ b/dtrans/prj/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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 @@ -24,24 +24,17 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -PRJ=.. - -PRJNAME=dtrans -TARGET=inc -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- +PRJ=.. +TARGET=prj -.INCLUDE : target.mk +.INCLUDE : settings.mk -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/dtrans/source/cnttype/exports.dxp b/dtrans/source/cnttype/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/dtrans/source/cnttype/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/dtrans/source/generic/exports.dxp b/dtrans/source/generic/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/dtrans/source/generic/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/dtrans/source/generic/makefile.mk b/dtrans/source/generic/makefile.mk deleted file mode 100644 index 2518b86a2d92..000000000000 --- a/dtrans/source/generic/makefile.mk +++ /dev/null @@ -1,75 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=dtrans -TARGET=generic -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO -COMP1TYPELIST=dtrans - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" -# ------------------------------------------------------------------ - -SLOFILES= \ - $(SLO)$/generic_clipboard.obj \ - $(SLO)$/clipboardmanager.obj \ - $(SLO)$/dtrans.obj - -SHL1TARGET= dtrans - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(SHL1TARGET) -SHL1OBJS= $(SLOFILES) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp - -# --- Targets ------------------------------------------------------ -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/dtrans.component - -$(MISC)/dtrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - dtrans.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt dtrans.component diff --git a/dtrans/source/win32/clipb/exports.dxp b/dtrans/source/win32/clipb/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/dtrans/source/win32/clipb/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/dtrans/source/win32/dnd/exports.dxp b/dtrans/source/win32/dnd/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/dtrans/source/win32/dnd/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/dtrans/source/win32/dtobj/makefile.mk b/dtrans/source/win32/dtobj/makefile.mk deleted file mode 100644 index 5aea2b133dc1..000000000000 --- a/dtrans/source/win32/dtobj/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=dtrans -TARGET=dtobjfact -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -#-DUNICODE -D_UNICODE -.IF "$(COM)"!="GCC" -CFLAGS+=-GR -Ob0 -.ENDIF - -SLOFILES=$(SLO)$/DtObjFactory.obj\ - $(SLO)$/APNDataObject.obj\ - $(SLO)$/DOTransferable.obj\ - $(SLO)$/DTransHelper.obj\ - $(SLO)$/XTDataObject.obj\ - $(SLO)$/TxtCnvtHlp.obj\ - $(SLO)$/DataFmtTransl.obj\ - $(SLO)$/FmtFilter.obj\ - $(SLO)$/FetcList.obj\ - $(SLO)$/Fetc.obj\ - $(SLO)$/XNotifyingDataObject.obj - -LIB1TARGET=$(SLB)$/$(TARGET).lib -.IF "$(COM)"!="GCC" -LIB1OBJFILES=$(SLOFILES) -.ELSE -LIB1OBJFILES=$(SLO)$/DtObjFactory.obj\ - $(SLO)$/APNDataObject.obj\ - $(SLO)$/DOTransferable.obj\ - $(SLO)$/DTransHelper.obj\ - $(SLO)$/XTDataObject.obj\ - $(SLO)$/TxtCnvtHlp.obj\ - $(SLO)$/DataFmtTransl.obj\ - $(SLO)$/FmtFilter.obj\ - $(SLO)$/FetcList.obj\ - $(SLO)$/Fetc.obj -.ENDIF - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/dtrans/source/win32/ftransl/exports.dxp b/dtrans/source/win32/ftransl/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/dtrans/source/win32/ftransl/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/dtrans/util/exports.dxp b/dtrans/util/exports.dxp deleted file mode 100644 index 70033078921a..000000000000 --- a/dtrans/util/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/dtrans/util/makefile.mk b/dtrans/util/makefile.mk deleted file mode 100644 index 850f2910fbf7..000000000000 --- a/dtrans/util/makefile.mk +++ /dev/null @@ -1,190 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=dtrans -TARGET=dtrans -TARGET1=mcnttype -TARGET2=ftransl -TARGET3=sysdtrans -TARGET4=dnd - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.IF "$(L10N_framework)"=="" - -# --- mcnttype dynlib ---------------------------------------------- - -SHL1TARGET=$(TARGET1) - -SHL1LIBS=$(SLB)$/mcnttype.lib - -SHL1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS+= \ - $(UWINAPILIB) -.ENDIF - - - -SHL1IMPLIB=i$(SHL1TARGET) - -#--- comment ----------------- - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - - -.IF "$(GUI)"=="WNT" - -# --- ftransl dll --- - -SHL2TARGET=$(TARGET2) - -SHL2LIBS=$(SLB)$/ftransl.lib\ - $(SLB)$/dtutils.lib - -SHL2STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(UWINAPILIB)\ - $(ADVAPI32LIB)\ - $(OLE32LIB)\ - $(GDI32LIB) - -SHL2IMPLIB=i$(SHL2TARGET) - -SHL2DEF= $(MISC)$/$(SHL2TARGET).def -DEF2NAME= $(SHL2TARGET) -DEF2EXPORTFILE= exports.dxp - - -# --- sysdtrans dll --- - -SHL3TARGET=$(TARGET3) - -SHL3LIBS=$(SLB)$/sysdtrans.lib\ - $(SLB)$/dtutils.lib\ - $(SLB)$/dtobjfact.lib\ - $(SLB)$/mtaolecb.lib - -.IF "$(COM)" == "GCC" -SHL3OBJS=$(SLO)$/XNotifyingDataObject.obj -.ENDIF - -SHL3STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB)\ - $(UWINAPILIB)\ - $(ADVAPI32LIB)\ - $(OLE32LIB)\ - $(OLEAUT32LIB)\ - $(GDI32LIB)\ - $(SHELL32LIB)\ - $(UUIDLIB) - -SHL3IMPLIB=i$(SHL3TARGET) - -SHL3DEF= $(MISC)$/$(SHL3TARGET).def -DEF3NAME= $(SHL3TARGET) -DEF3EXPORTFILE= exports.dxp - - -# --- dnd dll --- - -SHL4TARGET=$(TARGET4) - -SHL4LIBS= \ - $(SLB)$/dnd.lib\ - $(SLB)$/dtobjfact.lib\ - $(SLB)$/dtutils.lib - -SHL4STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(UWINAPILIB)\ - $(ADVAPI32LIB)\ - $(OLE32LIB)\ - $(OLEAUT32LIB)\ - $(GDI32LIB)\ - $(SHELL32LIB)\ - $(UUIDLIB) - -SHL4DEPN= -SHL4IMPLIB=i$(SHL4TARGET) - -SHL4DEF= $(MISC)$/$(SHL4TARGET).def - -DEF4NAME= $(SHL4TARGET) -DEF4EXPORTFILE= exports.dxp - -.ENDIF # "$(GUI)"=="WNT" - -.ENDIF # L10N_framework - -.INCLUDE : target.mk - -ALLTAR : \ - $(MISC)/dnd.component \ - $(MISC)/ftransl.component \ - $(MISC)/mcnttype.component \ - $(MISC)/sysdtrans.component - -$(MISC)/dnd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - dnd.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL4TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt dnd.component - -$(MISC)/ftransl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - ftransl.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt ftransl.component - -$(MISC)/mcnttype.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - mcnttype.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt mcnttype.component - -$(MISC)/sysdtrans.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - sysdtrans.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sysdtrans.component diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 3f0c5f0f8fd6..04aaa6b44f15 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -63,6 +63,7 @@ my_components = \ component/dbaccess/util/dba \ component/dbaccess/util/dbu \ component/dbaccess/util/sdbt \ + component/dtrans/util/mcnttype \ component/fileaccess/source/fileacc \ component/forms/util/frm \ component/formula/util/for \ @@ -142,7 +143,6 @@ my_components = \ lnth \ localebe1 \ log \ - mcnttype \ migrationoo2 \ msfilter \ mysql \ @@ -299,15 +299,15 @@ my_components += \ .IF "$(OS)" == "WNT" my_components += \ ado \ - dnd \ - dtrans \ fop \ fps \ - ftransl \ java_uno_accessbridge \ smplmail \ - sysdtrans \ wininetbe1 \ + component/dtrans/source/generic/dtrans \ + component/dtrans/util/dnd \ + component/dtrans/util/ftransl \ + component/dtrans/util/sysdtrans \ component/vcl/vcl.windows .END |