[Libreoffice-commits] core.git: 7 commits - codemaker/StaticLibrary_codemaker_cpp.mk codemaker/StaticLibrary_codemaker_java.mk codemaker/StaticLibrary_codemaker.mk connectivity/CppunitTest_connectivity_commontools.mk extensions/Module_extensions.mk icu/ExternalProject_icu.mk idlc/Executable_idlc.mk nss/ExternalProject_nss.mk RepositoryExternal.mk solenv/gbuild soltools/Executable_cpp.mk soltools/Executable_makedepend.mk

David Tardon dtardon at redhat.com
Tue Apr 9 10:30:10 PDT 2013 

 RepositoryExternal.mk                                |   20 +++++++++++++++++++
 codemaker/StaticLibrary_codemaker.mk                 |    1 
 codemaker/StaticLibrary_codemaker_cpp.mk             |    1 
 codemaker/StaticLibrary_codemaker_java.mk            |    1 
 connectivity/CppunitTest_connectivity_commontools.mk |    4 +++
 extensions/Module_extensions.mk                      |    5 ++++
 icu/ExternalProject_icu.mk                           |    2 -
 idlc/Executable_idlc.mk                              |    7 +++---
 nss/ExternalProject_nss.mk                           |    5 ++--
 solenv/gbuild/LinkTarget.mk                          |    2 +
 solenv/gbuild/WinResTarget.mk                        |    7 +++++-
 solenv/gbuild/platform/WNT_INTEL_GCC.mk              |    2 +
 solenv/gbuild/platform/com_MSC_class.mk              |    5 ++++
 soltools/Executable_cpp.mk                           |    6 +----
 soltools/Executable_makedepend.mk                    |    6 ++---
 15 files changed, 59 insertions(+), 15 deletions(-)

New commits:
commit 0586be91e6f5099b46025b0d2e645669d2271c77
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 19:27:37 2013 +0200

    move dep on solenv_inc to platform
    
    Change-Id: I86db3c7290e22491f41d198dfb53e01f6bbdc50c

diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 48d5b72..d88375e 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -2,6 +2,9 @@
 
 # WinResTarget class
 
+# defined by platform:
+#  gb_WinResTarget_WinResTarget_platform
+
 gb_WinResTarget_DEFAULTDEFS := $(gb_RCDEFS)
 
 define gb_WinResTarget_WinResTarget
@@ -17,6 +20,8 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(subst -isystem,-I,$(SOLAR
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
 
+$(call gb_WinResTarget_WinResTarget_platform,$(1))
+
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
 $(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side)
@@ -33,7 +38,7 @@ $(call gb_WinResTarget_get_dep_target,%) : $(gb_WinResTarget__command_target)
 endif
 
 
-$(call gb_WinResTarget_get_target,%) : $(call gb_Package_get_target,solenv_inc)
+$(call gb_WinResTarget_get_target,%) :
 	$(call gb_WinResTarget__command,$@,$*,$<)
 
 $(call gb_WinResTarget_get_clean_target,%) :
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index ecb829e..3529741 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -349,6 +349,8 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(RCFILE) )
 endef
 
+gb_WinResTarget_WinResTarget_platform :=
+
 $(eval $(call gb_Helper_make_dep_targets,\
 	WinResTarget \
 ))
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 55aff01..e3f121e 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -505,6 +505,11 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(RCFILE) )
 endef
 
+define gb_WinResTarget_WinResTarget_platform
+$(call gb_WinResTarget_get_target,$(1)) : $(call gb_Package_get_target,solenv_inc)
+
+endef
+
 $(eval $(call gb_Helper_make_dep_targets,\
 	WinResTarget \
 ))
commit 203cb5d967816d0a626a56556de67e2bef049121
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 19:23:33 2013 +0200

    only build WinResTarget on windows
    
    Change-Id: I144e89996fb980514f4031d0e2aa0d0ced529d35

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 0e12f94..79a39c2 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -125,8 +125,13 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Executable_nsplugin \
 	Library_npsoplugin \
 	StaticLibrary_npsoenv \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Module_add_targets,extensions,\
 	WinResTarget_npsoplugin \
 ))
+endif
 
 endif # ENABLE_NPAPI_INTO_BROWSER=YES
 
commit 75c2c58a6c9d0c172c71d1654642474e657ce7e3
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 19:06:26 2013 +0200

    add external for unistd.h
    
    Change-Id: I728b162e21a7a2c02cb76af110cc0a01a762fdbd

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d4e4426..927a123 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -125,6 +125,26 @@ endef
 
 endif
 
+ifeq ($(OS)$(COM),WNTMSC)
+
+define gb_ExternalProject__use_unistd_headers
+$(call gb_ExternalProject_use_package,$(1),soltools_inc)
+
+endef
+
+define gb_LinkTarget__use_unistd_headers
+$(call gb_LinkTarget_use_package,$(1),soltools_inc)
+
+endef
+
+else # ! ($(OS)$(COM),WNTMSC)
+
+gb_ExternalProject__use_unistd_headers :=
+
+gb_LinkTarget__use_unistd_headers :=
+
+endif
+
 ifeq ($(SYSTEM_VIGRA),YES)
 
 gb_LinkTarget__use_vigra_headers :=
diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk
index 57caed7..25d2bbd 100644
--- a/idlc/Executable_idlc.mk
+++ b/idlc/Executable_idlc.mk
@@ -32,7 +32,10 @@ $(eval $(call gb_Executable_set_include,idlc,\
     $$(INCLUDE) \
 ))
 
-$(eval $(call gb_Executable_use_external,idlc,boost_headers))
+$(eval $(call gb_Executable_use_externals,idlc,\
+	boost_headers \
+	unistd_headers \
+))
 
 $(eval $(call gb_Executable_use_libraries,idlc,\
     reg \
@@ -40,8 +43,6 @@ $(eval $(call gb_Executable_use_libraries,idlc,\
     salhelper \
 ))
 
-$(eval $(call gb_Executable_use_package,idlc,soltools_inc))
-
 $(eval $(call gb_Executable_add_grammars,idlc,\
     idlc/source/parser \
 ))
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index 82bf7d4..c853d89 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -11,8 +11,9 @@ $(eval $(call gb_ExternalProject_ExternalProject,nss))
 
 $(eval $(call gb_ExternalProject_use_unpacked,nss,nss))
 
-$(eval $(call gb_ExternalProject_use_package,nss,soltools_inc))
-
+$(eval $(call gb_ExternalProject_use_externals,nss,\
+	unistd_headers \
+))
 
 $(eval $(call gb_ExternalProject_register_targets,nss,\
 	configure \
diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk
index 0b9b3ea..f24b018 100644
--- a/soltools/Executable_cpp.mk
+++ b/soltools/Executable_cpp.mk
@@ -9,11 +9,9 @@
 
 $(eval $(call gb_Executable_Executable,cpp))
 
-ifeq ($(COM),MSC)
-$(eval $(call gb_Executable_use_packages,cpp,\
-    soltools_inc \
+$(eval $(call gb_Executable_use_externals,cpp,\
+    unistd_headers \
 ))
-endif
 
 $(eval $(call gb_Executable_add_cobjects,cpp,\
     soltools/cpp/_cpp \
diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk
index 8f74a3f..e924a8d 100644
--- a/soltools/Executable_makedepend.mk
+++ b/soltools/Executable_makedepend.mk
@@ -19,11 +19,11 @@ $(eval $(call gb_Executable_add_defs,makedepend,\
     -DHW_THREADS \
 ))
 
-ifeq ($(COM),MSC)
-$(eval $(call gb_Executable_use_packages,makedepend,\
-    soltools_inc \
+$(eval $(call gb_Executable_use_externals,makedepend,\
+	unistd_headers \
 ))
 
+ifeq ($(COM),MSC)
 $(eval $(call gb_Executable_add_defs,makedepend,\
     -wd4100 \
     -wd4131 \
commit 5a38d88825c4fb516a6d4144f0ee7f02659a074b
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 18:55:07 2013 +0200

    there is no package icu_data
    
    Change-Id: I3f40a533a0762175dffda5df3bf79b6b4843cf33

diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index aea42c0..ecf97ec 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_ExternalProject_ExternalProject,icu))
 
 $(eval $(call gb_ExternalProject_use_unpacked,icu,icu))
 
-$(eval $(call gb_ExternalProject_use_package,icu,icu_data))
-
 $(eval $(call gb_ExternalProject_register_targets,icu,\
 	build \
 ))
commit 003da7e2131b0d4c7b02a487f190a2ca5198361a
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 18:23:47 2013 +0200

    depend on headers also when using library objects
    
    Change-Id: I37e8c382d2bb67f8b772f1679b21fcb147593346

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 46952c8..ec5631d 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1082,6 +1082,8 @@ $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Librar
 $$(eval $$(call gb_Output_error,Cannot import objects library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk))
 endif
 $(call gb_LinkTarget__use_linktarget_objects,$(1),$(foreach lib,$(2),$(call gb_Library_get_linktargetname,$(lib))))
+$(call gb_LinkTarget_get_external_headers_target,$(1)) : \
+	$(foreach lib,$(2),$(call gb_Library_get_headers_target,$(lib)))
 
 endef
 
commit 8b7961aa2c4a773be0377408952a5e4c182d4cf4
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 18:03:23 2013 +0200

    add missing dep on connectivity/FValue.hxx
    
    Change-Id: I8e95146379332c7f26130eca5341a8880f86233c

diff --git a/connectivity/CppunitTest_connectivity_commontools.mk b/connectivity/CppunitTest_connectivity_commontools.mk
index 4c2e77e..c18952c 100644
--- a/connectivity/CppunitTest_connectivity_commontools.mk
+++ b/connectivity/CppunitTest_connectivity_commontools.mk
@@ -9,6 +9,10 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,connectivity_commontools))
 
+$(eval $(call gb_CppunitTest_use_packages,connectivity_commontools,\
+	connectivity_inc \
+))
+
 $(eval $(call gb_CppunitTest_set_include,connectivity_commontools,\
 	-I$(SRCDIR)/connectivity/source/inc \
 	$$(INCLUDE) \
commit 988f1a078a3db246311441e93cda47ad5b373dc5
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 9 17:22:25 2013 +0200

    add missing dep on salhelper/simplereferenceobject.hxx
    
    Change-Id: I3acf314bf02bae7b2e74f317177ba81fc9fdb59e

diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index 5cfa3ce..ebd86c8 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker,\
 	registry_odk_headers \
 	sal_generated \
 	sal_odk_headers \
+	salhelper_odk_headers \
 	unoidl_inc \
 ))
 
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index 4a8edaf..7bd5565 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
 	registry_odk_headers \
 	sal_generated \
 	sal_odk_headers \
+	salhelper_odk_headers \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_cpp,\
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index 03d9f07..4ef12c3 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
 	registry_odk_headers \
 	sal_generated \
 	sal_odk_headers \
+	salhelper_odk_headers \
 ))
 
 $(eval $(call gb_StaticLibrary_add_exception_objects,codemaker_java,\

More information about the Libreoffice-commits mailing list