libcdr/ExternalPackage_libcdr.mk | 8 ++++----
libcmis/ExternalPackage_libcmis.mk | 26 +++++++++++++-------------
libmspub/ExternalPackage_libmspub.mk | 6 +++---
libwpd/ExternalPackage_libwpd.mk | 22 +++++++++++-----------
libwpg/ExternalPackage_libwpg.mk | 6 +++---
libwps/ExternalPackage_libwps.mk | 4 ++--
solenv/gbuild/ExternalPackage.mk | 24 +++++++++++-------------
solenv/gbuild/UnpackedTarball.mk | 2 ++
8 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit 1556bbad31727aacb7d76300e1511be24a109627
Author: David Tardon <dtar...@redhat.com>
Date: Sat Sep 22 16:14:52 2012 +0200
guard against updating nonexistent file
Change-Id: I74cc4752ac4abfd83f9eafa01ae4eb1813bb2afa
diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk
index 8dcf055..63f32a6 100644
--- a/solenv/gbuild/UnpackedTarball.mk
+++ b/solenv/gbuild/UnpackedTarball.mk
@@ -319,6 +319,7 @@ endef
define gb_UnpackedTarbal__make_pattern_rule
$(call gb_UnpackedTarball_get_dir,$(1))/%$(2) :
+ $$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist
in the tarball))
touch $$@
$(eval gb_UnpackedTarball_PATTERN_RULES_$(1) += $(2))
@@ -332,6 +333,7 @@ endef
define gb_UnpackedTarbal__make_file_rule
$(call gb_UnpackedTarball_get_dir,$(1))/$(2) :
+ $$(if $$(wildcard $$@),,$$(call gb_Output_error,file $$@ does not exist
in the tarball))
touch $$@
endef
commit ca124c4b049df9d47a4c72a677e949fcb39d36fd
Author: David Tardon <dtar...@redhat.com>
Date: Sat Sep 22 16:09:16 2012 +0200
fix delivery of headers in ExternalPackages
Change-Id: Id686e9eeef9d64943360c6d7187f13b76a6c374a
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk
index c2c12dc..0a6d15c 100644
--- a/libcdr/ExternalPackage_libcdr.mk
+++ b/libcdr/ExternalPackage_libcdr.mk
@@ -10,10 +10,10 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libcdr_inc,cdr))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,libcdr_inc,inc/external/libcdr,\
- libcdr.h \
- CDRDocument.h \
- CDRStringVector.h \
- CMXDocument.h \
+ src/lib/libcdr.h \
+ src/lib/CDRDocument.h \
+ src/lib/CDRStringVector.h \
+ src/lib/CMXDocument.h \
))
# vim: set noet sw=4 ts=4:
diff --git a/libcmis/ExternalPackage_libcmis.mk
b/libcmis/ExternalPackage_libcmis.mk
index 7b0ba01..44f6655 100644
--- a/libcmis/ExternalPackage_libcmis.mk
+++ b/libcmis/ExternalPackage_libcmis.mk
@@ -10,19 +10,19 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libcmis_inc,cmis))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,libcmis_inc,inc/external/libcmis,\
- allowable-actions.hxx \
- document.hxx \
- exception.hxx \
- folder.hxx \
- object-type.hxx \
- object.hxx \
- property-type.hxx \
- property.hxx \
- repository.hxx \
- session-factory.hxx \
- session.hxx \
- xml-utils.hxx \
- xmlserializable.hxx \
+ src/libcmis/allowable-actions.hxx \
+ src/libcmis/document.hxx \
+ src/libcmis/exception.hxx \
+ src/libcmis/folder.hxx \
+ src/libcmis/object-type.hxx \
+ src/libcmis/object.hxx \
+ src/libcmis/property-type.hxx \
+ src/libcmis/property.hxx \
+ src/libcmis/repository.hxx \
+ src/libcmis/session-factory.hxx \
+ src/libcmis/session.hxx \
+ src/libcmis/xml-utils.hxx \
+ src/libcmis/xmlserializable.hxx \
))
# vim: set noet sw=4 ts=4:
diff --git a/libmspub/ExternalPackage_libmspub.mk
b/libmspub/ExternalPackage_libmspub.mk
index 2b834cf..89aecd8 100644
--- a/libmspub/ExternalPackage_libmspub.mk
+++ b/libmspub/ExternalPackage_libmspub.mk
@@ -10,9 +10,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub_inc,mspub))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,libmspub_inc,inc/external/libmspub,\
- libmspub.h \
- MSPUBDocument.h \
- MSPUBStringVector.h \
+ src/lib/libmspub.h \
+ src/lib/MSPUBDocument.h \
+ src/lib/MSPUBStringVector.h \
))
# vim: set noet sw=4 ts=4:
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index 72eb4c5..9e2bd20 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -10,20 +10,20 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd_inc,wpd))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd,\
- libwpd.h \
- WPDocument.h \
- WPXBinaryData.h \
- WPXDocumentInterface.h \
- WPXProperty.h \
- WPXPropertyList.h \
- WPXString.h \
- WPXPropertyListVector.h \
+ src/lib/libwpd.h \
+ src/lib/WPDocument.h \
+ src/lib/WPXBinaryData.h \
+ src/lib/WPXDocumentInterface.h \
+ src/lib/WPXProperty.h \
+ src/lib/WPXPropertyList.h \
+ src/lib/WPXString.h \
+ src/lib/WPXPropertyListVector.h \
))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,libwpd_inc,inc/external/libwpd-stream,\
- libwpd-stream.h \
- WPXStream.h \
- WPXStreamImplementation.h \
+ src/lib/libwpd-stream.h \
+ src/lib/WPXStream.h \
+ src/lib/WPXStreamImplementation.h \
))
# vim: set noet sw=4 ts=4:
diff --git a/libwpg/ExternalPackage_libwpg.mk b/libwpg/ExternalPackage_libwpg.mk
index 34cd932..17b37c6 100644
--- a/libwpg/ExternalPackage_libwpg.mk
+++ b/libwpg/ExternalPackage_libwpg.mk
@@ -10,9 +10,9 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg_inc,wpg))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,libwpg_inc,inc/external/libwpg,\
- libwpg.h \
- WPGPaintInterface.h \
- WPGraphics.h \
+ src/lib/libwpg.h \
+ src/lib/WPGPaintInterface.h \
+ src/lib/WPGraphics.h \
))
# vim: set noet sw=4 ts=4:
diff --git a/libwps/ExternalPackage_libwps.mk b/libwps/ExternalPackage_libwps.mk
index 1024537..0eb66fd 100644
--- a/libwps/ExternalPackage_libwps.mk
+++ b/libwps/ExternalPackage_libwps.mk
@@ -10,8 +10,8 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libwps_inc,wps))
$(eval $(call
gb_ExternalPackage_add_unpacked_files,libwps_inc,inc/external/libwps,\
- libwps.h \
- WPSDocument.h \
+ src/lib/libwps.h \
+ src/lib/WPSDocument.h \
))
# vim: set noet sw=4 ts=4:
commit a29ad781db2665a8ab177582beb2edc8942efb55
Author: David Tardon <dtar...@redhat.com>
Date: Sat Sep 22 15:52:33 2012 +0200
Package is replaceable by ExternalPackage
Change-Id: I6d46f4ae957576927432dca63a281a376ce15600
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 5bf1f51..f24a2ca 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -33,8 +33,6 @@ $(call gb_ExternalPackage_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),EPK,2)
rm -f $(call gb_ExternalPackage_get_target,$*)
-gb_ExternalPackage_get_packagename = External/$(1)
-
# Create and register a new ExternalPackage
#
# The base directory of the package is the directory of the unpacked
@@ -55,12 +53,12 @@ endef
#
# gb_ExternalPackage_ExternalPackage_internal name unpacked
define gb_ExternalPackage_ExternalPackage_internal
-$(call gb_Package_Package_internal,$(call
gb_ExternalPackage_get_packagename,$(1)),$(call
gb_UnpackedTarball_get_dir,$(2)))
-$(call gb_Package_use_unpacked,$(call
gb_ExternalPackage_get_packagename,$(1)),$(2))
+$(call gb_Package_Package_internal,$(1),$(call
gb_UnpackedTarball_get_dir,$(2)))
+$(call gb_Package_use_unpacked,$(1),$(2))
-$(call gb_ExternalPackage_get_target,$(1)) : $(call
gb_Package_get_target,$(call gb_ExternalPackage_get_packagename,$(1)))
+$(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1))
$(call gb_ExternalPackage_get_target,$(1)) :| $(dir $(call
gb_ExternalPackage_get_target,$(1))).dir
-$(call gb_ExternalPackage_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(call gb_ExternalPackage_get_packagename,$(1)))
+$(call gb_ExternalPackage_get_clean_target,$(1)) : $(call
gb_Package_get_clean_target,$(1))
gb_ExternalPackage_UNPACKED_$(1) := $(2)
@@ -72,7 +70,7 @@ endef
#
# gb_ExternalPackage_add_file package dest src
define gb_ExternalPackage_add_file
-$(call gb_Package_add_file,$(call
gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_file,$(1),$(2),$(3))
endef
@@ -82,7 +80,7 @@ endef
#
# gb_ExternalPackage_add_files package destdir file(s)
define gb_ExternalPackage_add_files
-$(call gb_Package_add_files,$(call
gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_files,$(1),$(2),$(3))
endef
@@ -92,7 +90,7 @@ endef
#
# gb_ExternalPackage_add_files_with_dir package destdir file(s)
define gb_ExternalPackage_add_files_with_dir
-$(call gb_Package_add_files_with_dir,$(call
gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_files_with_dir,$(1),$(2),$(3))
endef
@@ -107,7 +105,7 @@ endef
#
# gb_ExternalPackage_add_unpacked_file package dest src
define gb_ExternalPackage_add_unpacked_file
-$(call gb_Package_add_file,$(call
gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_file,$(1),$(2),$(3))
$(call gb_ExternalPackage__add_file,$(1),$(3))
endef
@@ -123,7 +121,7 @@ endef
#
# gb_ExternalPackage_add_unpacked_files package destdir file(s)
define gb_ExternalPackage_add_unpacked_files
-$(call gb_Package_add_files,$(call
gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_files,$(1),$(2),$(3))
$(call gb_ExternalPackage__add_files,$(1),$(3))
endef
@@ -134,7 +132,7 @@ endef
#
# gb_ExternalPackage_add_unpacked_files_with_dir package destdir file(s)
define gb_ExternalPackage_add_unpacked_files_with_dir
-$(call gb_Package_add_files_with_dir,$(call
gb_ExternalPackage_get_packagename,$(1)),$(2),$(3))
+$(call gb_Package_add_files_with_dir,$(1),$(2),$(3))
$(call gb_ExternalPackage__add_files,$(1),$(3))
endef
@@ -143,7 +141,7 @@ endef
#
# gb_ExternalPackage_use_external_project package external
define gb_ExternalPackage_use_external_project
-$(call gb_Package_use_external_project,$(call
gb_ExternalPackage_get_packagename,$(1),$(2)))
+$(call gb_Package_use_external_project,$(1),$(2))
endef
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
