Repository.mk | 5 ++---
odk/CustomTarget_allheaders.mk | 3 ++-
odk/CustomTarget_doxygen.mk | 3 ++-
odk/Module_odk.mk | 1 -
odk/PackageSet_odk_headers.mk | 17 -----------------
scp2/source/ooo/common_brand.scp | 32 --------------------------------
6 files changed, 6 insertions(+), 55 deletions(-)
New commits:
commit 9c9109c6e09890ac6f6596cdfbe3b6e1f7cfded7
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jun 2 22:44:19 2017 +0200
scp2: move package desktop_scripts_install to AutoInstall
Change-Id: I96baefdb6511f4bd632a0044b26074834615bc57
diff --git a/Repository.mk b/Repository.mk
index e889e8ea678d..9fbd91ca23b7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -791,7 +791,6 @@ endif
$(eval $(call gb_Helper_register_packages, \
test_unittest \
cli_basetypes_copy \
- $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
extras_wordbook \
$(if $(filter MSC,$(COM)),msvc_dlls) \
instsetoo_native_setup \
@@ -994,6 +993,7 @@ $(eval $(call
gb_Helper_register_packages_for_install,xsltfilter,\
$(eval $(call gb_Helper_register_packages_for_install,brand,\
desktop_branding \
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
$(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter
DESKTOP,$(BUILD_TYPE))),\
$(if $(ENABLE_HEADLESS),, \
desktop_soffice_sh \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index e36f8741de6b..a9e53ab7906e 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -52,10 +52,7 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Registry,
gid_Brand_Dir_Share_Xdg);
Files = (auto_brand_ALL,
- gid_Brand_File_Gdb_Trace,
- gid_Brand_File_Bin_Unoinfo,
gid_Brand_File_Desktophelper_Txt,
- gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
gid_Brand_File_Share_Xdg_Calc,
gid_Brand_File_Share_Xdg_Draw,
@@ -162,17 +159,6 @@ End
// Files
-#if defined UNX && !defined MACOSX
-
-File gid_Brand_File_Gdb_Trace
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = gdbtrace;
- Styles = (PACKED);
-End
-
-#endif
-
#ifdef WNT
File gid_Brand_File_Desktophelper_Txt
TXT_FILE_BODY;
@@ -183,24 +169,6 @@ File gid_Brand_File_Desktophelper_Txt
End
#endif
-#if !defined WNT
-File gid_Brand_File_Bin_Unoinfo
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "unoinfo";
- Styles = (PACKED);
-End
-#endif
-
-#if defined UNX && !defined MACOSX
-File gid_Brand_File_Script_Unopkg
- BIN_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Styles = (PACKED);
- Name = "unopkg";
-End
-#endif
-
File gid_Brand_File_Readme_Readme
TXT_FILE_BODY;
Dir = gid_Brand_Dir_Readme;
commit bb90b21dbdd50e6d7e5378a0f1d6bbb595af5087
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jun 2 22:43:04 2017 +0200
Package desktp_install was deleted
Change-Id: Idc1d89a46031ae4d2151d96cc25e48945878fb03
diff --git a/Repository.mk b/Repository.mk
index a82699ef878b..e889e8ea678d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -791,7 +791,6 @@ endif
$(eval $(call gb_Helper_register_packages, \
test_unittest \
cli_basetypes_copy \
- desktop_install \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
extras_wordbook \
$(if $(filter MSC,$(COM)),msvc_dlls) \
commit 3563faa83719c5d4a91222b8aa30fe1cc64b97eb
Author: Michael Stahl <mst...@redhat.com>
Date: Fri Jun 2 20:43:53 2017 +0200
odk: remove PackageSet_odk_headers
This is quite confusing: the gb_Helper_register_packages_for_install
odk_headers does not actually use the Package odk_headers, but the
PackageSet odk_headers, because the name is the same and the PackageSet
directory comes first in the search path.
This means that the Package odk_headers_generated is installed despite
there being no obvious reason why.
The PackageSet doesn't provide much value here, so just remove it.
Change-Id: I564f3b9fc6acaabe700328bc8c3db70c3b2de0cd
diff --git a/Repository.mk b/Repository.mk
index eb3696fe239e..a82699ef878b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -797,7 +797,6 @@ $(eval $(call gb_Helper_register_packages, \
$(if $(filter MSC,$(COM)),msvc_dlls) \
instsetoo_native_setup \
$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
- odk_headers_generated \
postprocess_registry \
readlicense_oo_readmes \
setup_native_misc \
@@ -842,6 +841,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
$(if $(DOXYGEN),odk_doxygen) \
odk_examples \
odk_headers \
+ odk_headers_generated \
odk_html \
odk_settings \
odk_settings_generated \
diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk
index d48abe0cd983..5aed70ad4635 100644
--- a/odk/CustomTarget_allheaders.mk
+++ b/odk/CustomTarget_allheaders.mk
@@ -30,7 +30,8 @@ $(if $(2),#endif)
endef
$(odk_allheaders_DIR)/allheaders.hxx : \
- $(call gb_PackageSet_get_target,odk_headers) \
+ $(call gb_PackageSet_target,odk_headers) \
+ $(call gb_PackageSet_target,odk_headers_generated) \
| $(odk_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
ifeq ($(HAVE_GNUMAKE_FILE_FUNC),)
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 2f67cc6f1897..100aa0d02364 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -51,7 +51,8 @@ $(call gb_CustomTarget_get_workdir,odk/docs)/cpp/doxygen.log
: \
$(call gb_CustomTarget_get_workdir,odk/docs)/cpp/Doxyfile \
$(SRCDIR)/include/sal/log-areas.dox \
$(SRCDIR)/odk/docs/cpp/main.dox \
- $(call gb_PackageSet_get_target,odk_headers)
+ $(call gb_PackageSet_get_target,odk_headers) \
+ $(call gb_PackageSet_get_target,odk_headers_generated)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GEN,1)
rm -rf $(odk_cpp_DOXY_WORKDIR)/ && $(DOXYGEN) $< > $@
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index a72102c9b951..4ca21d3eaf32 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_Module_add_targets,odk,\
Package_settings_generated \
Package_share_readme \
Package_share_readme_generated \
- PackageSet_odk_headers \
))
ifeq ($(OS),WNT)
diff --git a/odk/PackageSet_odk_headers.mk b/odk/PackageSet_odk_headers.mk
deleted file mode 100644
index d28f6d1bb559..000000000000
--- a/odk/PackageSet_odk_headers.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# 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/.
-#
-
-$(eval $(call gb_PackageSet_PackageSet,odk_headers))
-
-$(eval $(call gb_PackageSet_add_packages,odk_headers,\
- odk_headers \
- odk_headers_generated \
-))
-
-# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
