Author: damjan
Date: Fri Dec 16 10:15:56 2016
New Revision: 1774567
URL: http://svn.apache.org/viewvc?rev=1774567&view=rev
Log:
Port main/dtrans to gbuild.
Patch by: me
Added:
openoffice/trunk/main/dtrans/Library_dnd.mk
openoffice/trunk/main/dtrans/Library_dtrans.mk
openoffice/trunk/main/dtrans/Library_ftransl.mk
openoffice/trunk/main/dtrans/Library_mcnttype.mk
openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk
openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk
openoffice/trunk/main/dtrans/Makefile (with props)
openoffice/trunk/main/dtrans/Module_dtrans.mk
openoffice/trunk/main/dtrans/Package_xml.mk
openoffice/trunk/main/dtrans/prj/makefile.mk
Removed:
openoffice/trunk/main/dtrans/inc/makefile.mk
openoffice/trunk/main/dtrans/source/cnttype/exports.dxp
openoffice/trunk/main/dtrans/source/cnttype/makefile.mk
openoffice/trunk/main/dtrans/source/cnttype/wbench/makefile.mk
openoffice/trunk/main/dtrans/source/generic/exports.dxp
openoffice/trunk/main/dtrans/source/generic/makefile.mk
openoffice/trunk/main/dtrans/source/os2/clipb/exports.dxp
openoffice/trunk/main/dtrans/source/os2/clipb/makefile.mk
openoffice/trunk/main/dtrans/source/test/makefile.mk
openoffice/trunk/main/dtrans/source/win32/clipb/exports.dxp
openoffice/trunk/main/dtrans/source/win32/clipb/makefile.mk
openoffice/trunk/main/dtrans/source/win32/dnd/exports.dxp
openoffice/trunk/main/dtrans/source/win32/dnd/makefile.mk
openoffice/trunk/main/dtrans/source/win32/dtobj/makefile.mk
openoffice/trunk/main/dtrans/source/win32/ftransl/exports.dxp
openoffice/trunk/main/dtrans/source/win32/ftransl/makefile.mk
openoffice/trunk/main/dtrans/source/win32/misc/makefile.mk
openoffice/trunk/main/dtrans/source/win32/mtaole/makefile.mk
openoffice/trunk/main/dtrans/source/win32/workbench/makefile.mk
openoffice/trunk/main/dtrans/util/exports.dxp
openoffice/trunk/main/dtrans/util/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/dtrans/prj/build.lst
openoffice/trunk/main/dtrans/prj/d.lst
openoffice/trunk/main/dtrans/source/cnttype/mctfentry.cxx
openoffice/trunk/main/dtrans/source/generic/dtrans.cxx
openoffice/trunk/main/dtrans/source/os2/clipb/Os2Service.cxx
openoffice/trunk/main/dtrans/source/win32/clipb/wcbentry.cxx
openoffice/trunk/main/dtrans/source/win32/dnd/dndentry.cxx
openoffice/trunk/main/dtrans/source/win32/ftransl/ftranslentry.cxx
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/solenv/gbuild/UnoApiTarget.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Fri Dec 16 10:15:56 2016
@@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,o
cppcanvas \
dbaccess \
drawinglayer \
+ dtrans \
editeng \
embeddedobj \
eventattacher \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Fri Dec 16 10:15:56 2016
@@ -58,7 +58,9 @@ $(eval $(call gb_Helper_register_librari
dbpool \
dbtools \
desktop_detector \
+ dnd \
drawinglayer \
+ dtrans \
svgio \
editeng \
embobj \
@@ -68,6 +70,7 @@ $(eval $(call gb_Helper_register_librari
fileacc \
for \
forui \
+ ftransl \
fwe \
fwi \
fwk \
@@ -77,6 +80,7 @@ $(eval $(call gb_Helper_register_librari
juh \
juhx \
lng \
+ mcnttype \
msfilter \
msword \
odbc \
@@ -107,6 +111,8 @@ $(eval $(call gb_Helper_register_librari
sdd \
sdui \
sdfilt \
+ sysdtran \
+ sysdtrans \
textconversiondlgs \
ootk \
tl \
Added: openoffice/trunk/main/dtrans/Library_dnd.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_dnd.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Library_dnd.mk (added)
+++ openoffice/trunk/main/dtrans/Library_dnd.mk Fri Dec 16 10:15:56 2016
@@ -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:
Added: openoffice/trunk/main/dtrans/Library_dtrans.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_dtrans.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Library_dtrans.mk (added)
+++ openoffice/trunk/main/dtrans/Library_dtrans.mk Fri Dec 16 10:15:56 2016
@@ -0,0 +1,54 @@
+#**************************************************************
+#
+# 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,dtrans))
+
+$(eval $(call
gb_Library_add_precompiled_header,dtrans,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans))
+
+$(eval $(call
gb_Library_set_componentfile,dtrans,dtrans/source/generic/dtrans))
+
+$(eval $(call gb_Library_set_include,dtrans,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/dtrans/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,dtrans,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dtrans,\
+ cppuhelper \
+ cppu \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,dtrans,\
+ dtrans/source/generic/generic_clipboard \
+ dtrans/source/generic/clipboardmanager \
+ dtrans/source/generic/dtrans \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/dtrans/Library_ftransl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_ftransl.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Library_ftransl.mk (added)
+++ openoffice/trunk/main/dtrans/Library_ftransl.mk Fri Dec 16 10:15:56 2016
@@ -0,0 +1,58 @@
+#**************************************************************
+#
+# 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,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:
Added: openoffice/trunk/main/dtrans/Library_mcnttype.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_mcnttype.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Library_mcnttype.mk (added)
+++ openoffice/trunk/main/dtrans/Library_mcnttype.mk Fri Dec 16 10:15:56 2016
@@ -0,0 +1,60 @@
+#**************************************************************
+#
+# 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,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:
Added: openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk (added)
+++ openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk Fri Dec 16 10:15:56
2016
@@ -0,0 +1,56 @@
+#**************************************************************
+#
+# 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,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:
Added: openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk (added)
+++ openoffice/trunk/main/dtrans/Library_sysdtrans_win.mk Fri Dec 16 10:15:56
2016
@@ -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:
Added: openoffice/trunk/main/dtrans/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Makefile?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Makefile (added)
+++ openoffice/trunk/main/dtrans/Makefile Fri Dec 16 10:15:56 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath
$(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
Propchange: openoffice/trunk/main/dtrans/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/dtrans/Module_dtrans.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Module_dtrans.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Module_dtrans.mk (added)
+++ openoffice/trunk/main/dtrans/Module_dtrans.mk Fri Dec 16 10:15:56 2016
@@ -0,0 +1,46 @@
+#**************************************************************
+#
+# 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_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:
Added: openoffice/trunk/main/dtrans/Package_xml.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Package_xml.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/Package_xml.mk (added)
+++ openoffice/trunk/main/dtrans/Package_xml.mk Fri Dec 16 10:15:56 2016
@@ -0,0 +1,37 @@
+###############################################################
+#
+# 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_Package_Package,dtrans_xml,$(SRCDIR)/dtrans/source))
+
+$(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))
+
+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
Modified: openoffice/trunk/main/dtrans/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/prj/build.lst?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/prj/build.lst (original)
+++ openoffice/trunk/main/dtrans/prj/build.lst Fri Dec 16 10:15:56 2016
@@ -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
Modified: openoffice/trunk/main/dtrans/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/prj/d.lst?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/prj/d.lst (original)
+++ openoffice/trunk/main/dtrans/prj/d.lst Fri Dec 16 10:15:56 2016
@@ -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
Added: openoffice/trunk/main/dtrans/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/prj/makefile.mk?rev=1774567&view=auto
==============================================================================
--- openoffice/trunk/main/dtrans/prj/makefile.mk (added)
+++ openoffice/trunk/main/dtrans/prj/makefile.mk Fri Dec 16 10:15:56 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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=..
+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
Modified: openoffice/trunk/main/dtrans/source/cnttype/mctfentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/cnttype/mctfentry.cxx?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/cnttype/mctfentry.cxx (original)
+++ openoffice/trunk/main/dtrans/source/cnttype/mctfentry.cxx Fri Dec 16
10:15:56 2016
@@ -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_getImplementatio
// 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;
Modified: openoffice/trunk/main/dtrans/source/generic/dtrans.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/generic/dtrans.cxx?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/generic/dtrans.cxx (original)
+++ openoffice/trunk/main/dtrans/source/generic/dtrans.cxx Fri Dec 16 10:15:56
2016
@@ -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_getImplementatio
//==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName,
void * pServiceManager,
void * /*pRegistryKey*/
Modified: openoffice/trunk/main/dtrans/source/os2/clipb/Os2Service.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/os2/clipb/Os2Service.cxx?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/os2/clipb/Os2Service.cxx (original)
+++ openoffice/trunk/main/dtrans/source/os2/clipb/Os2Service.cxx Fri Dec 16
10:15:56 2016
@@ -48,13 +48,13 @@ Reference< XInterface > SAL_CALL createI
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;
Modified: openoffice/trunk/main/dtrans/source/win32/clipb/wcbentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/win32/clipb/wcbentry.cxx?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/win32/clipb/wcbentry.cxx (original)
+++ openoffice/trunk/main/dtrans/source/win32/clipb/wcbentry.cxx Fri Dec 16
10:15:56 2016
@@ -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_getImplementatio
// 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;
Modified: openoffice/trunk/main/dtrans/source/win32/dnd/dndentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/win32/dnd/dndentry.cxx?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/win32/dnd/dndentry.cxx (original)
+++ openoffice/trunk/main/dtrans/source/win32/dnd/dndentry.cxx Fri Dec 16
10:15:56 2016
@@ -53,7 +53,7 @@ Reference< XInterface > SAL_CALL createD
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( T
// 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_getImplementatio
// 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;
Modified: openoffice/trunk/main/dtrans/source/win32/ftransl/ftranslentry.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/win32/ftransl/ftranslentry.cxx?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/win32/ftransl/ftranslentry.cxx
(original)
+++ openoffice/trunk/main/dtrans/source/win32/ftransl/ftranslentry.cxx Fri Dec
16 10:15:56 2016
@@ -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_getImplementatio
// 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;
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Fri Dec 16
10:15:56 2016
@@ -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)" == ""
Modified: openoffice/trunk/main/solenv/gbuild/UnoApiTarget.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/UnoApiTarget.mk?rev=1774567&r1=1774566&r2=1774567&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/UnoApiTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/UnoApiTarget.mk Fri Dec 16 10:15:56 2016
@@ -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})
