diff options
35 files changed, 425 insertions, 830 deletions
diff --git a/Module_ooo.mk b/Module_ooo.mk index 4a2bde9f7578..1becb22dabaa 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ cppcanvas \ dbaccess \ drawinglayer \ + dtrans \ editeng \ embeddedobj \ eventattacher \ diff --git a/Repository.mk b/Repository.mk index 5210cff67266..bb34bc5c305f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -58,7 +58,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ dbpool \ dbtools \ desktop_detector \ + dnd \ drawinglayer \ + dtrans \ svgio \ editeng \ embobj \ @@ -68,6 +70,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ fileacc \ for \ forui \ + ftransl \ fwe \ fwi \ fwk \ @@ -77,6 +80,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ juh \ juhx \ lng \ + mcnttype \ msfilter \ msword \ odbc \ @@ -107,6 +111,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ sdd \ sdui \ sdfilt \ + sysdtran \ + sysdtrans \ textconversiondlgs \ ootk \ tl \ diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk new file mode 100644 index 000000000000..7cede346d4ef --- /dev/null +++ b/dtrans/Library_dnd.mk @@ -0,0 +1,98 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the 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$(SRCDIR)/dtrans/inc/pch \ +)) + +$(eval $(call gb_Library_add_api,dnd,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,dnd,\ + advapi32 \ + cppuhelper \ + cppu \ + gdi32 \ + ole32 \ + oleaut32 \ + sal \ + shell32 \ + stl \ + uuid \ + uwinapi \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,dnd,\ + dtrans/source/win32/dnd/dndentry \ + dtrans/source/win32/dnd/target \ + dtrans/source/win32/dnd/idroptarget \ + dtrans/source/win32/dnd/source \ + dtrans/source/win32/dnd/globals \ + dtrans/source/win32/dnd/targetdropcontext \ + dtrans/source/win32/dnd/targetdragcontext \ + dtrans/source/win32/dnd/sourcecontext \ + dtrans/source/win32/misc/ImplHelper \ +)) + +ifneq ($(COM),GCC) +$(eval $(call gb_Library_add_cxxobjects,dnd,\ + dtrans/source/win32/dtobj/DtObjFactory \ + dtrans/source/win32/dtobj/APNDataObject \ + dtrans/source/win32/dtobj/DOTransferable \ + dtrans/source/win32/dtobj/DTransHelper \ + dtrans/source/win32/dtobj/XTDataObject \ + dtrans/source/win32/dtobj/TxtCnvtHlp \ + dtrans/source/win32/dtobj/DataFmtTransl \ + dtrans/source/win32/dtobj/FmtFilter \ + dtrans/source/win32/dtobj/FetcList \ + dtrans/source/win32/dtobj/Fetc \ + dtrans/source/win32/dtobj/XNotifyingDataObject \ + , -GR -Ob0 \ +)) +else +$(eval $(call gb_Library_add_exception_objects,dnd,\ + dtrans/source/win32/dtobj/DtObjFactory \ + dtrans/source/win32/dtobj/APNDataObject \ + dtrans/source/win32/dtobj/DOTransferable \ + dtrans/source/win32/dtobj/DTransHelper \ + dtrans/source/win32/dtobj/XTDataObject \ + dtrans/source/win32/dtobj/TxtCnvtHlp \ + dtrans/source/win32/dtobj/DataFmtTransl \ + dtrans/source/win32/dtobj/FmtFilter \ + dtrans/source/win32/dtobj/FetcList \ + dtrans/source/win32/dtobj/Fetc \ + dtrans/source/win32/dtobj/XNotifyingDataObject \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/clipb/makefile.mk b/dtrans/Library_dtrans.mk index 72283c5717fe..2659c4ae3648 100644 --- a/dtrans/source/win32/clipb/makefile.mk +++ b/dtrans/Library_dtrans.mk @@ -21,35 +21,34 @@ -PRJ=..$/..$/.. +$(eval $(call gb_Library_Library,dtrans)) -PRJNAME=dtrans -TARGET=sysdtrans -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) -USE_BOUNDCHK= +$(eval $(call gb_Library_add_precompiled_header,dtrans,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF +$(eval $(call gb_Library_set_componentfile,dtrans,dtrans/source/generic/dtrans)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_Library_set_include,dtrans,\ + $$(INCLUDE) \ + -I$(SRCDIR)/dtrans/inc/pch \ +)) -.INCLUDE : settings.mk +$(eval $(call gb_Library_add_api,dtrans,\ + offapi \ + udkapi \ +)) -# ------------------------------------------------------------------ +$(eval $(call gb_Library_add_linked_libs,dtrans,\ + cppuhelper \ + cppu \ + sal \ + stl \ + $(gb_STDLIBS) \ +)) -.IF "$(COM)" != "GCC" -CFLAGS+=-GR -.ENDIF -CFLAGS+=-DUNICODE -D_UNICODE +$(eval $(call gb_Library_add_exception_objects,dtrans,\ + dtrans/source/generic/generic_clipboard \ + dtrans/source/generic/clipboardmanager \ + dtrans/source/generic/dtrans \ +)) -SLOFILES=$(SLO)$/WinClipboard.obj \ - $(SLO)$/WinClipbImpl.obj \ - $(SLO)$/wcbentry.obj - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/os2/clipb/makefile.mk b/dtrans/Library_ftransl.mk index f07db56d42e9..9c613320d84f 100644 --- a/dtrans/source/os2/clipb/makefile.mk +++ b/dtrans/Library_ftransl.mk @@ -21,31 +21,38 @@ -PRJ=..$/..$/.. - -PRJNAME=dtrans -TARGET=sysdtrans -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) -COMPRDB=$(SOLARBINDIR)$/types.rdb -USE_BOUNDCHK= - -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES= $(SLO)$/Os2Clipboard.obj \ - $(SLO)$/Os2Bitmap.obj \ - $(SLO)$/Os2Service.obj \ - $(SLO)$/Os2Transferable.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +$(eval $(call gb_Library_Library,ftransl)) + +$(eval $(call gb_Library_add_precompiled_header,ftransl,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) + +$(eval $(call gb_Library_set_componentfile,ftransl,dtrans/util/ftransl)) + +$(eval $(call gb_Library_set_include,ftransl,\ + $$(INCLUDE) \ + -I$(SRCDIR)/dtrans/inc/pch \ +)) + +$(eval $(call gb_Library_add_api,ftransl,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,ftransl,\ + advapi32 \ + cppuhelper \ + cppu \ + gdi32 \ + ole32 \ + sal \ + stl \ + uwinapi \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,ftransl,\ + dtrans/source/win32/ftransl/ftransl \ + dtrans/source/win32/ftransl/ftranslentry \ + dtrans/source/win32/misc/ImplHelper \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/misc/makefile.mk b/dtrans/Library_mcnttype.mk index 8887d83990f7..f764a3dfd6b3 100644 --- a/dtrans/source/win32/misc/makefile.mk +++ b/dtrans/Library_mcnttype.mk @@ -21,36 +21,40 @@ -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 - -#------------------------------------------- -# files to compile to obj's - -SLOFILES= $(SLO)$/ImplHelper.obj - -#------------------------------------------- -# build a static library - -LIB1TARGET= $(SLB)$/$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - - -# --- Targets ------------------------------ - -.INCLUDE : target.mk - +$(eval $(call gb_Library_Library,mcnttype)) + +$(eval $(call gb_Library_add_precompiled_header,mcnttype,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) + +$(eval $(call gb_Library_set_componentfile,mcnttype,dtrans/util/mcnttype)) + +$(eval $(call gb_Library_set_include,mcnttype,\ + $$(INCLUDE) \ + -I$(SRCDIR)/dtrans/inc/pch \ +)) + +$(eval $(call gb_Library_add_api,mcnttype,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,mcnttype,\ + cppuhelper \ + cppu \ + sal \ + stl \ + $(gb_STDLIBS) \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,mcnttype,\ + uwinapi \ +)) +endif + +$(eval $(call gb_Library_add_exception_objects,mcnttype,\ + dtrans/source/cnttype/mctfentry \ + dtrans/source/cnttype/mcnttfactory \ + dtrans/source/cnttype/mcnttype \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/cnttype/makefile.mk b/dtrans/Library_sysdtrans_os2.mk index b2e5752bcd9a..8511d13655ec 100644 --- a/dtrans/source/cnttype/makefile.mk +++ b/dtrans/Library_sysdtrans_os2.mk @@ -21,29 +21,36 @@ -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 - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +$(eval $(call gb_Library_Library,sysdtran)) + +$(eval $(call gb_Library_add_precompiled_header,sysdtran,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans)) + +$(eval $(call gb_Library_set_componentfile,sysdtran,dtrans/util/sysdtrans)) + +$(eval $(call gb_Library_set_include,sysdtran,\ + $$(INCLUDE) \ + -I$(SRCDIR)/dtrans/inc/pch \ +)) + +$(eval $(call gb_Library_add_api,sysdtran,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,sysdtran,\ + cppuhelper \ + cppu \ + sal \ + stl \ + UClip \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,sysdtran,\ + dtrans/source/os2/clipb/Os2Clipboard \ + dtrans/source/os2/clipb/Os2Bitmap \ + dtrans/source/os2/clipb/Os2Service \ + dtrans/source/os2/clipb/Os2Transferable \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/Library_sysdtrans_win.mk b/dtrans/Library_sysdtrans_win.mk new file mode 100644 index 000000000000..bdd7d1be54b3 --- /dev/null +++ b/dtrans/Library_sysdtrans_win.mk @@ -0,0 +1,102 @@ +#************************************************************** +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the 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$(SRCDIR)/dtrans/inc/pch \ +)) + +$(eval $(call gb_Library_add_api,sysdtrans,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,sysdtrans,\ + advapi32 \ + cppuhelper \ + cppu \ + gdi32 \ + ole32 \ + oleaut32 \ + sal \ + shel32 \ + stl \ + uuid \ + uwinapi \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_cxxobjects,sysdtrans,\ + dtrans/source/win32/clipb/WinClipboard \ + dtrans/source/win32/clipb/WinClipbImpl \ + dtrans/source/win32/clipb/wcbentry \ + , -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,sysdtrans,\ + dtrans/source/win32/misc/ImplHelper \ +)) + +ifneq ($(COM),GCC) +$(eval $(call gb_Library_add_cxxobjects,sysdtrans,\ + dtrans/source/win32/dtobj/DtObjFactory \ + dtrans/source/win32/dtobj/APNDataObject \ + dtrans/source/win32/dtobj/DOTransferable \ + dtrans/source/win32/dtobj/DTransHelper \ + dtrans/source/win32/dtobj/XTDataObject \ + dtrans/source/win32/dtobj/TxtCnvtHlp \ + dtrans/source/win32/dtobj/DataFmtTransl \ + dtrans/source/win32/dtobj/FmtFilter \ + dtrans/source/win32/dtobj/FetcList \ + dtrans/source/win32/dtobj/Fetc \ + dtrans/source/win32/dtobj/XNotifyingDataObject \ + , -GR -Ob0 \ +)) +else +$(eval $(call gb_Library_add_exception_objects,sysdtrans,\ + dtrans/source/win32/dtobj/DtObjFactory \ + dtrans/source/win32/dtobj/APNDataObject \ + dtrans/source/win32/dtobj/DOTransferable \ + dtrans/source/win32/dtobj/DTransHelper \ + dtrans/source/win32/dtobj/XTDataObject \ + dtrans/source/win32/dtobj/TxtCnvtHlp \ + dtrans/source/win32/dtobj/DataFmtTransl \ + dtrans/source/win32/dtobj/FmtFilter \ + dtrans/source/win32/dtobj/FetcList \ + dtrans/source/win32/dtobj/Fetc \ + dtrans/source/win32/dtobj/XNotifyingDataObject \ +)) +endif + +$(eval $(call gb_Library_add_cxxobjects,sysdtrans,\ + dtrans/source/win32/mtaole/MtaOleClipb \ + , -DUNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/ftransl/makefile.mk b/dtrans/Makefile index 5a428a9cba0d..c1d144cbd4c9 100644 --- a/dtrans/source/win32/ftransl/makefile.mk +++ b/dtrans/Makefile @@ -19,29 +19,14 @@ # #************************************************************** +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -PRJ=..$/..$/.. -PRJNAME=dtrans -TARGET=ftransl -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) -USE_BOUNDCHK= +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -SLOFILES=$(SLO)$/ftranslentry.obj \ - $(SLO)$/ftransl.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/win32/mtaole/makefile.mk b/dtrans/Module_dtrans.mk index eba1822b3452..e2826ac331f1 100644 --- a/dtrans/source/win32/mtaole/makefile.mk +++ b/dtrans/Module_dtrans.mk @@ -21,30 +21,26 @@ -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 - -SLOFILES=$(SLO)$/MtaOleClipb.obj - -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) - -.ENDIF - -.INCLUDE : target.mk +$(eval $(call gb_Module_Module,dtrans)) + +$(eval $(call gb_Module_add_targets,dtrans,\ + Library_dtrans \ + Library_mcnttype \ + Package_xml \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Module_add_targets,dtrans,\ + Library_dnd \ + Library_ftransl \ + Library_sysdtrans_win \ +)) +endif + +ifeq ($(OS),OS2) +$(eval $(call gb_Module_add_targets,dtrans,\ + Library_sysdtrans_os2 \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/dtrans/source/cnttype/wbench/makefile.mk b/dtrans/Package_xml.mk index 442ad9d354c1..7f2c1f781652 100644 --- a/dtrans/source/cnttype/wbench/makefile.mk +++ b/dtrans/Package_xml.mk @@ -1,4 +1,4 @@ -#************************************************************** +############################################################### # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -17,33 +17,21 @@ # specific language governing permissions and limitations # under the License. # -#************************************************************** +############################################################### -PRJ=..$/..$/.. +$(eval $(call gb_Package_Package,dtrans_xml,$(SRCDIR)/dtrans/source)) -PRJNAME=dtrans -TARGET=testcnttype -LIBTARGET=NO -TARGETTYPE=CUI +$(eval $(call gb_Package_add_file,dtrans_xml,xml/dtrans.xml,generic/dtrans.xml)) +$(eval $(call gb_Package_add_file,dtrans_xml,xml/mcnttype.xml,cnttype/mcnttype.xml)) -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-GX - -# --- Files -------------------------------------------------------- - -OBJFILES= $(OBJ)$/testcnttype.obj -APP1TARGET= $(TARGET) -APP1OBJS= $(OBJ)$/testcnttype.obj - -APP1STDLIBS= $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk +ifeq ($(OS),OS2) +$(eval $(call gb_Package_add_file,dtrans_xml,xml/sysdtrans.xml,os2/clipb/sysdtrans.xml)) +endif +ifeq ($(OS),WNT) +$(eval $(call gb_Package_add_file,dtrans_xml,xml/dnd.xml,win32/dnd/dnd.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/sysdtrans.xml,win32/clipb/sysdtrans.xml)) +endif diff --git a/dtrans/prj/build.lst b/dtrans/prj/build.lst index 1cd7e78f47fb..15ee3f8236e8 100644 --- a/dtrans/prj/build.lst +++ b/dtrans/prj/build.lst @@ -1,15 +1,2 @@ dr dtrans : unotools offapi offapi rdbmaker vos 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_os2_clipb.p 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 955aa075f24b..e69de29bb2d1 100644 --- a/dtrans/prj/d.lst +++ b/dtrans/prj/d.lst @@ -1,14 +0,0 @@ -..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% -..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll -..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib - -..\source\win32\clipb\sysdtrans.xml %_DEST%\xml%_EXT%\sysdtrans.xml -..\source\win32\dnd\dnd.xml %_DEST%\xml%_EXT%\dnd.xml -..\source\win32\ftransl\ftransl.xml %_DEST%\xml%_EXT%\ftransl.xml -..\source\cnttype\mcnttype.xml %_DEST%\xml%_EXT%\mcnttype.xml -..\source\generic\dtrans.xml %_DEST%\xml%_EXT%\dtrans.xml -..\%__SRC%\misc\dnd.component %_DEST%\xml%_EXT%\dnd.component -..\%__SRC%\misc\dtrans.component %_DEST%\xml%_EXT%\dtrans.component -..\%__SRC%\misc\ftransl.component %_DEST%\xml%_EXT%\ftransl.component -..\%__SRC%\misc\mcnttype.component %_DEST%\xml%_EXT%\mcnttype.component -..\%__SRC%\misc\sysdtrans.component %_DEST%\xml%_EXT%\sysdtrans.component diff --git a/dtrans/inc/makefile.mk b/dtrans/prj/makefile.mk index 4fa753c4a796..c62c6a657d16 100644 --- a/dtrans/inc/makefile.mk +++ b/dtrans/prj/makefile.mk @@ -20,24 +20,25 @@ #************************************************************** -PRJ=.. - -PRJNAME=dtrans -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +.IF "$(DEBUG)"!="" +DEBUG_ARGUMENT=DEBUG=$(DEBUG) +.ELIF "$(debug)"!="" +DEBUG_ARGUMENT=debug=$(debug) +.ELSE +DEBUG_ARGUMENT= +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/dtrans/source/cnttype/exports.dxp b/dtrans/source/cnttype/exports.dxp deleted file mode 100644 index f0e1c69934bc..000000000000 --- a/dtrans/source/cnttype/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx index 3ecdec8abd20..8a0507340e64 100644 --- a/dtrans/source/cnttype/mctfentry.cxx +++ b/dtrans/source/cnttype/mctfentry.cxx @@ -89,7 +89,7 @@ extern "C" // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -100,7 +100,7 @@ void SAL_CALL component_getImplementationEnvironment( // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx index 7ae9fbf5efd4..fa44a47415d3 100644 --- a/dtrans/source/generic/dtrans.cxx +++ b/dtrans/source/generic/dtrans.cxx @@ -40,7 +40,7 @@ extern "C" //================================================================================================== -void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -48,7 +48,7 @@ void SAL_CALL component_getImplementationEnvironment(const sal_Char ** ppEnvType //================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ diff --git a/dtrans/source/generic/exports.dxp b/dtrans/source/generic/exports.dxp deleted file mode 100644 index f0e1c69934bc..000000000000 --- a/dtrans/source/generic/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory diff --git a/dtrans/source/generic/makefile.mk b/dtrans/source/generic/makefile.mk deleted file mode 100644 index f44bd9fe07d0..000000000000 --- a/dtrans/source/generic/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the 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/os2/clipb/Os2Service.cxx b/dtrans/source/os2/clipb/Os2Service.cxx index 15351a5d0581..e08773e2e898 100644 --- a/dtrans/source/os2/clipb/Os2Service.cxx +++ b/dtrans/source/os2/clipb/Os2Service.cxx @@ -48,13 +48,13 @@ Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceF extern "C" { -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey ) { void* pRet = 0; diff --git a/dtrans/source/os2/clipb/exports.dxp b/dtrans/source/os2/clipb/exports.dxp deleted file mode 100644 index 926e49f5f1a5..000000000000 --- a/dtrans/source/os2/clipb/exports.dxp +++ /dev/null @@ -1,3 +0,0 @@ -component_getImplementationEnvironment -component_getFactory - diff --git a/dtrans/source/test/makefile.mk b/dtrans/source/test/makefile.mk deleted file mode 100644 index 92b29cba99bc..000000000000 --- a/dtrans/source/test/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/.. - -PRJNAME= dtrans -TARGET= test_dtrans - -LIBTARGET=NO -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -APP1TARGET= $(TARGET) -APP1OBJS= \ - $(OBJ)$/test_dtrans.obj - -APP1STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - diff --git a/dtrans/source/win32/clipb/exports.dxp b/dtrans/source/win32/clipb/exports.dxp deleted file mode 100644 index 926e49f5f1a5..000000000000 --- a/dtrans/source/win32/clipb/exports.dxp +++ /dev/null @@ -1,3 +0,0 @@ -component_getImplementationEnvironment -component_getFactory - diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx index c7705f6531ee..75cbcc117eda 100644 --- a/dtrans/source/win32/clipb/wcbentry.cxx +++ b/dtrans/source/win32/clipb/wcbentry.cxx @@ -87,7 +87,7 @@ extern "C" // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -98,7 +98,7 @@ void SAL_CALL component_getImplementationEnvironment( // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx index 5dd706a8e56d..dd3bb1ac35dc 100644 --- a/dtrans/source/win32/dnd/dndentry.cxx +++ b/dtrans/source/win32/dnd/dndentry.cxx @@ -53,7 +53,7 @@ Reference< XInterface > SAL_CALL createDropTarget( const Reference< XMultiServic extern "C" { -sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) { return g_moduleCount.canUnload( &g_moduleCount , pTime ); } @@ -62,7 +62,7 @@ sal_Bool SAL_CALL component_canUnload( TimeValue *pTime ) // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -73,7 +73,7 @@ void SAL_CALL component_getImplementationEnvironment( // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; Reference< XSingleServiceFactory > xFactory; diff --git a/dtrans/source/win32/dnd/exports.dxp b/dtrans/source/win32/dnd/exports.dxp deleted file mode 100644 index f0e1c69934bc..000000000000 --- a/dtrans/source/win32/dnd/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory diff --git a/dtrans/source/win32/dnd/makefile.mk b/dtrans/source/win32/dnd/makefile.mk deleted file mode 100644 index 9b868246ac44..000000000000 --- a/dtrans/source/win32/dnd/makefile.mk +++ /dev/null @@ -1,62 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/.. - -PRJNAME=dtrans -TARGET=dnd -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) -USE_BOUNDCHK= - -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -#CFLAGS+=-GR -DUNICODE -D_UNICODE - -#DBG_CONSOLE_OUT: when IDropTarget or IDropSource are called we write to a console -#DBG_CLIPBOARD_DATA: To provide DoDragDrop with an data object we call OleGetClipboard -#CFLAGS+= -DDBG_CONSOLE_OUT -DDBG_CLIPBOARD_DATA - - -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 - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/dtrans/source/win32/dtobj/makefile.mk b/dtrans/source/win32/dtobj/makefile.mk deleted file mode 100644 index 48a23e041ef2..000000000000 --- a/dtrans/source/win32/dtobj/makefile.mk +++ /dev/null @@ -1,72 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the 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 f0e1c69934bc..000000000000 --- a/dtrans/source/win32/ftransl/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory diff --git a/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx index 1b7323d0078d..491b086382f9 100644 --- a/dtrans/source/win32/ftransl/ftranslentry.cxx +++ b/dtrans/source/win32/ftransl/ftranslentry.cxx @@ -92,7 +92,7 @@ extern "C" // component_getImplementationEnvironment //---------------------------------------------------------------------- -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -103,7 +103,7 @@ void SAL_CALL component_getImplementationEnvironment( // returns a factory to create XFilePicker-Services //---------------------------------------------------------------------- -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ ) { void* pRet = 0; diff --git a/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk deleted file mode 100644 index 4a0ee71c283d..000000000000 --- a/dtrans/source/win32/workbench/makefile.mk +++ /dev/null @@ -1,92 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=..$/..$/.. - -PRJNAME= dtrans -TARGET= testwincb -TARGET1= testmshl -LIBTARGET= NO -TARGETTYPE= CUI -USE_BOUNDCHK= -TESTCB=TRUE - -.IF "$(USE_BOUNDCHK)"=="TR" -bndchk=tr -stoponerror=tr -.ENDIF - -# --- Settings ----------------------------------------------------- -#.INCLUDE : $(PRJ)$/util$/makefile.pmk - -.INCLUDE : settings.mk - -.IF "$(TESTCB)"=="TRUE" - -CFLAGS+=-D_WIN32_DCOM -EHsc -Ob0 - -# --- Files -------------------------------------------------------- - -OBJFILES= $(OBJ)$/test_wincb.obj -APP1TARGET= $(TARGET) -APP1OBJS= $(OBJ)$/test_wincb.obj - - -APP1STDLIBS= $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SOLARLIBDIR)$/uwinapi.lib\ - $(USER32LIB) \ - $(OLE32LIB)\ - $(COMDLG32LIB) - -APP1LIBS= $(SLB)$/dtutils.lib - - -APP1NOSAL= TRUE - -.ENDIF - -.IF "$(TESTCB)"=="" - -CFLAGS+=/D_WIN32_DCOM /EHsc /Ob0 - -OBJFILES= $(OBJ)$/testmarshal.obj -APP1TARGET= $(TARGET1) -APP1OBJS= $(OBJ)$/testmarshal.obj - -APP1STDLIBS= $(SALLIB)\ - $(USER32LIB)\ - $(OLE32LIB)\ - comsupp.lib\ - $(OLEAUT32LIB) - -APP1LIBS= - -APP1NOSAL= TRUE - -.ENDIF - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk -#.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/dtrans/util/exports.dxp b/dtrans/util/exports.dxp deleted file mode 100644 index f0e1c69934bc..000000000000 --- a/dtrans/util/exports.dxp +++ /dev/null @@ -1,2 +0,0 @@ -component_getImplementationEnvironment -component_getFactory diff --git a/dtrans/util/makefile.mk b/dtrans/util/makefile.mk deleted file mode 100644 index 48d83830a5c7..000000000000 --- a/dtrans/util/makefile.mk +++ /dev/null @@ -1,210 +0,0 @@ -#************************************************************** -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# -#************************************************************** - - - -PRJ=.. - -PRJNAME=dtrans -TARGET=dtrans -TARGET1=mcnttype -TARGET2=ftransl -TARGET3=sysdtrans -TARGET4=dnd -.IF "$(GUI)"=="OS2" -TARGET3=sysdtran -.ENDIF - -# --- 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" - -.IF "$(GUI)"=="OS2" - -# --- sysdtrans dll --- - -SHL3TARGET=$(TARGET3) - -SHL3LIBS=$(SLB)$/sysdtrans.lib - -SHL3STDLIBS= \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - -lUClip - -SHL3IMPLIB=i$(SHL3TARGET) - -SHL3DEF= $(MISC)$/$(SHL3TARGET).def -DEF3NAME= $(SHL3TARGET) -DEF3EXPORTFILE= exports.dxp - -.ENDIF # "$(GUI)"=="OS2" -.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 deefd0585368..82665e7bf876 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -72,6 +72,7 @@ my_components = \ component/dbaccess/util/dba \ component/dbaccess/util/dbu \ component/dbaccess/util/sdbt \ + component/dtrans/util/mcnttype \ component/embeddedobj/util/embobj \ component/eventattacher/source/evtatt \ component/fileaccess/util/fileacc \ @@ -146,7 +147,6 @@ my_components = \ localebe1 \ log \ mailmerge \ - mcnttype \ migrationoo2 \ msfilter \ mysql \ @@ -326,22 +326,22 @@ my_components += \ .IF "$(OS)" == "WNT" my_components += \ ado \ - dnd \ - dtrans \ + component/dtrans/source/generic/dtrans \ + component/dtrans/util/dnd \ + component/dtrans/util/ftransl \ + component/dtrans/util/sysdtrans \ fop \ fps \ - ftransl \ java_uno_accessbridge \ sysmail \ - sysdtrans \ winaccessibility \ wininetbe1 .END .IF "$(OS)" == "OS2" my_components += \ - dtrans \ - sysdtrans + component/dtrans/source/generic/dtrans \ + component/dtrans/util/sysdtrans .END .IF "$(OS)" == "WNT" && "$(DISABLE_ATL)" == "" diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 237e4c27b032..47d7d530b4bf 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -177,10 +177,10 @@ define gb_UnoApiHeaderTarget__command $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ mkdir -p $(gb_Helper_MISC) && \ - RESPONSEFILE=`$(gb_MKTEMP)` && \ - echo " -Gc -L -BUCR -O$(call gb_UnoApiTarget_get_header_target,$*) $(7) \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,\ + " -Gc -L -BUCR -O$(call gb_UnoApiTarget_get_header_target,$*) $(7) \ $(1) \ - " > $${RESPONSEFILE} && \ + ") && \ $(gb_UnoApiTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \ rm -f $${RESPONSEFILE}) |