diff options
88 files changed, 2554 insertions, 2482 deletions
diff --git a/Repository.mk b/Repository.mk index 45b89f9d8d0a..172703bb0f40 100644 --- a/Repository.mk +++ b/Repository.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ gsicheck \ helpex \ idxdict \ + lngconvex \ localize \ mkunroll \ osl_process_child \ @@ -48,6 +49,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ pdfunzip \ rdbmaker \ regsingleton \ + regsvrex \ rsc \ rscdep \ saxparser \ @@ -80,12 +82,14 @@ $(eval $(call gb_Helper_register_executables,SDK, \ endif $(eval $(call gb_Helper_register_executables,OOO, \ + gnome-open-url.bin \ HelpLinker \ HelpIndexer \ spadmin.bin \ $(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \ tdefilepicker \ ) \ + uri-encode \ $(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \ kdefilepicker \ ) \ @@ -105,6 +109,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sbase \ scalc \ sdraw \ + senddoc \ simpress \ soffice \ soffice_bin \ @@ -435,6 +440,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ mozbootstrap \ officebean \ package2 \ + recentfile \ scriptframe \ sdbc2 \ smoketest \ @@ -477,6 +483,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ fps \ ftransl \ inprocserv \ + ooofilt \ + ooofilt_x64 \ + propertyhdl \ + propertyhdl_x64 \ + shlxthdl \ + shlxthdl_x64 \ so_activex \ so_activex_x64 \ sysdtrans \ @@ -507,7 +519,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ basprov \ cairocanvas \ canvasfactory \ + cmdmail \ configmgr \ + desktopbe1 \ directx5canvas \ directx9canvas \ dlgprov \ @@ -516,11 +530,16 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ fpicker \ fps_office \ fsstorage \ + gconfbe1 \ gdipluscanvas \ hatchwindowfactory \ i18npool \ i18nsearch \ + kdebe1 \ + kde4be1 \ + localebe1 \ lomenubar \ + macbe1 \ migrationoo2 \ migrationoo3 \ msforms \ @@ -533,6 +552,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ simplecanvas \ slideshow \ stringresource \ + syssh \ ucpcmis1 \ ucpexpand1 \ ucpext \ @@ -558,6 +578,8 @@ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ oleautobridge \ oleautobridge2 \ + smplmail \ + wininetbe1 \ )) endif @@ -616,6 +638,11 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ ssleay32 \ ooopathutils \ sample \ + simplemapi \ + shell_xmlparser \ + shell_xmlparser_x64 \ + shlxthandler_common \ + shlxthandler_common_x64 \ salcpprt \ transex \ ulingu \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 166bf66e53c3..6a6f4982ada6 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1111,43 +1111,6 @@ endef endif # SYSTEM_CURL -define gb_LinkTarget__use_kde -$(call gb_LinkTarget_add_libs,$(1),\ - $(KDE_LIBS) \ -) - -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(KDE_CFLAGS) \ -) -endef - -ifeq ($(ENABLE_TDE),YES) - -define gb_LinkTarget__use_tde -$(call gb_LinkTarget_add_libs,$(1),\ - $(TDE_LIBS) \ -) - -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(TDE_CFLAGS) \ -) -endef - -endif # ENABLE_TDE - -define gb_LinkTarget__use_gobject -$(call gb_LinkTarget_add_libs,$(1),\ - $(GOBJECT_LIBS) \ -) - -$(call gb_LinkTarget_set_include,$(1),\ - $$(INCLUDE) \ - $(GOBJECT_CFLAGS) \ -) -endef - ifneq ($(VALGRIND_CFLAGS),) define gb_LinkTarget__use_valgrind @@ -1474,6 +1437,121 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ endif # SYSTEM_MOZILLA +ifeq ($(ENABLE_KDE),TRUE) + +define gb_LinkTarget__use_kde +$(call gb_LinkTarget_set_include,$(1),\ + $(filter -I%,$(KDE_CFLAGS)) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_add_defs,$(1),\ + $(filter-out -I%,$(KDE_CFLAGS)) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(KDE_LIBS) \ +) + +ifeq ($(COM),GCC) +$(call gb_LinkTarget_add_cxxflags,$(1),\ + -Wno-shadow \ +) +endif + +endef + +else # !ENABLE_KDE + +define gb_LinkTarget__use_kde + +endef + +endif # ENABLE_KDE + + +ifeq ($(ENABLE_KDE4),TRUE) + +define gb_LinkTarget__use_kde4 +$(call gb_LinkTarget_set_include,$(1),\ + $(filter -I%,$(KDE4_CFLAGS)) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_add_defs,$(1),\ + $(filter-out -I%,$(KDE4_CFLAGS)) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(KDE4_LIBS) \ +) + +ifeq ($(COM),GCC) +$(call gb_LinkTarget_add_cxxflags,$(1),\ + -Wno-shadow \ +) +endif + +endef + +else # !ENABLE_KDE4 + +define gb_LinkTarget__use_kde4 + +endef + +endif # ENABLE_KDE4 + + +ifeq ($(ENABLE_TDE),YES) + +define gb_LinkTarget__use_tde +$(call gb_LinkTarget_add_libs,$(1),\ + $(TDE_LIBS) \ +) + +$(call gb_LinkTarget_set_include,$(1),\ + $$(INCLUDE) \ + $(TDE_CFLAGS) \ +) +endef + +else # ! ENABLE_TDE + +define gb_LinkTarget__use_tde + +endef + +endif # ENABLE_TDE + + +ifeq ($(ENABLE_GCONF),TRUE) + +define gb_LinkTarget__use_gconf +$(call gb_LinkTarget_set_include,$(1),\ + $(filter -I%,$(GCONF_CFLAGS)) \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_add_defs,$(1),\ + $(filter-out -I%,$(GCONF_CFLAGS)) \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + $(GCONF_LIBS) \ +) + +endef + +else # !ENABLE_GCONF + +define gb_LinkTarget__use_gconf + +endef + +endif # ENABLE_GCONF + + # MacOSX-only frameworks ############################################ # (in alphabetical order) @@ -1528,6 +1606,13 @@ $(call gb_Library_add_libs,$(1), \ endef +define gb_LinkTarget__use_coreservices +$(call gb_Library_add_libs,$(1), \ + -framework CoreServices \ +) + +endef + define gb_LinkTarget__use_coretext $(call gb_Library_add_libs,$(1), \ -framework CoreText \ @@ -1542,6 +1627,13 @@ $(call gb_LinkTarget_add_libs,$(1), \ endef +define gb_LinkTarget__use_systemconfiguration +$(call gb_LinkTarget_add_libs,$(1), \ + -framework SystemConfiguration \ +) + +endef + # iOS-only frameworks define gb_LinkTarget__use_uikit diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index dd063e1a7e2e..5ff27d5189ae 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -147,10 +147,10 @@ my_components += \ component/connectivity/source/cpool/dbpool2 \ component/connectivity/source/dbtools/dbtools \ component/connectivity/source/drivers/flat/flat \ - localebe1 \ component/connectivity/source/drivers/mysql/mysql \ component/connectivity/source/drivers/odbc/odbc \ component/connectivity/source/manager/sdbc2 \ + component/shell/source/backends/localebe/localebe1 \ .ENDIF @@ -171,10 +171,15 @@ my_components += \ component/extensions/source/resource/res \ component/extensions/source/scanner/scn \ component/extensions/source/update/feed/updatefeed \ - syssh \ component/xmlhelp/source/treeview/tvhlp1 \ component/xmlhelp/util/ucpchelp1 \ +.IF "$(GUI)" == "UNX" +my_components += \ + component/shell/source/unix/exec/syssh \ + +.ENDIF + .ENDIF .IF "$(DISABLE_SCRIPTING)" != "TRUE" @@ -235,7 +240,7 @@ my_components += component/canvas/source/cairo/cairocanvas .END .IF "$(ENABLE_GCONF)" != "" -my_components += gconfbe1 +my_components += component/shell/source/backends/gconfbe/gconfbe1 .END .IF "$(ENABLE_GIO)" != "" @@ -251,7 +256,7 @@ my_components += component/connectivity/source/drivers/kab/tdeab1 .END .IF "$(ENABLE_TDE)" != "" -my_components += tdebe1 +my_components += component/shell/source/backends/kdebe/tdebe1 .END .IF "$(ENABLE_KAB)" != "" @@ -259,11 +264,11 @@ my_components += component/connectivity/source/drivers/kab/kab1 .END .IF "$(ENABLE_KDE)" != "" -my_components += kdebe1 +my_components += component/shell/source/backends/kdebe/kdebe1 .END .IF "$(ENABLE_KDE4)" != "" -my_components += kde4be1 +my_components += component/shell/source/backends/kde4be/kde4be1 .END .IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" @@ -324,8 +329,8 @@ my_components += component/xmlsecurity/util/xsec_xmlsec .IF "$(OS)" == "MACOSX" my_components += \ component/connectivity/source/drivers/macab/macab1 \ - macbe1 \ component/fpicker/source/aqua/fps_aqua \ + component/shell/source/backends/macbe/macbe1 \ component/vcl/vcl.macosx .END @@ -337,14 +342,14 @@ my_components += \ .IF "$(OS)" == "WNT" my_components += \ - component/connectivity/source/drivers/ado/ado \ - smplmail \ - wininetbe1 \ component/dtrans/source/generic/dtrans \ component/dtrans/util/dnd \ component/dtrans/util/ftransl \ component/dtrans/util/sysdtrans \ component/fpicker/source/win32/fps \ + component/shell/source/backends/wininetbe/wininetbe1 \ + component/shell/source/win32/simplemail/smplmail \ + component/shell/source/win32/syssh \ component/vcl/vcl.windows .IF "$(SOLAR_JAVA)" == "TRUE" my_components += \ @@ -359,7 +364,7 @@ my_components += \ .IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID" && "$(GUIBASE)" != "headless" my_components += \ - desktopbe1 \ + component/shell/source/backends/desktopbe/desktopbe1 \ component/vcl/vcl.unx .END @@ -386,7 +391,7 @@ my_components += component/connectivity/source/drivers/mozab/bootstrap/mozbootst .ENDIF .IF "$(OS)" != "WNT" && "$(OS)" != "ANDROID" && "$(OS)" != "IOS" && "$(OS)" != "headless" -my_components += cmdmail +my_components += component/shell/source/cmdmail/cmdmail .END .IF "$(OS)" != "WNT" && "$(ENABLE_EVOAB2)" != "" diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk new file mode 100644 index 000000000000..125d4dfa7d44 --- /dev/null +++ b/shell/CustomTarget_shlxthdl_res.mk @@ -0,0 +1,52 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_CustomTarget_CustomTarget,shell/source/win32/shlxthandler/res)) + +$(call gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \ + $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc + +$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : \ + $(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \ + $(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \ + $(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \ + $(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \ + | $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \ + $(call gb_Executable_get_target_for_build,lngconvex) + +$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1) + $(call gb_Helper_abbreviate_dirs_native,\ + cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \ + $(call gb_Executable_get_target_for_build,lngconvex) \ + -ulf shlxthdl.ulf \ + -rc $@ \ + -rct rctmpl.txt \ + -rch rcheader.txt \ + -rcf rcfooter.txt) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/CustomTarget_x64.mk b/shell/CustomTarget_x64.mk new file mode 100644 index 000000000000..75d1f608dd67 --- /dev/null +++ b/shell/CustomTarget_x64.mk @@ -0,0 +1,72 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_CustomTarget_CustomTarget,shell/source,new_style)) + +SHELL_SHLXTHANDLER_COMMON_FILES := \ + win32/ooofilereader/autostyletag \ + win32/ooofilereader/basereader \ + win32/ooofilereader/contentreader \ + win32/ooofilereader/keywordstag \ + win32/ooofilereader/metainforeader \ + win32/ooofilereader/simpletag \ + win32/shlxthandler/ooofilt/stream_helper \ + win32/shlxthandler/util/fileextensions \ + win32/shlxthandler/util/iso8601_converter \ + win32/shlxthandler/util/registry \ + win32/shlxthandler/util/utilities \ + win32/zipfile/zipexcptn \ + win32/zipfile/zipfile + +SHELL_SHLXTHDL_FILES := \ + win32/shlxthandler/classfactory \ + win32/shlxthandler/columninfo/columninfo \ + win32/shlxthandler/infotips/infotips \ + win32/shlxthandler/propsheets/document_statistic \ + win32/shlxthandler/propsheets/listviewbuilder \ + win32/shlxthandler/propsheets/propsheets \ + win32/shlxthandler/shlxthdl \ + win32/shlxthandler/thumbviewer/thumbviewer + +SHELL_OOOFILT_FILES := \ + win32/shlxthandler/ooofilt/ooofilt \ + win32/shlxthandler/ooofilt/propspec + +SHELL_PROPERTYHDL_FILES := \ + win32/shell/source/win32/shlxthandler/prophdl/propertyhdl + +SHELL_XMLPARSER_FILES := \ + all/xml_parser + +$(call gb_CustomTarget_get_target,shell/source) : \ + $(foreach source,$(SHELL_SHLXTHANDLER_COMMON_FILES) $(SHELL_SHLXTHDL_FILES) $(SHELL_OOOFILT_FILES) $(SHELL_PROPERTYHDL_FILES) $(SHELL_XMLPARSER_FILES),\ + $(call gb_CustomTarget_get_workdir,shell/source)/$(source).cxx) + +$(call gb_CustomTarget_get_workdir,shell/source)/% : $(SRCDIR)/shell/source/% + mkdir -p $(dir $@) && $(call gb_Deliver_deliver,$<,$@) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Executable_gnome_open_url.mk b/shell/Executable_gnome_open_url.mk new file mode 100644 index 000000000000..5b89d45925c0 --- /dev/null +++ b/shell/Executable_gnome_open_url.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,gnome-open-url.bin)) + +ifeq ($(filter DRAGONFLY FREEBSD NETBSD OPENBSD,$(OS)),) +$(eval $(call gb_Executable_use_libraries,gnome-open-url.bin,\ + dl \ +)) +endif + +$(eval $(call gb_Executable_add_cobjects,gnome-open-url.bin,\ + shell/source/unix/misc/gnome-open-url \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Executable_lngconvex.mk b/shell/Executable_lngconvex.mk new file mode 100644 index 000000000000..eb583c62ac9d --- /dev/null +++ b/shell/Executable_lngconvex.mk @@ -0,0 +1,52 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,lngconvex)) + +$(eval $(call gb_Executable_add_defs,lngconvex,\ + -D_NTSDK \ +)) + +$(eval $(call gb_Executable_use_api,lngconvex,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Executable_use_libraries,lngconvex,\ + comphelper \ + i18nisolang1 \ + sal \ + tl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Executable_add_exception_objects,lngconvex,\ + shell/source/tools/lngconvex/cmdline \ + shell/source/tools/lngconvex/lngconvex \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Executable_regsvrex.mk b/shell/Executable_regsvrex.mk new file mode 100644 index 000000000000..820fe30de2e3 --- /dev/null +++ b/shell/Executable_regsvrex.mk @@ -0,0 +1,34 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,regsvrex)) + +$(eval $(call gb_Executable_add_noexception_objects,regsvrex,\ + shell/source/tools/regsvrex/regsvrex \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Executable_senddoc.mk b/shell/Executable_senddoc.mk new file mode 100644 index 000000000000..47c5b82827f7 --- /dev/null +++ b/shell/Executable_senddoc.mk @@ -0,0 +1,43 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,senddoc)) + +$(eval $(call gb_Executable_use_libraries,senddoc,\ + kernel32 \ + sal \ +)) + +$(eval $(call gb_Executable_use_static_libraries,senddoc,\ + simplemapi \ +)) + +$(eval $(call gb_Executable_add_exception_objects,senddoc,\ + shell/source/win32/simplemail/senddoc \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Executable_uri_encode.mk b/shell/Executable_uri_encode.mk new file mode 100644 index 000000000000..bfccfaeceb4e --- /dev/null +++ b/shell/Executable_uri_encode.mk @@ -0,0 +1,34 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,uri-encode)) + +$(eval $(call gb_Executable_add_cobjects,uri-encode,\ + shell/source/unix/misc/uri-encode \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/InternalUnoApi_cmdmail.mk b/shell/InternalUnoApi_cmdmail.mk new file mode 100644 index 000000000000..212130a91ceb --- /dev/null +++ b/shell/InternalUnoApi_cmdmail.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,cmdmail)) + +$(eval $(call gb_InternalUnoApi_use_api,cmdmail,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,cmdmail,shell/source/cmdmail/cmdmail.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/InternalUnoApi_localebe.mk b/shell/InternalUnoApi_localebe.mk new file mode 100644 index 000000000000..b194c5f42007 --- /dev/null +++ b/shell/InternalUnoApi_localebe.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,localebe)) + +$(eval $(call gb_InternalUnoApi_use_api,localebe,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,localebe,shell/source/backends/localebe/localebe.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/InternalUnoApi_macbe.mk b/shell/InternalUnoApi_macbe.mk new file mode 100644 index 000000000000..e0a81b126779 --- /dev/null +++ b/shell/InternalUnoApi_macbe.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,macbe)) + +$(eval $(call gb_InternalUnoApi_use_api,macbe,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,macbe,shell/source/backends/macbe/macbe.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/InternalUnoApi_smplmail.mk b/shell/InternalUnoApi_smplmail.mk new file mode 100644 index 000000000000..67f4263a2622 --- /dev/null +++ b/shell/InternalUnoApi_smplmail.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,smplmail)) + +$(eval $(call gb_InternalUnoApi_use_api,smplmail,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,smplmail,shell/source/win32/simplemail/smplmail.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/InternalUnoApi_syssh.mk b/shell/InternalUnoApi_syssh.mk new file mode 100644 index 000000000000..24001ffe4f7e --- /dev/null +++ b/shell/InternalUnoApi_syssh.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,syssh)) + +$(eval $(call gb_InternalUnoApi_use_api,syssh,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,syssh,shell/source/unix/exec/syssh.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/InternalUnoApi_syssh_win.mk b/shell/InternalUnoApi_syssh_win.mk new file mode 100644 index 000000000000..0707106fe8a1 --- /dev/null +++ b/shell/InternalUnoApi_syssh_win.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,syssh)) + +$(eval $(call gb_InternalUnoApi_use_api,syssh,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,syssh,shell/source/win32/syssh.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/InternalUnoApi_wininetbe.mk b/shell/InternalUnoApi_wininetbe.mk new file mode 100644 index 000000000000..deafb3dc39c5 --- /dev/null +++ b/shell/InternalUnoApi_wininetbe.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_InternalUnoApi_InternalUnoApi,wininetbe)) + +$(eval $(call gb_InternalUnoApi_use_api,wininetbe,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_InternalUnoApi_set_xmlfile,wininetbe,shell/source/backends/wininetbe/wininetbe.xml)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_cmdmail.mk b/shell/Library_cmdmail.mk new file mode 100644 index 000000000000..be40b5bd2147 --- /dev/null +++ b/shell/Library_cmdmail.mk @@ -0,0 +1,49 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,cmdmail)) + +$(eval $(call gb_Library_use_internal_api,cmdmail,\ + cmdmail \ +)) + +$(eval $(call gb_Library_use_libraries,cmdmail,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,cmdmail,shell/source/cmdmail/cmdmail)) + +$(eval $(call gb_Library_add_exception_objects,cmdmail,\ + shell/source/cmdmail/cmdmailentry \ + shell/source/cmdmail/cmdmailmsg \ + shell/source/cmdmail/cmdmailsuppl \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_desktopbe.mk b/shell/Library_desktopbe.mk new file mode 100644 index 000000000000..0c2fad896c0f --- /dev/null +++ b/shell/Library_desktopbe.mk @@ -0,0 +1,48 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,desktopbe1)) + +$(eval $(call gb_Library_use_api,desktopbe1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_libraries,desktopbe1,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,desktopbe1,shell/source/backends/desktopbe/desktopbe1)) + +$(eval $(call gb_Library_add_exception_objects,desktopbe1,\ + shell/source/backends/desktopbe/desktopbackend \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_gconfbe.mk b/shell/Library_gconfbe.mk new file mode 100644 index 000000000000..061689863b91 --- /dev/null +++ b/shell/Library_gconfbe.mk @@ -0,0 +1,59 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,gconfbe1)) + +ifeq ($(ENABLE_LOCKDOWN),YES) +$(eval $(call gb_Library_add_defs,gconfbe1,\ + -DENABLE_LOCKDOWN \ +)) +endif + +$(eval $(call gb_Library_use_api,gconfbe1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_externals,gconfbe1,\ + gconf \ +)) + +$(eval $(call gb_Library_use_libraries,gconfbe1,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,gconfbe1,shell/source/backends/gconfbe/gconfbe1)) + +$(eval $(call gb_Library_add_exception_objects,gconfbe1,\ + shell/source/backends/gconfbe/gconfaccess \ + shell/source/backends/gconfbe/gconfbackend \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_kde4be.mk b/shell/Library_kde4be.mk new file mode 100644 index 000000000000..a914119e7da9 --- /dev/null +++ b/shell/Library_kde4be.mk @@ -0,0 +1,58 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,kde4be1)) + +$(eval $(call gb_Library_use_api,kde4be1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_externals,kde4be1,\ + kde4 \ +)) + +$(eval $(call gb_Library_use_libraries,kde4be1,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +# FIXME: add this to kde or create a new external +$(eval $(call gb_Library_add_libs,kde4be1,\ + -lkio \ +)) + +$(eval $(call gb_Library_set_componentfile,kde4be1,shell/source/backends/kde4be/kde4be1)) + +$(eval $(call gb_Library_add_exception_objects,kde4be1,\ + shell/source/backends/kde4be/kde4access \ + shell/source/backends/kde4be/kde4backend \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_kdebe.mk b/shell/Library_kdebe.mk new file mode 100644 index 000000000000..8d1c16909c94 --- /dev/null +++ b/shell/Library_kdebe.mk @@ -0,0 +1,57 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,kdebe1)) + +$(eval $(call gb_Library_use_packages,kdebe1,\ + shell_inc \ +)) + +$(eval $(call gb_Library_use_api,kdebe1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_externals,kdebe1,\ + kde \ +)) + +$(eval $(call gb_Library_use_libraries,kdebe1,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,kdebe1,shell/source/backends/kdebe/kdebe1)) + +$(eval $(call gb_Library_add_exception_objects,kdebe1,\ + shell/source/backends/kdebe/kdeaccess \ + shell/source/backends/kdebe/kdebackend \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_localebe.mk b/shell/Library_localebe.mk new file mode 100644 index 000000000000..7f598acd0e76 --- /dev/null +++ b/shell/Library_localebe.mk @@ -0,0 +1,54 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,localebe1)) + +$(eval $(call gb_Library_use_internal_api,localebe1,\ + localebe \ +)) + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_use_externals,localebe1,\ + coreservices \ +)) +endif + +$(eval $(call gb_Library_use_libraries,localebe1,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,localebe1,shell/source/backends/localebe/localebe1)) + +$(eval $(call gb_Library_add_exception_objects,localebe1,\ + shell/source/backends/localebe/localebackend \ + shell/source/backends/localebe/localebecdef \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_macbe.mk b/shell/Library_macbe.mk new file mode 100644 index 000000000000..f248842cbd9d --- /dev/null +++ b/shell/Library_macbe.mk @@ -0,0 +1,53 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,macbe1)) + +$(eval $(call gb_Library_use_internal_api,macbe1,\ + macbe \ +)) + +$(eval $(call gb_Library_use_externals,macbe1,\ + cocoa \ + systemconfiguration \ +)) + +$(eval $(call gb_Library_use_libraries,macbe1,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,macbe1,shell/source/backends/macbe/macbe1)) + +$(eval $(call gb_Library_add_exception_objects,macbe1,\ + shell/source/backends/macbe/macbackend \ + shell/source/backends/macbe/macbecdef \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk new file mode 100644 index 000000000000..0abdd9ba2237 --- /dev/null +++ b/shell/Library_ooofilt.mk @@ -0,0 +1,90 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,ooofilt)) + +$(eval $(call gb_Library_set_include,ooofilt,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,ooofilt,\ + -DISOLATION_AWARE_ENABLED \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DXML_UNICODE \ + -D_NTSDK \ + -D_UNICODE \ +)) +$(eval $(call gb_Library_add_defs,ooofilt,\ + -U_WIN32_IE \ + -D_WIN32_IE=0x501 \ + -U_WIN32_WINNT \ + -D_WIN32_WINNT=0x0501 \ + -UNOMINMAX \ +)) + +$(eval $(call gb_Library_use_externals,ooofilt,\ + expat_utf16 \ + zlib \ +)) + +$(eval $(call gb_Library_use_libraries,ooofilt,\ + advapi32 \ + comctl32 \ + kernel32 \ + ole32 \ + shell32 \ + uuid \ + $(gb_Library_win32_OLDNAMES) \ +)) + +ifneq ($(COM),GCC) + +$(eval $(call gb_Library_use_libraries,ooofilt,\ + msvcprt \ +)) + +ifneq ($(PRODUCT),full) +$(eval $(call gb_Library_use_libraries,ooofilt,\ + msvcrt \ +)) +endif + +endif + +$(eval $(call gb_Library_use_static_libraries,ooofilt,\ + shell_xmlparser \ + shlxthandler_common \ +)) + +$(eval $(call gb_Library_add_exception_objects,ooofilt,\ + shell/source/win32/shlxthandler/ooofilt/ooofilt \ + shell/source/win32/shlxthandler/ooofilt/propspec \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk new file mode 100644 index 000000000000..270abfdf9744 --- /dev/null +++ b/shell/Library_ooofilt_x64.mk @@ -0,0 +1,85 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,ooofilt_x64)) + +$(eval $(call gb_Library_set_x64,ooofilt_x64,YES)) + +$(eval $(call gb_Library_set_include,ooofilt_x64,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,ooofilt_x64,\ + -DISOLATION_AWARE_ENABLED \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DXML_UNICODE \ + -D_NTSDK \ + -D_UNICODE \ + -UNOMINMAX \ +)) +$(eval $(call gb_Library_add_defs,ooofilt_x64,\ + -U_WIN32_IE \ + -D_WIN32_IE=0x501 \ + -U_WIN32_WINNT \ + -D_WIN32_WINNT=0x0501 \ +)) + +$(eval $(call gb_Library_use_externals,ooofilt_x64,\ + expat_utf16 \ + zlib \ +)) + +$(eval $(call gb_Library_use_libraries,ooofilt_x64,\ + advapi32 \ + comctl32 \ + gdi32 \ + gdiplus \ + kernel32 \ + msvcprt \ + msvcrt \ + ole32 \ + oleaut32 \ + propsys \ + shell32 \ + user32 \ + uuid \ + $(gb_Library_win32_OLDNAMES) \ +)) + +$(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\ + shell_xmlparser_x64 \ + shlxthandler_common_x64 \ +)) + +$(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\ + CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \ + CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk new file mode 100644 index 000000000000..250a53004516 --- /dev/null +++ b/shell/Library_propertyhdl.mk @@ -0,0 +1,92 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,propertyhdl)) + +$(eval $(call gb_Library_set_include,propertyhdl,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,propertyhdl,\ + -DISOLATION_AWARE_ENABLED \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DXML_UNICODE \ + -D_NTSDK \ + -D_UNICODE \ + -UNOMINMAX \ +)) +$(eval $(call gb_Library_add_defs,propertyhdl,\ + -U_WIN32_IE \ + -D_WIN32_IE=0x501 \ + -U_WIN32_WINNT \ + -D_WIN32_WINNT=0x0501 \ +)) + +$(eval $(call gb_Library_use_externals,propertyhdl,\ + expat_utf16 \ + zlib \ +)) + +$(eval $(call gb_Library_use_libraries,propertyhdl,\ + advapi32 \ + comctl32 \ + gdi32 \ + gdiplus \ + kernel32 \ + ole32 \ + oleaut32 \ + propsys \ + shell32 \ + shlwapi \ + uuid \ +)) + +ifneq ($(COM),GCC) + +$(eval $(call gb_Library_use_libraries,propertyhdl,\ + msvcprt \ +)) + +ifneq ($(PRODUCT),full) +$(eval $(call gb_Library_use_libraries,propertyhdl,\ +)) +endif + +endif + +$(eval $(call gb_Library_use_static_libraries,propertyhdl,\ + shell_xmlparser \ + shlxthandler_common \ +)) + +$(eval $(call gb_Library_add_exception_objects,propertyhdl,\ + shell/source/win32/shlxthandler/prophdl/propertyhdl \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk new file mode 100644 index 000000000000..af9fa2266101 --- /dev/null +++ b/shell/Library_propertyhdl_x64.mk @@ -0,0 +1,85 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,propertyhdl_x64)) + +$(eval $(call gb_Library_set_x64,propertyhdl_x64,YES)) + +$(eval $(call gb_Library_set_include,propertyhdl_x64,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,propertyhdl_x64,\ + -DISOLATION_AWARE_ENABLED \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DXML_UNICODE \ + -D_NTSDK \ + -D_UNICODE \ + -UNOMINMAX \ +)) +$(eval $(call gb_Library_add_defs,propertyhdl_x64,\ + -U_WIN32_IE \ + -D_WIN32_IE=0x501 \ + -U_WIN32_WINNT \ + -D_WIN32_WINNT=0x0501 \ +)) + +$(eval $(call gb_Library_use_externals,propertyhdl_x64,\ + expat_utf16 \ + zlib \ +)) + +$(eval $(call gb_Library_use_libraries,propertyhdl_x64,\ + advapi32 \ + comctl32 \ + gdi32 \ + gdiplus \ + kernel32 \ + msvcprt \ + msvcrt \ + ole32 \ + oleaut32 \ + propsys \ + shell32 \ + shlwapi \ + user32 \ + uuid \ + $(gb_Library_win32_OLDNAMES) \ +)) + +$(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\ + shell_xmlparser_x64 \ + shlxthandler_common_x64 \ +)) + +$(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\ + shell/source/win32/shlxthandler/prophdl/propertyhdl \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_recentfile.mk b/shell/Library_recentfile.mk new file mode 100644 index 000000000000..134847dae6fc --- /dev/null +++ b/shell/Library_recentfile.mk @@ -0,0 +1,53 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,recentfile)) + +$(eval $(call gb_Library_set_include,recentfile,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_use_externals,recentfile,\ + expat_utf16 \ +)) + +$(eval $(call gb_Library_use_libraries,recentfile,\ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_use_static_libraries,recentfile,\ + shell_xmlparser \ +)) + +$(eval $(call gb_Library_add_exception_objects,recentfile,\ + shell/source/unix/sysshell/recently_used_file \ + shell/source/unix/sysshell/recently_used_file_handler \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk new file mode 100644 index 000000000000..3464a66f451c --- /dev/null +++ b/shell/Library_shlxthdl.mk @@ -0,0 +1,87 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,shlxthdl)) + +$(eval $(call gb_Library_set_include,shlxthdl,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,shlxthdl,\ + -DISOLATION_AWARE_ENABLED \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DXML_UNICODE \ + -D_NTSDK \ + -D_UNICODE \ + -UNOMINMAX \ +)) +$(eval $(call gb_Library_add_defs,shlxthdl,\ + -U_WIN32_IE \ + -D_WIN32_IE=0x501 \ + -U_WIN32_WINNT \ + -D_WIN32_WINNT=0x0501 \ +)) + +$(eval $(call gb_Library_use_externals,shlxthdl,\ + expat_utf16 \ + zlib \ +)) + +$(eval $(call gb_Library_use_libraries,shlxthdl,\ + advapi32 \ + comctl32 \ + gdi32 \ + gdiplus \ + kernel32 \ + ole32 \ + oleaut32 \ + shell32 \ + shlwapi \ + uuid \ +)) + +$(eval $(call gb_Library_use_static_libraries,shlxthdl,\ + shlxthandler_common \ + shell_xmlparser \ +)) + +$(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl)) + +$(eval $(call gb_Library_add_exception_objects,shlxthdl,\ + shell/source/win32/shlxthandler/classfactory \ + shell/source/win32/shlxthandler/columninfo/columninfo \ + shell/source/win32/shlxthandler/infotips/infotips \ + shell/source/win32/shlxthandler/propsheets/document_statistic \ + shell/source/win32/shlxthandler/propsheets/listviewbuilder \ + shell/source/win32/shlxthandler/propsheets/propsheets \ + shell/source/win32/shlxthandler/shlxthdl \ + shell/source/win32/shlxthandler/thumbviewer/thumbviewer \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk new file mode 100644 index 000000000000..c6fd4006e8dc --- /dev/null +++ b/shell/Library_shlxthdl_x64.mk @@ -0,0 +1,93 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,shlxthdl_x64)) + +$(eval $(call gb_Library_set_x64,shlxthdl_x64,YES)) + +$(eval $(call gb_Library_set_include,shlxthdl_x64,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_Library_add_defs,shlxthdl_x64,\ + -DISOLATION_AWARE_ENABLED \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DXML_UNICODE \ + -D_NTSDK \ + -D_UNICODE \ + -UNOMINMAX \ +)) +$(eval $(call gb_Library_add_defs,shlxthdl_x64,\ + -U_WIN32_IE \ + -D_WIN32_IE=0x501 \ + -U_WIN32_WINNT \ + -D_WIN32_WINNT=0x0501 \ +)) + +$(eval $(call gb_Library_use_externals,shlxthdl_x64,\ + expat_utf16 \ + zlib \ +)) + +$(eval $(call gb_Library_use_libraries,shlxthdl_x64,\ + advapi32 \ + comctl32 \ + gdi32 \ + gdiplus \ + kernel32 \ + mvvcprt \ + msvcrt \ + ole32 \ + oleaut32 \ + shell32 \ + shlwapi \ + user32 \ + uuid \ + $(gb_Library_win32_OLDNAMES) \ +)) + +$(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\ + shlxthandler_common_x64 \ + shell_xmlparser_x64 \ +)) + +$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl)) + +$(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\ + CustomTarget/shell/source/win32/shlxthandler/classfactory \ + CustomTarget/shell/source/win32/shlxthandler/columninfo/columninfo \ + CustomTarget/shell/source/win32/shlxthandler/infotips/infotips \ + CustomTarget/shell/source/win32/shlxthandler/propsheets/document_statistic \ + CustomTarget/shell/source/win32/shlxthandler/propsheets/listviewbuilder \ + CustomTarget/shell/source/win32/shlxthandler/propsheets/propsheets \ + CustomTarget/shell/source/win32/shlxthandler/shlxthdl \ + CustomTarget/shell/source/win32/shlxthandler/thumbviewer/thumbviewer \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_smplmail.mk b/shell/Library_smplmail.mk new file mode 100644 index 000000000000..e8658f4923e0 --- /dev/null +++ b/shell/Library_smplmail.mk @@ -0,0 +1,54 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,smplmail)) + +$(eval $(call gb_Library_use_internal_api,smplmail,\ + smplmail \ +)) + +$(eval $(call gb_Library_use_libraries,smplmail,\ + advapi32 \ + cppu \ + cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_use_static_libraries,smplmail,\ + simplemapi \ +)) + +$(eval $(call gb_Library_set_componentfile,smplmail,shell/source/win32/simplemail/smplmail)) + +$(eval $(call gb_Library_add_exception_objects,smplmail,\ + shell/source/win32/simplemail/smplmailclient \ + shell/source/win32/simplemail/smplmailentry \ + shell/source/win32/simplemail/smplmailmsg \ + shell/source/win32/simplemail/smplmailsuppl \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_syssh.mk b/shell/Library_syssh.mk new file mode 100644 index 000000000000..6debc81d3de0 --- /dev/null +++ b/shell/Library_syssh.mk @@ -0,0 +1,52 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,syssh)) + +$(eval $(call gb_Library_use_internal_api,syssh,\ + syssh \ +)) + +$(eval $(call gb_Library_use_libraries,syssh,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_use_static_libraries,syssh,\ + shell_xmlparser \ +)) + +$(eval $(call gb_Library_set_componentfile,syssh,shell/source/unix/exec/syssh)) + +$(eval $(call gb_Library_add_exception_objects,syssh,\ + shell/source/unix/exec/shellexec \ + shell/source/unix/exec/shellexecentry \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_syssh_win.mk b/shell/Library_syssh_win.mk new file mode 100644 index 000000000000..15e73b296238 --- /dev/null +++ b/shell/Library_syssh_win.mk @@ -0,0 +1,50 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,syssh)) + +$(eval $(call gb_Library_use_internal_api,syssh,\ + syssh \ +)) + +$(eval $(call gb_Library_use_libraries,syssh,\ + cppu \ + cppuhelper \ + ole32 \ + sal \ + shell32 \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,syssh,shell/source/win32/syssh)) + +$(eval $(call gb_Library_add_exception_objects,syssh,\ + shell/source/win32/SysShExec \ + shell/source/win32/SysShentry \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_tdebe.mk b/shell/Library_tdebe.mk new file mode 100644 index 000000000000..aea171af95f8 --- /dev/null +++ b/shell/Library_tdebe.mk @@ -0,0 +1,57 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,tdebe1)) + +$(eval $(call gb_Library_use_packages,tdebe1,\ + shell_inc \ +)) + +$(eval $(call gb_Library_use_api,tdebe1,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_Library_use_externals,tdebe1,\ + tde \ +)) + +$(eval $(call gb_Library_use_libraries,tdebe1,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,tdebe1,shell/source/backends/kdebe/tdebe1)) + +$(eval $(call gb_Library_add_exception_objects,tdebe1,\ + shell/source/backends/kdebe/kdeaccess \ + shell/source/backends/kdebe/kdebackend \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Library_wininetbe.mk b/shell/Library_wininetbe.mk new file mode 100644 index 000000000000..c6ba04c0a856 --- /dev/null +++ b/shell/Library_wininetbe.mk @@ -0,0 +1,48 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,wininetbe1)) + +$(eval $(call gb_Library_use_internal_api,wininetbe1,\ + wininetbe \ +)) + +$(eval $(call gb_Library_use_libraries,wininetbe1,\ + cppu \ + cppuhelper \ + sal \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,wininetbe1,shell/source/backends/wininetbe/wininetbe1)) + +$(eval $(call gb_Library_add_exception_objects,wininetbe1,\ + shell/source/backends/wininetbe/wininetbackend \ + shell/source/backends/wininetbe/wininetbecdef \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Makefile b/shell/Makefile new file mode 100644 index 000000000000..ccb1c85a04da --- /dev/null +++ b/shell/Makefile @@ -0,0 +1,7 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk new file mode 100644 index 000000000000..6e3c2425c411 --- /dev/null +++ b/shell/Module_shell.mk @@ -0,0 +1,141 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,shell)) + +$(eval $(call gb_Module_add_targets,shell,\ + InternalUnoApi_localebe \ + Library_desktopbe \ + Library_localebe \ +)) + +ifeq ($(ENABLE_GCONF),TRUE) +$(eval $(call gb_Module_add_targets,shell,\ + Library_gconfbe \ +)) +endif + +ifeq ($(ENABLE_KDE4),TRUE) +$(eval $(call gb_Module_add_targets,shell,\ + Library_kde4be \ +)) +endif + +ifeq ($(ENABLE_KDE),TRUE) +$(eval $(call gb_Module_add_targets,shell,\ + Library_kdebe \ +)) +endif + +ifeq ($(ENABLE_TDE),TRUE) +$(eval $(call gb_Module_add_targets,shell,\ + Library_tdebe \ +)) +endif + +ifneq ($(filter TRUE,$(ENABLE_KDE) $(ENABLE_TDE)),) +$(eval $(call gb_Module_add_targets,shell,\ + Package_inc \ +)) +endif + +ifeq ($(GUI),WNT) + +$(eval $(call gb_Module_add_targets,shell,\ + Executable_regsvrex \ + Executable_senddoc \ + InternalUnoApi_smplmail \ + InternalUnoApi_syssh_win \ + InternalUnoApi_wininetbe \ + Library_smplmail \ + Library_syssh_win \ + Library_wininetbe \ + StaticLibrary_simplemapi \ +)) + +ifneq ($(COM),GCC) +$(eval $(call gb_Module_add_targets,shell,\ + CustomTarget_shlxthdl_res \ + Library_ooofilt \ + Library_propertyhdl \ + Library_shlxthdl \ + StaticLibrary_shlxthandler_common \ + StaticLibrary_xmlparser \ + WinResTarget_shlxthdl \ +)) +endif + +ifeq ($(BUILD_X64),YES) +$(eval $(call gb_Module_add_targets,shell,\ + CustomTarget_x64 \ + Library_ooofilt_x64 \ + Library_propertyhdl_x64 \ + Library_shlxthdl_x64 \ + StaticLibrary_shlxthandler_common_x64 \ + StaticLibrary_xmlparser_x64 \ +)) +endif + +endif + +ifeq ($(OS),MACOSX) +$(eval $(call gb_Module_add_targets,shell,\ + InternalUnoApi_macbe \ + Library_macbe \ +)) +endif + +ifeq ($(filter DESKTOP,$(BUILD_TYPE)),DESKTOP) + +$(eval $(call gb_Module_add_targets,shell,\ + Executable_lngconvex \ +)) + +ifeq ($(GUI),UNX) + +$(eval $(call gb_Module_add_targets,shell,\ + Executable_gnome_open_url \ + Executable_uri_encode \ + InternalUnoApi_cmdmail \ + InternalUnoApi_syssh \ + Library_cmdmail \ + Library_syssh \ + Package_scripts \ + StaticLibrary_xmlparser \ +)) + +ifneq ($(filter-out MACOSX IOS ANDROID,$(OS)),) +$(eval $(call gb_Module_add_targets,shell,\ + Library_recentfile \ +)) +endif + +endif + +endif + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_inc.mk b/shell/Package_inc.mk new file mode 100644 index 000000000000..368ac361ca0d --- /dev/null +++ b/shell/Package_inc.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,shell_inc,$(SRCDIR)/shell/inc/shell)) + +$(eval $(call gb_Package_add_files,shell_inc,inc/shell,\ + kde_headers.h \ + tde_defines.h \ + tde_headers.h \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/Package_scripts.mk b/shell/Package_scripts.mk new file mode 100644 index 000000000000..568ae916e49a --- /dev/null +++ b/shell/Package_scripts.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,shell_scripts,$(SRCDIR)/shell/source/unix/misc)) + +$(eval $(call gb_Package_add_file,shell_scripts,bin/cde-open-url,cde-open-url.sh)) +$(eval $(call gb_Package_add_file,shell_scripts,bin/gnome-open-url,gnome-open-url.sh)) +$(eval $(call gb_Package_add_file,shell_scripts,bin/kde-open-url,kde-open-url.sh)) +$(eval $(call gb_Package_add_file,shell_scripts,bin/open-url,open-url.sh)) +$(eval $(call gb_Package_add_file,shell_scripts,bin/senddoc,senddoc.sh)) +$(eval $(call gb_Package_add_file,shell_scripts,bin/tde-open-url,tde-open-url.sh)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/StaticLibrary_shlxthandler_common.mk b/shell/StaticLibrary_shlxthandler_common.mk new file mode 100644 index 000000000000..057b80922fe0 --- /dev/null +++ b/shell/StaticLibrary_shlxthandler_common.mk @@ -0,0 +1,71 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_StaticLibrary_StaticLibrary,shlxthandler_common)) + +$(eval $(call gb_StaticLibrary_set_include,shlxthandler_common,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ + -DISOLATION_AWARE_ENABLED \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DXML_UNICODE \ + -D_NTSDK \ + -D_UNICODE \ +)) +$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common,\ + -U_WIN32_IE \ + -D_WIN32_IE=0x501 \ + -U_WIN32_WINNT \ + -D_WIN32_WINNT=0x0501 \ +)) + +$(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common,\ + expat_utf16 \ + zlib \ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,shlxthandler_common,\ + shell/source/win32/ooofilereader/autostyletag \ + shell/source/win32/ooofilereader/basereader \ + shell/source/win32/ooofilereader/contentreader \ + shell/source/win32/ooofilereader/keywordstag \ + shell/source/win32/ooofilereader/metainforeader \ + shell/source/win32/ooofilereader/simpletag \ + shell/source/win32/shlxthandler/ooofilt/stream_helper \ + shell/source/win32/shlxthandler/util/fileextensions \ + shell/source/win32/shlxthandler/util/iso8601_converter \ + shell/source/win32/shlxthandler/util/registry \ + shell/source/win32/shlxthandler/util/utilities \ + shell/source/win32/zipfile/zipexcptn \ + shell/source/win32/zipfile/zipfile \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/StaticLibrary_shlxthandler_common_x64.mk b/shell/StaticLibrary_shlxthandler_common_x64.mk new file mode 100644 index 000000000000..b0d012456a66 --- /dev/null +++ b/shell/StaticLibrary_shlxthandler_common_x64.mk @@ -0,0 +1,73 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_StaticLibrary_StaticLibrary,shlxthandler_common_x64)) + +$(eval $(call gb_StaticLibrary_set_x64,shlxthandler_common_x64,YES)) + +$(eval $(call gb_StaticLibrary_set_include,shlxthandler_common_x64,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ + -DISOLATION_AWARE_ENABLED \ + -DUNICODE \ + -DWIN32_LEAN_AND_MEAN \ + -DXML_UNICODE \ + -D_NTSDK \ + -D_UNICODE \ +)) +$(eval $(call gb_StaticLibrary_add_defs,shlxthandler_common_x64,\ + -U_WIN32_IE \ + -D_WIN32_IE=0x501 \ + -U_WIN32_WINNT \ + -D_WIN32_WINNT=0x0501 \ +)) + +$(eval $(call gb_StaticLibrary_use_externals,shlxthandler_common_x64,\ + expat_utf16 \ + zlib \ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,shlxthandler_common_x64,\ + CustomTarget/shell/source/win32/ooofilereader/autostyletag \ + CustomTarget/shell/source/win32/ooofilereader/basereader \ + CustomTarget/shell/source/win32/ooofilereader/contentreader \ + CustomTarget/shell/source/win32/ooofilereader/keywordstag \ + CustomTarget/shell/source/win32/ooofilereader/metainforeader \ + CustomTarget/shell/source/win32/ooofilereader/simpletag \ + CustomTarget/shell/source/win32/shlxthandler/ooofilt/stream_helper \ + CustomTarget/shell/source/win32/shlxthandler/util/fileextensions \ + CustomTarget/shell/source/win32/shlxthandler/util/iso8601_converter \ + CustomTarget/shell/source/win32/shlxthandler/util/registry \ + CustomTarget/shell/source/win32/shlxthandler/util/utilities \ + CustomTarget/shell/source/win32/zipfile/zipexcptn \ + CustomTarget/shell/source/win32/zipfile/zipfile \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/StaticLibrary_simplemapi.mk b/shell/StaticLibrary_simplemapi.mk new file mode 100644 index 000000000000..690ca911b164 --- /dev/null +++ b/shell/StaticLibrary_simplemapi.mk @@ -0,0 +1,34 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_StaticLibrary_StaticLibrary,simplemapi)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,simplemapi,\ + shell/source/win32/simplemail/simplemapi \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/StaticLibrary_xmlparser.mk b/shell/StaticLibrary_xmlparser.mk new file mode 100644 index 000000000000..13638bf0cc20 --- /dev/null +++ b/shell/StaticLibrary_xmlparser.mk @@ -0,0 +1,49 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_StaticLibrary_StaticLibrary,shell_xmlparser)) + +$(eval $(call gb_StaticLibrary_set_include,shell_xmlparser,\ + -I$(SRCDIR)/shell/inc \ + $$(INCLUDE) \ +)) + +ifeq ($(GUI),WNT) +$(eval $(call gb_StaticLibrary_add_defs,shell_xmlparser,\ + -DXML_UNICODE \ +)) +endif + +$(eval $(call gb_StaticLibrary_use_externals,shell_xmlparser,\ + expat_utf16 \ +)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser,\ + shell/source/all/xml_parser \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/StaticLibrary_xmlparser_x64.mk b/shell/StaticLibrary_xmlparser_x64.mk new file mode 100644 index 000000000000..67c71c8d0373 --- /dev/null +++ b/shell/StaticLibrary_xmlparser_x64.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_StaticLibrary_StaticLibrary,shell_xmlparser_x64)) + +$(eval $(call gb_StaticLibrary_set_x64,shell_xmlparser_x64,YES)) + +$(eval $(call gb_StaticLibrary_add_exception_objects,shell_xmlparser_x64,\ + CustomTarget/shell/source/all/xml_parser \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/WinResTarget_shlxthdl.mk b/shell/WinResTarget_shlxthdl.mk new file mode 100644 index 000000000000..4c3478b71804 --- /dev/null +++ b/shell/WinResTarget_shlxthdl.mk @@ -0,0 +1,40 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_WinResTarget_WinResTarget,shlxthdl)) + +$(eval $(call gb_WinResTarget_set_include,shlxthdl,\ + $$(INCLUDE) \ + -I$(WORKDIR)/CustomTarget/shell/source/win32/shlxthandler/res \ + -I$(SRCDIR)/shell/inc \ +)) + +$(eval $(call gb_WinResTarget_add_file,shlxthdl,shell/source/win32/shlxthandler/res/shlxthdl)) + +$(call gb_WinResTarget_get_target,shlxthdl) : $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/internal/stream_helper.hxx index 72eaf7355b2c..b1949fdbfda5 100644 --- a/shell/inc/internal/stream_helper.hxx +++ b/shell/inc/internal/stream_helper.hxx @@ -31,6 +31,8 @@ #include "internal/types.hxx" +class IStream; + class BufferStream : public StreamInterface { public: diff --git a/shell/inc/makefile.mk b/shell/inc/makefile.mk deleted file mode 100644 index 0cef5fadb652..000000000000 --- a/shell/inc/makefile.mk +++ /dev/null @@ -1,39 +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=shell -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/shell/prj/build.lst b/shell/prj/build.lst index 6dc5270a2b8b..7ce3d91f6edc 100644 --- a/shell/prj/build.lst +++ b/shell/prj/build.lst @@ -1,29 +1,2 @@ sl shell : TRANSLATIONS:translations offapi DESKTOP:rdbmaker tools sal EXPAT:expat LIBXSLT:libxslt NULL -sl shell\inc nmake - all sl_inc NULL -sl shell\source\win32 nmake - w sl_win32 sl_inc NULL -sl shell\source\win32\simplemail nmake - w sl_win32_simplemail sl_inc NULL -sl shell\source\unix\exec nmake - u sl_unix sl_inc NULL -sl shell\source\unix\misc nmake - u sl_unix_misc sl_inc NULL -sl shell\source\cmdmail nmake - u sl_cmdmail sl_inc NULL -sl shell\source\all nmake - all sl_all sl_inc NULL -sl shell\source\unix\sysshell nmake - u sl_unix_sysshell sl_all sl_inc NULL -sl shell\source\tools\lngconvex nmake - all sl_win32_lngconv sl_inc NULL -sl shell\source\tools\regsvrex nmake - w sl_win32_regsvrex sl_inc NULL -sl shell\source\win32\zipfile nmake - w sl_win32_zipfile sl_inc NULL -sl shell\source\win32\ooofilereader nmake - w sl_win32_ooofilereader sl_win32_zipfile.w sl_all sl_inc NULL -sl shell\source\win32\shlxthandler\res nmake - w sl_win32_shlxthandler_res sl_win32_lngconv.w sl_inc NULL -sl shell\source\win32\shlxthandler\util nmake - w sl_win32_shlxthandler_util sl_inc NULL -sl shell\source\win32\shlxthandler\propsheets nmake - w sl_win32_shlxthandler_propsheets sl_inc NULL -sl shell\source\win32\shlxthandler\infotips nmake - w sl_win32_shlxthandler_infotips sl_inc NULL -sl shell\source\win32\shlxthandler\columninfo nmake - w sl_win32_shlxthandler_columninfo sl_inc NULL -sl shell\source\win32\shlxthandler\thumbviewer nmake - w sl_win32_shlxthandler_thumbviewer sl_inc NULL -sl shell\source\win32\shlxthandler\prophdl nmake - w sl_win32_shlxthandler_prophdl sl_win32_shlxthandler_ooofilt.w sl_inc NULL -sl shell\source\win32\shlxthandler nmake - w sl_win32_shlxthandler sl_win32_lngconv.w sl_win32_shlxthandler_res.w sl_win32_shlxthandler_util.w sl_win32_zipfile.w sl_win32_ooofilereader.w sl_win32_shlxthandler_propsheets.w sl_win32_shlxthandler_infotips.w sl_win32_shlxthandler_columninfo.w sl_win32_shlxthandler_thumbviewer.w sl_win32_shlxthandler_prophdl.w sl_inc sl_win32_shlxthandler_ooofilt.w NULL -sl shell\source\backends\localebe nmake - all sl_backends_localebe sl_inc NULL -sl shell\source\backends\wininetbe nmake - w sl_backends_wininetbe sl_inc NULL -sl shell\source\backends\macbe nmake - u sl_backends_macbe sl_inc NULL -sl shell\source\backends\gconfbe nmake - u sl_backends_gconfbe sl_inc NULL -sl shell\source\backends\kdebe nmake - u sl_backends_kdebe sl_inc NULL -sl shell\source\backends\kde4be nmake - u sl_backends_kde4be sl_inc NULL -sl shell\source\backends\desktopbe nmake - u sl_backends_desktopbe sl_inc NULL -sl shell\source\win32\shlxthandler\ooofilt nmake - w sl_win32_shlxthandler_ooofilt sl_win32_zipfile.w sl_win32_ooofilereader.w sl_win32_shlxthandler_util.w sl_all sl_inc NULL +sl shell\prj nmake - all sl_prj NULL diff --git a/shell/prj/d.lst b/shell/prj/d.lst index 435ed347a4e9..e69de29bb2d1 100644 --- a/shell/prj/d.lst +++ b/shell/prj/d.lst @@ -1,39 +0,0 @@ -..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib -..\%__SRC%\slb\*.a %_DEST%\lib\*.a -..\%__SRC%\lib\lib*.so %_DEST%\lib -..\%__SRC%\lib\*.uno.so %_DEST%\lib\*.uno.so -..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll -..\%__SRC%\bin\*.exe %_DEST%\bin\*.exe -..\%__SRC%\bin\x64\shlxthdl.dll %_DEST%\bin\shlxthdl_x64.dll -..\%__SRC%\bin\x64\ooofiltproxy.dll %_DEST%\bin\ooofiltproxy_x64.dll -..\%__SRC%\bin\x64\ooofilt.dll %_DEST%\bin\ooofilt_x64.dll -..\%__SRC%\bin\x64\propertyhdl.dll %_DEST%\bin\propertyhdl_x64.dll -..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib -..\%__SRC%\lib\*.a %_DEST%\lib\*.a -..\%__SRC%\misc\cmdmail.component %_DEST%\xml\cmdmail.component - -..\%__SRC%\bin\open-url %_DEST%\bin\open-url -..\%__SRC%\bin\cde-open-url %_DEST%\bin\cde-open-url -..\%__SRC%\bin\tde-open-url %_DEST%\bin\tde-open-url -..\%__SRC%\bin\kde-open-url %_DEST%\bin\kde-open-url -..\%__SRC%\bin\gnome-open-url %_DEST%\bin\gnome-open-url -..\%__SRC%\bin\gnome-open-url.bin %_DEST%\bin\gnome-open-url.bin -..\%__SRC%\bin\senddoc %_DEST%\bin\senddoc -..\%__SRC%\bin\uri-encode %_DEST%\bin\uri-encode -..\%__SRC%\bin\lngconvex %_DEST%\bin\lngconvex - -..\%__SRC%\misc\*.xml %_DEST%\xml\*.xml - -..\%__SRC%\misc\desktopbe1.component %_DEST%\xml\desktopbe1.component -..\%__SRC%\misc\gconfbe1.component %_DEST%\xml\gconfbe1.component -..\%__SRC%\misc\tdebe1.component %_DEST%\xml\tdebe1.component -..\%__SRC%\misc\kde4be1.component %_DEST%\xml\kde4be1.component -..\%__SRC%\misc\kdebe1.component %_DEST%\xml\kdebe1.component -..\inc\shell\tde_headers.h %_DEST%\inc\shell\tde_headers.h -..\inc\shell\tde_defines.h %_DEST%\inc\shell\tde_defines.h -..\inc\shell\kde_headers.h %_DEST%\inc\shell\kde_headers.h -..\%__SRC%\misc\localebe1.component %_DEST%\xml\localebe1.component -..\%__SRC%\misc\macbe1.component %_DEST%\xml\macbe1.component -..\%__SRC%\misc\smplmail.component %_DEST%\xml\smplmail.component -..\%__SRC%\misc\syssh.component %_DEST%\xml\syssh.component -..\%__SRC%\misc\wininetbe1.component %_DEST%\xml\wininetbe1.component diff --git a/shell/prj/dmake b/shell/prj/dmake deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/shell/prj/dmake +++ /dev/null diff --git a/shell/source/all/makefile.mk b/shell/source/all/makefile.mk deleted file mode 100644 index 8791e62a8717..000000000000 --- a/shell/source/all/makefile.mk +++ /dev/null @@ -1,74 +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=shell -TARGET=xmlparser -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN = TRUE - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(GUI)" == "WNT" -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.ENDIF # "$(BUILD_X64)"!="" -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - -SLOFILES=$(SLO)$/xml_parser.obj - -.IF "$(BUILD_X64)"!="" -SLOFILES_X64=$(SLO_X64)$/xml_parser.obj -.ENDIF # "$(BUILD_X64)"!="" - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -.IF "$(OS)" == "WNT" -INCLUDE!:=$(subst,/stl, $(INCLUDE)) -.ENDIF -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/backends/desktopbe/makefile.mk b/shell/source/backends/desktopbe/makefile.mk deleted file mode 100644 index 7c6d6381a5a8..000000000000 --- a/shell/source/backends/desktopbe/makefile.mk +++ /dev/null @@ -1,59 +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 = shell -TARGET = desktopbe - -ENABLE_EXCEPTIONS = TRUE -VISIBILITY_HIDDEN = TRUE - -.INCLUDE: settings.mk - -DLLPRE = - -SLOFILES = $(SLO)/desktopbackend.obj - -SHL1IMPLIB = i$(SHL1TARGET) -SHL1OBJS = $(SLOFILES) -SHL1STDLIBS = \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) -SHL1TARGET = $(ENFORCEDSHLPREFIX)desktopbe1.uno -SHL1USE_EXPORTS = name -DEF1NAME = $(SHL1TARGET) - -.INCLUDE: target.mk - -ALLTAR : $(MISC)/desktopbe1.component - -$(MISC)/desktopbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - desktopbe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt desktopbe1.component diff --git a/shell/source/backends/gconfbe/makefile.mk b/shell/source/backends/gconfbe/makefile.mk deleted file mode 100644 index 84ec3dbee57b..000000000000 --- a/shell/source/backends/gconfbe/makefile.mk +++ /dev/null @@ -1,97 +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=shell -TARGET=gconfbe - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# no "lib" prefix -DLLPRE = - -.IF "$(ENABLE_LOCKDOWN)" == "YES" -CFLAGS+=-DENABLE_LOCKDOWN -.ENDIF - -.IF "$(ENABLE_GCONF)"!="" -COMPILER_WARN_ALL=TRUE -PKGCONFIG_MODULES=gconf-2.0 gobject-2.0 glib-2.0 -.INCLUDE: pkg_config.mk - -.IF "$(OS)" == "SOLARIS" -LINKFLAGS+=-z nodefs -.ENDIF # "$(OS)" == "SOLARIS" - -.IF "$(OS)" == "LINUX" -# hack for faked SO environment -CFLAGS+=-gdwarf-2 -PKGCONFIG_LIBS!:=-Wl,--export-dynamic $(PKGCONFIG_LIBS) -.ENDIF - -# --- Files --- - - -SLOFILES=\ - $(SLO)$/gconfaccess.obj \ - $(SLO)$/gconfbackend.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1STDLIBS+=$(PKGCONFIG_LIBS) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -.ENDIF # "$(ENABLE_GCONF)"!="" - -# --- Targets --- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/gconfbe1.component - -$(MISC)/gconfbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - gconfbe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt gconfbe1.component diff --git a/shell/source/backends/kde4be/makefile.mk b/shell/source/backends/kde4be/makefile.mk deleted file mode 100644 index 477e47ca6100..000000000000 --- a/shell/source/backends/kde4be/makefile.mk +++ /dev/null @@ -1,87 +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=shell -TARGET=kde4be - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# For some of the included external KDE headers, GCC complains about shadowed -# symbols in instantiated template code only at the end of a compilation unit, -# so the only solution is to disable that warning here: -.IF "$(COM)" == "GCC" -CFLAGSCXX+=-Wno-shadow -.ENDIF - -# no "lib" prefix -DLLPRE = - -.IF "$(ENABLE_KDE4)" == "TRUE" - -CFLAGS+=$(KDE4_CFLAGS) - -# --- Files --- - -SLOFILES=\ - $(SLO)$/kde4access.obj \ - $(SLO)$/kde4backend.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(KDE4_LIBS) -lkio - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -.ENDIF - -# --- Targets --- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/kde4be1.component - -$(MISC)/kde4be1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - kde4be1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt kde4be1.component diff --git a/shell/source/backends/kdebe/makefile.mk b/shell/source/backends/kdebe/makefile.mk deleted file mode 100644 index 948d1a590f3e..000000000000 --- a/shell/source/backends/kdebe/makefile.mk +++ /dev/null @@ -1,123 +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=shell - -TARGET=kdebe -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# For some of the included external KDE headers, GCC complains about shadowed -# symbols in instantiated template code only at the end of a compilation unit, -# so the only solution is to disable that warning here: -.IF "$(COM)" == "GCC" -CFLAGSCXX+=-Wno-shadow -.ENDIF - -# no "lib" prefix -DLLPRE = - -.IF "$(ENABLE_TDE)" == "TRUE" -TARGET=tdebe - -CFLAGS+=$(TDE_CFLAGS) -CFLAGS+=-DENABLE_TDE -CFLAGSCXX+=-DENABLE_TDE - -# --- Files --- - -SLOFILES=\ - $(SLO)$/kdeaccess.obj \ - $(SLO)$/kdebackend.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(TDE_LIBS) \ - -lkio - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -.ENDIF # "$(ENABLE_TDE)" == "TRUE" - -.IF "$(ENABLE_KDE)" == "TRUE" -TARGET=kdebe - -CFLAGS+=$(KDE_CFLAGS) - -# --- Files --- - -SLOFILES=\ - $(SLO)$/kdeaccess.obj \ - $(SLO)$/kdebackend.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(KDE_LIBS) \ - -lkio - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -.ENDIF # "$(ENABLE_KDE)" == "TRUE" - -# --- Targets --- - -.INCLUDE : target.mk - -.IF "$(ENABLE_KDE)" == "TRUE" || "$(ENABLE_TDE)" == "TRUE" - -ALLTAR : $(MISC)/$(TARGET)1.component - -$(MISC)/$(TARGET)1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - $(TARGET)1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt $(TARGET)1.component -.ENDIF diff --git a/shell/source/backends/localebe/localebe.xml b/shell/source/backends/localebe/localebe.xml index 3c22a4970881..2d7056242892 100755 --- a/shell/source/backends/localebe/localebe.xml +++ b/shell/source/backends/localebe/localebe.xml @@ -11,13 +11,17 @@ <status value="beta"/> <supported-service>com.sun.star.comp.configuration.backend.LocaleBackend</supported-service> <service-dependency>...</service-dependency> + <type>com.sun.star.beans.Optional</type> + <type>com.sun.star.beans.XPropertySet</type> <type>com.sun.star.configuration.backend.XBackendChangesListener</type> <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type> <type>com.sun.star.configuration.backend.XLayerHandler</type> <type>com.sun.star.configuration.backend.XSingleLayerStratum</type> <type>com.sun.star.lang.XMultiComponentFactory</type> + <type>com.sun.star.lang.XMultiServiceFactory</type> <type>com.sun.star.lang.XServiceInfo</type> <type>com.sun.star.lang.XSingleComponentFactory</type> + <type>com.sun.star.lang.XSingleServiceFactory</type> <type>com.sun.star.lang.XTypeProvider</type> <type>com.sun.star.uno.TypeClass</type> <type>com.sun.star.uno.XAggregation</type> diff --git a/shell/source/backends/localebe/makefile.mk b/shell/source/backends/localebe/makefile.mk deleted file mode 100644 index 33b741230e61..000000000000 --- a/shell/source/backends/localebe/makefile.mk +++ /dev/null @@ -1,80 +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=shell -TARGET=localebe - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -COMP1TYPELIST=$(TARGET) - -# --- Settings --- - -.INCLUDE : settings.mk - -DLLPRE = - -# --- Files --- - -SLOFILES=\ - $(SLO)$/localebecdef.obj \ - $(SLO)$/localebackend.obj - -SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) - -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -.IF "$(OS)"=="MACOSX" -SHL1STDLIBS+= -framework CoreServices -.ENDIF - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -# --- Targets --- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/localebe1.component - -$(MISC)/localebe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - localebe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt localebe1.component diff --git a/shell/source/backends/macbe/makefile.mk b/shell/source/backends/macbe/makefile.mk deleted file mode 100644 index 50b67916d587..000000000000 --- a/shell/source/backends/macbe/makefile.mk +++ /dev/null @@ -1,86 +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=shell -TARGET=macbe - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -COMP1TYPELIST=$(TARGET) - -# --- Settings --- - -.INCLUDE : settings.mk - -DLLPRE = - -# --- Files --- - -.IF "$(OS)" != "MACOSX" - -dummy: -# nothing - -.ELSE - -CFLAGSCXX+=$(OBJCXXFLAGS) - -SLOFILES= \ - $(SLO)$/macbecdef.obj \ - $(SLO)$/macbackend.obj - -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - -framework Cocoa -framework SystemConfiguration - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -# --- Targets --- - -.INCLUDE : target.mk - -.ENDIF # "$(OS)" != "MACOSX" - -ALLTAR : $(MISC)/macbe1.component - -$(MISC)/macbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - macbe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt macbe1.component diff --git a/shell/source/backends/wininetbe/makefile.mk b/shell/source/backends/wininetbe/makefile.mk deleted file mode 100644 index 7d8a6be14b21..000000000000 --- a/shell/source/backends/wininetbe/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=shell -TARGET=wininetbe - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -COMP1TYPELIST=$(TARGET) - -# --- Settings --- - -.INCLUDE : settings.mk - -DLLPRE = - -# --- Files --- - - -SLOFILES=\ - $(SLO)$/wininetbecdef.obj \ - $(SLO)$/wininetbackend.obj - -SHL1TARGET=$(TARGET)1.uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -# --- Targets --- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/wininetbe1.component - -$(MISC)/wininetbe1.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - wininetbe1.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt wininetbe1.component diff --git a/shell/source/backends/wininetbe/wininetbe.xml b/shell/source/backends/wininetbe/wininetbe.xml index 1bf4bd2cd053..ac277ce50307 100755 --- a/shell/source/backends/wininetbe/wininetbe.xml +++ b/shell/source/backends/wininetbe/wininetbe.xml @@ -11,13 +11,17 @@ <status value="beta"/> <supported-service>com.sun.star.comp.configuration.backend.Win32Backend</supported-service> <service-dependency>...</service-dependency> + <type>com.sun.star.beans.Optional</type> + <type>com.sun.star.beans.XPropertySet</type> <type>com.sun.star.configuration.backend.XBackendChangesListener</type> <type>com.sun.star.configuration.backend.XBackendChangesNotifier</type> <type>com.sun.star.configuration.backend.XLayerHandler</type> <type>com.sun.star.configuration.backend.XSingleLayerStratum</type> <type>com.sun.star.lang.XMultiComponentFactory</type> + <type>com.sun.star.lang.XMultiServiceFactory</type> <type>com.sun.star.lang.XServiceInfo</type> <type>com.sun.star.lang.XSingleComponentFactory</type> + <type>com.sun.star.lang.XSingleServiceFactory</type> <type>com.sun.star.lang.XTypeProvider</type> <type>com.sun.star.uno.TypeClass</type> <type>com.sun.star.uno.XAggregation</type> diff --git a/shell/source/cmdmail/cmdmail.xml b/shell/source/cmdmail/cmdmail.xml index 51de9cc1e4da..7d451f1c9952 100755 --- a/shell/source/cmdmail/cmdmail.xml +++ b/shell/source/cmdmail/cmdmail.xml @@ -25,6 +25,7 @@ <type> com.sun.star.lang.XTypeProvider </type> <type> com.sun.star.lang.IllegalArgumentException </type> <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.uno.DeploymentException </type> <type> com.sun.star.uno.RuntimeException </type> <type> com.sun.star.uno.TypeClass </type> <type> com.sun.star.uno.XWeak </type> diff --git a/shell/source/cmdmail/makefile.mk b/shell/source/cmdmail/makefile.mk deleted file mode 100644 index b658108fb845..000000000000 --- a/shell/source/cmdmail/makefile.mk +++ /dev/null @@ -1,78 +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=shell -TARGET=cmdmail -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)" - -ALL: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -DLLPRE= - -SLOFILES= \ - $(SLO)$/cmdmailsuppl.obj \ - $(SLO)$/cmdmailmsg.obj \ - $(SLO)$/cmdmailentry.obj -SHL1OBJS=$(SLOFILES) - -SHL1TARGET=$(TARGET).uno -SHL1IMPLIB=i$(TARGET) - -SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/cmdmail.component - -$(MISC)/cmdmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - cmdmail.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt cmdmail.component diff --git a/shell/source/tools/lngconvex/makefile.mk b/shell/source/tools/lngconvex/makefile.mk deleted file mode 100644 index 4d3971b81490..000000000000 --- a/shell/source/tools/lngconvex/makefile.mk +++ /dev/null @@ -1,66 +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=shell -TARGET=lngconvex -TARGETTYPE=CUI -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/DESKTOP//)" -ALL: - @echo No need for this on non-desktop OSes -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(COM)"=="GCC" -CFLAGS+=-fno-inline -D_NTSDK -.ELSE -CFLAGS+=-Ob0 -D_NTSDK -.ENDIF - -APP1TARGET=$(TARGET) -APP1OBJS=$(OBJ)$/$(TARGET).obj\ - $(OBJ)$/cmdline.obj -APP1RPATH = NONE -APP1STDLIBS= \ - $(COMPHELPERLIB)\ - $(SALLIB)\ - $(TOOLSLIB)\ - $(I18NISOLANGLIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/shell/source/tools/regsvrex/makefile.mk b/shell/source/tools/regsvrex/makefile.mk deleted file mode 100644 index 2eb8dbf48481..000000000000 --- a/shell/source/tools/regsvrex/makefile.mk +++ /dev/null @@ -1,49 +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=shell -TARGET=regsvrex -TARGETTYPE=CUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -OBJFILES=$(OBJ)$/regsvrex.obj -APP1TARGET=$(TARGET) -APP1OBJS=$(OBJFILES) -APP1STDLIBS=$(KERNEL32LIB) -APP1DEF=$(MISC)$/$(APP1TARGET).def - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - diff --git a/shell/source/unix/exec/makefile.mk b/shell/source/unix/exec/makefile.mk deleted file mode 100644 index 453609b53a51..000000000000 --- a/shell/source/unix/exec/makefile.mk +++ /dev/null @@ -1,101 +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=shell -TARGET=exec - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -COMP1TYPELIST=syssh - -TESTAPP1=urltest - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)" - -ALL: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -DLLPRE= - -SLOFILES=$(SLO)$/shellexec.obj\ - $(SLO)$/shellexecentry.obj - -SHL1OBJS=$(SLOFILES) - -SHL1TARGET=syssh.uno -SHL1IMPLIB= - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB) -SHL1LIBS= -SHL1DEPN= - -.IF "$(test)" != "" - -APP1TARGET=$(TESTAPP1) -APP1STDLIBS= $(SHL1STDLIBS) -APP1OBJS= \ - $(SLO)$/shellexec.obj \ - $(SLO)$/$(APP1TARGET).obj - -.ENDIF # "$(test)" != "" - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -run_test : $(BIN)$/$(TESTAPP1).sh - dmake test=t - $(BIN)$/$(TESTAPP1) urltest.txt - -$(BIN)$/$(TESTAPP1).sh : $$(@:f) - $(COPY) $< $@ - -chmod +x $@ - -ALLTAR : $(MISC)/syssh.component - -$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - syssh.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/unix/exec/syssh.xml b/shell/source/unix/exec/syssh.xml index 5c72befa9141..1b9e28c37fe8 100755 --- a/shell/source/unix/exec/syssh.xml +++ b/shell/source/unix/exec/syssh.xml @@ -15,13 +15,20 @@ <type>com.sun.star.system.SystemShellExecuteException</type> <type>com.sun.star.system.SystemShellExecuteFlags</type> <type>com.sun.star.lang.IllegalArgumentException</type> + <type>com.sun.star.lang.XMultiServiceFactory</type> <type>com.sun.star.lang.XServiceInfo</type> <type>com.sun.star.lang.XSingleComponentFactory</type> + <type>com.sun.star.lang.XSingleServiceFactory</type> <type>com.sun.star.lang.XTypeProvider</type> + <type>com.sun.star.uno.DeploymentException</type> <type>com.sun.star.uno.TypeClass</type> <type>com.sun.star.uno.XAggregation</type> <type>com.sun.star.uno.XComponentContext</type> + <type>com.sun.star.uno.XCurrentContext</type> <type>com.sun.star.uno.XWeak</type> + <type>com.sun.star.uri.ExternalUriReferenceTranslator</type> + <type>com.sun.star.uri.UriReferenceFactory</type> + <type>com.sun.star.util.XMacroExpander</type> <type>com.sun.star.registry.XRegistryKey</type> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> diff --git a/shell/source/unix/misc/makefile.mk b/shell/source/unix/misc/makefile.mk deleted file mode 100644 index 39752bdc4644..000000000000 --- a/shell/source/unix/misc/makefile.mk +++ /dev/null @@ -1,83 +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=shell -TARGET=misc - -LIBTARGET=NO -TARGETTYPE=CUI -NO_DEFAULT_STL=TRUE -LIBSALCPPRT=$(0) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)" - -ALL: -# nothing - -.ENDIF - -# --- Files -------------------------------------------------------- - -SCRIPTFILES = \ - $(BIN)$/senddoc \ - $(BIN)$/open-url \ - $(BIN)$/cde-open-url \ - $(BIN)$/gnome-open-url \ - $(BIN)$/tde-open-url \ - $(BIN)$/kde-open-url - -APP1TARGET = gnome-open-url.bin -APP1OBJS = \ - $(OBJ)$/gnome-open-url.obj -APP1LIBS = -APP1RPATH = OOO -.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && \ - "$(OS)"!="DRAGONFLY" -APP1STDLIBS=-ldl -.ENDIF - -APP2TARGET = uri-encode -APP2OBJS = $(OBJ)$/uri-encode.obj -APP2LIBS = -APP2RPATH = OOO -APP2STDLIBS = - -OBJFILES = $(APP1OBJS) $(APP2OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(SCRIPTFILES) $(AWKFILES) - -$(SCRIPTFILES) : $$(@:f:+".sh") - @tr -d "\015" < $(@:f:+".sh") > $@ diff --git a/shell/source/unix/sysshell/makefile.mk b/shell/source/unix/sysshell/makefile.mk deleted file mode 100644 index df97be94d948..000000000000 --- a/shell/source/unix/sysshell/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=shell -TARGET=sysshell -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN = TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(BUILD_TYPE)" == "$(BUILD_TYPE:s/DESKTOP//)" - -ALL: -# nothing - -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - -# --- Files -------------------------------------------------------- - -.IF "$(OS)" != "MACOSX" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID" - -SLOFILES=$(SLO)$/recently_used_file.obj \ - $(SLO)$/recently_used_file_handler.obj - -SHL1TARGET=recentfile - -SHL1STDLIBS=$(EXPATASCII3RDLIB)\ - $(SALLIB) - -SHL1USE_EXPORTS = name -SHL1LIBS=$(SLB)$/xmlparser.lib -SHL1OBJS=$(SLOFILES) - -.ELSE - -dummy: -# nothing - -.ENDIF -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/shell/source/win32/makefile.mk b/shell/source/win32/makefile.mk deleted file mode 100644 index 3878a8f9f456..000000000000 --- a/shell/source/win32/makefile.mk +++ /dev/null @@ -1,77 +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=shell -TARGET=syssh -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/SysShentry.obj\ - $(SLO)$/SysShExec.obj - -SHL1TARGET=$(TARGET).uno - -SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB)\ - $(UWINAPILIB) \ - $(ADVAPI32LIB) \ - $(OLE32LIB) \ - $(SHELL32LIB) - -SHL1DEPN= -SHL1IMPLIB=i$(SHL1TARGET) - -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - - - -ALLTAR : $(MISC)/syssh.component - -$(MISC)/syssh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - syssh.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt syssh.component diff --git a/shell/source/win32/ooofilereader/makefile.mk b/shell/source/win32/ooofilereader/makefile.mk deleted file mode 100644 index b26e10a16795..000000000000 --- a/shell/source/win32/ooofilereader/makefile.mk +++ /dev/null @@ -1,92 +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=shell -TARGET=ooofilereader -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - - -SLOFILES=$(SLO)$/basereader.obj\ - $(SLO)$/metainforeader.obj\ - $(SLO)$/contentreader.obj\ - $(SLO)$/simpletag.obj\ - $(SLO)$/keywordstag.obj\ - $(SLO)$/autostyletag.obj - -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1OBJFILES=$(SLOFILES) -LIB1FILES=$(SLB)$/zipfile.lib\ - $(SLB)$/xmlparser.lib - -.IF "$(BUILD_X64)"!="" -SLOFILES_X64=$(SLO_X64)$/basereader.obj\ - $(SLO_X64)$/metainforeader.obj\ - $(SLO_X64)$/contentreader.obj\ - $(SLO_X64)$/simpletag.obj\ - $(SLO_X64)$/keywordstag.obj\ - $(SLO_X64)$/autostyletag.obj - -LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib -LIB1OBJFILES_X64=$(SLOFILES_X64) -LIB1FILES_X64=$(SLB_X64)$/zipfile.lib\ - $(SLB_X64)$/xmlparser.lib -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -.IF "$(OS)" == "WNT" -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.ENDIF -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/win32/shlxthandler/columninfo/makefile.mk b/shell/source/win32/shlxthandler/columninfo/makefile.mk deleted file mode 100644 index 7157f8f6ae2b..000000000000 --- a/shell/source/win32/shlxthandler/columninfo/makefile.mk +++ /dev/null @@ -1,67 +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=shell -TARGET=columninfo -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/columninfo.obj - -.IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x501 -SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/infotips/makefile.mk b/shell/source/win32/shlxthandler/infotips/makefile.mk deleted file mode 100644 index 38126a54c697..000000000000 --- a/shell/source/win32/shlxthandler/infotips/makefile.mk +++ /dev/null @@ -1,68 +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=shell -TARGET=infotips -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/$(TARGET).obj - -.IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk deleted file mode 100644 index 81c3515b20b7..000000000000 --- a/shell/source/win32/shlxthandler/makefile.mk +++ /dev/null @@ -1,170 +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=shell -TARGET=shlxthdl -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE -.IF "$(BUILD_X64)"!="" -USE_DEFFILE_X64=TRUE -.ENDIF -NO_DEFAULT_STL=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(COM)" == "GCC" -ALL : - @echo This does not build with MinGW anyway, so bypass for now -.ENDIF - - -UWINAPILIB = -UWINAPILIB_X64 = - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -.IF "$(COM)" == "GCC" -CDEFS+=-DDONT_HAVE_GDIPLUS -.ENDIF - -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/classfactory.obj\ - $(SLO)$/columninfo.obj\ - $(SLO)$/infotips.obj\ - $(SLO)$/propsheets.obj\ - $(SLO)$/shlxthdl.obj\ - $(SLO)$/listviewbuilder.obj\ - $(SLO)$/document_statistic.obj\ - $(SLO)$/thumbviewer.obj\ - $(SLO)$/stream_helper.obj\ - -SHL1TARGET=$(TARGET) - -.IF "$(COM)"=="GCC" -SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) $(COMCTL32LIB) -SHL1LIBS= -.ELSE -SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ - $(SOLARLIBDIR)$/expat_xmlparse.lib\ - $(SOLARLIBDIR)$/expat_xmltok.lib -.ENDIF -SHL1STDLIBS+=\ - $(OLEAUT32LIB)\ - $(ADVAPI32LIB)\ - $(OLE32LIB)\ - $(UUIDLIB)\ - $(SHELL32LIB)\ - $(KERNEL32LIB)\ - $(GDI32LIB)\ - $(GDIPLUSLIB) - -SHL1STDLIBS+=\ - $(SHLWAPILIB) - -SHL1LIBS+=$(SLB)$/util.lib\ - $(SLB)$/ooofilereader.lib - -SHL1DEPN= - -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1RES=$(RES)$/$(TARGET).res - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.IF "$(BUILD_X64)"!="" -# -------------------- x64 ----------------------- -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 - -SLOFILES_X64= \ - $(SLO_X64)$/classfactory.obj\ - $(SLO_X64)$/columninfo.obj\ - $(SLO_X64)$/infotips.obj\ - $(SLO_X64)$/propsheets.obj\ - $(SLO_X64)$/shlxthdl.obj\ - $(SLO_X64)$/listviewbuilder.obj\ - $(SLO_X64)$/document_statistic.obj\ - $(SLO_X64)$/thumbviewer.obj\ - $(SLO_X64)$/stream_helper.obj\ - -SHL1TARGET_X64=$(TARGET) -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ - $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ - $(SOLARLIBDIR_X64)$/expat_xmltok.lib - -SHL1STDLIBS_X64+=\ - $(OLEAUT32LIB_X64)\ - $(ADVAPI32LIB_X64)\ - $(OLE32LIB_X64)\ - $(UUIDLIB_X64)\ - $(SHELL32LIB_X64)\ - $(KERNEL32LIB_X64)\ - $(GDI32LIB_X64)\ - $(USER32LIB_X64) \ - $(GDIPLUSLIB_X64) \ - $(MSVCRT_X64) \ - $(MSVCPRT_X64) \ - $(OLDNAMESLIB_X64) - -SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ - $(SLB_X64)$/ooofilereader.lib -SHL1OBJS_X64=$(SLOFILES_X64) -SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def -SHL1RES_X64=$(RES_X64)$/$(TARGET).res - -DEF1NAME_X64=$(SHL1TARGET_X64) -DEF1EXPORTFILE_X64=exports.dxp -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/win32/shlxthandler/ooofilt/makefile.mk b/shell/source/win32/shlxthandler/ooofilt/makefile.mk deleted file mode 100644 index afb2988bb12c..000000000000 --- a/shell/source/win32/shlxthandler/ooofilt/makefile.mk +++ /dev/null @@ -1,140 +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=shell -TARGET=ooofilt -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE - -# Do not use the uwinapi library -UWINAPILIB= - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/ooofilt.obj\ - $(SLO)$/propspec.obj\ - $(SLO)$/stream_helper.obj - -SHL1TARGET=$(TARGET) -.IF "$(COM)"=="GCC" -SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) -SHL1LIBS= -.ELSE -SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ - $(SOLARLIBDIR)$/expat_xmlparse.lib\ - $(SOLARLIBDIR)$/expat_xmltok.lib -.ENDIF -SHL1STDLIBS+=$(OLE32LIB)\ - $(ADVAPI32LIB)\ - $(COMCTL32LIB)\ - $(UUIDLIB)\ - $(SHELL32LIB)\ - $(KERNEL32LIB)\ - $(OLDNAMESLIB) - -.IF "$(COM)"!="GCC" -SHL1STDLIBS+=msvcprt.lib - -.IF "$(PRODUCT)"!="full" -SHL1STDLIBS+=msvcrt.lib -.ENDIF -.ENDIF - - -SHL1LIBS+=$(SLB)$/util.lib\ - $(SLB)$/ooofilereader.lib - -SHL1DEPN= -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - - -.IF "$(BUILD_X64)"!="" -#---------------------------- x64 ------------------------- -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 -USE_DEFFILE_X64=TRUE - -SLOFILES_X64=$(SLO_X64)$/ooofilt.obj\ - $(SLO_X64)$/propspec.obj\ - $(SLO_X64)$/stream_helper.obj - -SHL1TARGET_X64=$(TARGET) - -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ - $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ - $(SOLARLIBDIR_X64)$/expat_xmltok.lib - -SHL1STDLIBS_X64+=$(OLE32LIB_X64)\ - $(ADVAPI32LIB_X64)\ - $(COMCTL32LIB_X64)\ - $(UUIDLIB_X64)\ - $(USER32LIB_X64) \ - $(SHELL32LIB_X64)\ - $(KERNEL32LIB_X64)\ - $(MSVCPRT_X64) \ - $(MSVCRT_X64) \ - $(OLDNAMESLIB_X64) - -SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ - $(SLB_X64)$/ooofilereader.lib -SHL1OBJS_X64=$(SLOFILES_X64) -SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET_X64).def -DEF1NAME_X64=$(SHL1TARGET_X64) -DEF1EXPORTFILE_X64=exports.dxp -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/prophdl/makefile.mk b/shell/source/win32/shlxthandler/prophdl/makefile.mk deleted file mode 100644 index 8a6813a616fb..000000000000 --- a/shell/source/win32/shlxthandler/prophdl/makefile.mk +++ /dev/null @@ -1,152 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2010 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/..$/.. -PRJNAME=shell -TARGET=propertyhdl -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -NO_DEFAULT_STL=YES -USE_DEFFILE=TRUE -.IF "$(BUILD_X64)"!="" -USE_DEFFILE_X64=TRUE -.ENDIF - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(COM)" == "GCC" -ALL : - @echo This does not build with MinGW -.ENDIF - - -UWINAPILIB = -UWINAPILIB_X64 = - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -wd4100 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/$(TARGET).obj\ - $(SLO)$/stream_helper.obj - -SHL1TARGET=$(TARGET) - -.IF "$(COM)"=="GCC" -SHL1STDLIBS=$(ZLIB3RDLIB) $(MINIZIP3RDLIB) $(EXPAT3RDLIB) $(COMCTL32LIB) -SHL1LIBS= -.ELSE -SHL1STDLIBS= -SHL1LIBS=$(SOLARLIBDIR)$/zlib.lib\ - $(SOLARLIBDIR)$/expat_xmlparse.lib\ - $(SOLARLIBDIR)$/expat_xmltok.lib -.ENDIF -SHL1STDLIBS+=\ - $(OLEAUT32LIB)\ - $(ADVAPI32LIB)\ - $(OLE32LIB)\ - $(UUIDLIB)\ - $(SHELL32LIB)\ - $(KERNEL32LIB)\ - $(GDI32LIB)\ - $(GDIPLUSLIB)\ - $(SHLWAPILIB)\ - $(PROPSYSLIB) - -.IF "$(COM)"!="GCC" -SHL1STDLIBS+=\ - msvcprt.lib - -.IF "$(PRODUCT)"!="full" -SHL1STDLIBS+=msvcrt.lib -.ENDIF -.ENDIF - -SHL1LIBS+=$(SLB)$/util.lib\ - $(SLB)$/ooofilereader.lib - -SHL1DEPN= -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -# -------------------- x64 ----------------------- -.IF "$(BUILD_X64)"!="" -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0501 -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-D_WIN32_IE=0x501 -SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj - -SLOFILES_X64= \ - $(SLO_X64)$/propertyhdl.obj\ - $(SLO_X64)$/stream_helper.obj\ - -SHL1TARGET_X64=$(TARGET) -SHL1LIBS_X64=$(SOLARLIBDIR_X64)$/zlib.lib\ - $(SOLARLIBDIR_X64)$/expat_xmlparse.lib\ - $(SOLARLIBDIR_X64)$/expat_xmltok.lib - -SHL1STDLIBS_X64+=\ - $(OLEAUT32LIB_X64)\ - $(ADVAPI32LIB_X64)\ - $(OLE32LIB_X64)\ - $(UUIDLIB_X64)\ - $(SHELL32LIB_X64)\ - $(KERNEL32LIB_X64)\ - $(GDI32LIB_X64)\ - $(USER32LIB_X64) \ - $(GDIPLUSLIB_X64) \ - $(MSVCRT_X64) \ - $(MSVCPRT_X64) \ - $(OLDNAMESLIB_X64)\ - $(PROPSYSLIB_X64) - -SHL1LIBS_X64+=$(SLB_X64)$/util.lib\ - $(SLB_X64)$/ooofilereader.lib -SHL1OBJS_X64=$(SLOFILES_X64) -SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def - -DEF1NAME_X64=$(SHL1TARGET_X64) -DEF1EXPORTFILE_X64=exports.dxp - -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk b/shell/source/win32/shlxthandler/propsheets/makefile.mk deleted file mode 100644 index 08adff7bfe3b..000000000000 --- a/shell/source/win32/shlxthandler/propsheets/makefile.mk +++ /dev/null @@ -1,69 +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=shell -TARGET=propsheets -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501 -.IF "$(COM)"!="GCC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -CDEFS_X64+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501 -.ENDIF - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/propsheets.obj\ - $(SLO)$/listviewbuilder.obj\ - $(SLO)$/document_statistic.obj - -.IF "$(BUILD_X64)"!="" -SLOFILES_X64=$(SLO_X64)$/propsheets.obj\ - $(SLO_X64)$/listviewbuilder.obj\ - $(SLO_X64)$/document_statistic.obj -.ENDIF # "$(BUILD_X64)"!="" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk deleted file mode 100644 index fc2bcbd7f6e0..000000000000 --- a/shell/source/win32/shlxthandler/res/makefile.mk +++ /dev/null @@ -1,74 +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=shell -TARGET=shlxthdl - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -INCPRE+=$(MFC_INCLUDE) - -# --- Files -------------------------------------------------------- - - -RCFILES=$(RES)$/$(TARGET).rc - -ULFFILES=$(TARGET).ulf - -.IF "$(WITH_LANG)"!="" -ULFDIR:=$(COMMONMISC)$/$(TARGET) -.ELSE # "$(WITH_LANG)"!="" -ULFDIR:=. -.ENDIF # "$(WITH_LANG)"!="" - -# --- Targets ------------------------------------------------------ - -.IF "$(BUILD_X64)"!="" -$(RES)$/x64$/$(TARGET).res : $(RES)$/$(TARGET).res - -$(MKDIR) $(RES)$/x64 - @@cp $< $@ -.ENDIF # "$(BUILD_X64)"!="" - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -.INCLUDE : tg_wntx64.mk - - -# Generate the native Windows resource file -# using lngconvex.exe - -$(RCFILES) : $(ULFDIR)$/shlxthdl.ulf makefile.mk rcfooter.txt rcheader.txt rctmpl.txt -.IF "$(COM)" == "MSC" - $(subst,$(SOLARBINDIR)$/lngconvex,$(BIN)$/lngconvex $(LNGCONVEX)) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt -.ELSE - $(LNGCONVEX) -ulf $(ULFDIR)$/shlxthdl.ulf -rc $(RES)$/shlxthdl.rc -rct rctmpl.txt -rch rcheader.txt -rcf rcfooter.txt -.ENDIF diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.rc b/shell/source/win32/shlxthandler/res/shlxthdl.rc new file mode 100644 index 000000000000..324bb2a307ff --- /dev/null +++ b/shell/source/win32/shlxthandler/res/shlxthdl.rc @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Copyright 2012 LibreOffice contributors. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include "shlxthdl_impl.rc" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk b/shell/source/win32/shlxthandler/thumbviewer/makefile.mk deleted file mode 100644 index 189c42a31824..000000000000 --- a/shell/source/win32/shlxthandler/thumbviewer/makefile.mk +++ /dev/null @@ -1,64 +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=shell -TARGET=thumbviewer -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -.IF "$(COM)" == "GCC" -CDEFS+=-DDONT_HAVE_GDIPLUS -.ENDIF - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/$(TARGET).obj - -.IF "$(BUILD_X64)"!="" -# ----------------- x64 ------------------------ -CFLAGS_X64+=-DWIN32_LEAN_AND_MEAN -D_NTSDK -DUNICODE -D_UNICODE -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -SLOFILES_X64=$(SLO_X64)$/$(TARGET).obj -.ENDIF # "$(BUILD_X64)"!="" - - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/win32/shlxthandler/util/makefile.mk b/shell/source/win32/shlxthandler/util/makefile.mk deleted file mode 100644 index e2b7a8294319..000000000000 --- a/shell/source/win32/shlxthandler/util/makefile.mk +++ /dev/null @@ -1,73 +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=shell -TARGET=util -ENABLE_EXCEPTIONS=TRUE - - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -CFLAGS+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE -D_NTSDK -DUNICODE -D_UNICODE -.IF "$(COM)" == "MSC" -CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820 -.ENDIF -CDEFS_X64+=-U_WIN32_IE -D_WIN32_IE=0x501 -U_WIN32_WINNT -D_WIN32_WINNT=0x0501 - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/fileextensions.obj\ - $(SLO)$/registry.obj\ - $(SLO)$/utilities.obj\ - $(SLO)$/iso8601_converter.obj - -SLOFILES_X64=$(SLO_X64)$/fileextensions.obj\ - $(SLO_X64)$/registry.obj\ - $(SLO_X64)$/utilities.obj\ - $(SLO_X64)$/iso8601_converter.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.INCLUDE : tg_wntx64.mk - diff --git a/shell/source/win32/simplemail/makefile.mk b/shell/source/win32/simplemail/makefile.mk deleted file mode 100644 index b9e66d5e06e5..000000000000 --- a/shell/source/win32/simplemail/makefile.mk +++ /dev/null @@ -1,87 +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=shell -TARGET=smplmail -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST=$(TARGET) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES=$(SLO)$/smplmailentry.obj\ - $(SLO)$/smplmailmsg.obj\ - $(SLO)$/smplmailclient.obj\ - $(SLO)$/smplmailsuppl.obj\ - $(SLO)$/simplemapi.obj - -SHL1TARGET=$(TARGET).uno - -SHL1STDLIBS=$(CPPULIB)\ - $(CPPUHELPERLIB)\ - $(SALLIB)\ - $(ADVAPI32LIB) - -SHL1IMPLIB=i$(SHL1TARGET) - -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE= exports.dxp - -# --- mapimailer -------------------------------------------------------- - -TARGETTYPE=CUI - -OBJFILES= $(OBJ)$/senddoc.obj\ - $(OBJ)$/simplemapi.obj - -APP1TARGET=senddoc -APP1OBJS=$(OBJFILES) -APP1STDLIBS=$(KERNEL32LIB)\ - $(SALLIB) -APP1RPATH = OOO -APP1DEF=$(MISC)$/$(APP1TARGET).def - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/smplmail.component - -$(MISC)/smplmail.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - smplmail.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt smplmail.component diff --git a/shell/source/win32/simplemail/smplmail.xml b/shell/source/win32/simplemail/smplmail.xml index 8176f094acad..20fe919b9027 100755 --- a/shell/source/win32/simplemail/smplmail.xml +++ b/shell/source/win32/simplemail/smplmail.xml @@ -17,7 +17,11 @@ <type> com.sun.star.system.XSimpleMailClientSupplier </type> <type> com.sun.star.system.XSimpleMailMessage </type> <type> com.sun.star.system.SimpleMailClientFlags </type> + <type> com.sun.star.lang.DisposedException </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> <type> com.sun.star.lang.XSingleServiceFactory </type> <type> com.sun.star.lang.XServiceInfo </type> <type> com.sun.star.lang.XTypeProvider </type> @@ -25,6 +29,7 @@ <type> com.sun.star.uno.TypeClass </type> <type> com.sun.star.uno.XWeak </type> <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uno.XComponentContext </type> <type> com.sun.star.registry.XRegistryKey </type> <type> com.sun.star.container.XSet </type> </component-description> diff --git a/shell/source/win32/syssh.xml b/shell/source/win32/syssh.xml index 3af4c73dc111..e1b2a40021ed 100755 --- a/shell/source/win32/syssh.xml +++ b/shell/source/win32/syssh.xml @@ -16,6 +16,7 @@ <type> com.sun.star.system.XSystemShellExecute </type> <type> com.sun.star.system.SystemShellExecuteException </type> <type> com.sun.star.system.SystemShellExecuteFlags </type> + <type> com.sun.star.lang.DisposedException </type> <type> com.sun.star.lang.XMultiServiceFactory </type> <type> com.sun.star.lang.XSingleServiceFactory </type> <type> com.sun.star.lang.XSingleComponentFactory </type> @@ -25,9 +26,11 @@ <type> com.sun.star.lang.EventObject </type> <type> com.sun.star.uno.XComponentContext </type> <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.uno.DeploymentException </type> <type> com.sun.star.uno.TypeClass </type> <type> com.sun.star.uno.XWeak </type> <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uri.UriReferenceFactory </type> <type> com.sun.star.registry.XRegistryKey </type> <type> com.sun.star.container.XSet </type> </component-description> diff --git a/shell/source/win32/zipfile/makefile.mk b/shell/source/win32/zipfile/makefile.mk deleted file mode 100644 index 0e165dd01faa..000000000000 --- a/shell/source/win32/zipfile/makefile.mk +++ /dev/null @@ -1,60 +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=shell -TARGET=zipfile -ENABLE_EXCEPTIONS=TRUE -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.IF "$(SYSTEM_ZLIB)" == "YES" -CDEFS += -DSYSTEM_ZLIB -.END - -# --- Files -------------------------------------------------------- - - -SLOFILES=$(SLO)$/zipfile.obj\ - $(SLO)$/zipexcptn.obj - -SLOFILES_X64=$(SLO_X64)$/zipfile.obj\ - $(SLO_X64)$/zipexcptn.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : set_wntx64.mk -.INCLUDE : target.mk -.IF "$(OS)" == "WNT" -INCLUDE!:=$(subst,/stl, $(INCLUDE)) - -.ENDIF -.INCLUDE : tg_wntx64.mk - diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index a0cf531f6032..ed82b8fd9912 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -221,6 +221,7 @@ gb_Library_PLAINLIBS_NONE += \ mingw32 \ mingwex \ advapi32 \ + comctl32 \ comdlg32 \ crypt32 \ d3d9 \ @@ -240,6 +241,7 @@ gb_Library_PLAINLIBS_NONE += \ $(gb_Library_win32_OLDNAMES) \ ole32 \ oleaut32 \ + propsys \ shell32 \ shlwapi \ urlmon \ diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index d40a185a9559..21a93d08e609 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -384,6 +384,7 @@ gb_Library_win32_OLDNAMES := oldnames gb_Library_PLAINLIBS_NONE += \ advapi32 \ + comctl32 \ comdlg32 \ crypt32 \ d3d9 \ @@ -405,6 +406,7 @@ gb_Library_PLAINLIBS_NONE += \ $(gb_Library_win32_OLDNAMES) \ ole32 \ oleaut32 \ + propsys \ shell32 \ shlwapi \ urlmon \ diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk index bf8fe78dd400..4dfc8d3eb77e 100644 --- a/vcl/Library_vclplug_kde.mk +++ b/vcl/Library_vclplug_kde.mk @@ -28,6 +28,10 @@ $(eval $(call gb_Library_Library,vclplug_kde)) +$(eval $(call gb_Library_use_packages,vclplug_kde,\ + shell_inc \ +)) + $(eval $(call gb_Library_set_include,vclplug_kde,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ |