bridges/CustomTarget_gcc3_ios_arm.mk | 7 +++---- cli_ure/CustomTarget_cli_ure_assemblies.mk | 6 +++--- cli_ure/Library_cli_cppuhelper_native.mk | 2 +- librsvg/ExternalPackage_librsvg.mk | 25 +++++++++++++++++++++++++ librsvg/Module_librsvg.mk | 1 + solenv/gbuild/platform/WNT_INTEL_MSC.mk | 7 +++++++ 6 files changed, 40 insertions(+), 8 deletions(-)
New commits: commit 40a4c469dff783736ba69ec4134e3c23e78b2769 Author: David Tardon <dtar...@redhat.com> Date: Mon Oct 15 14:56:34 2012 +0200 fdo#55290 do not use resource file for assembly libs I am not sure this really fixes the problem, but it is the only difference between dmake and gbuild builds I can see. Change-Id: I96fa4120dc2a8221a75e150a62582aebda98f505 diff --git a/cli_ure/Library_cli_cppuhelper_native.mk b/cli_ure/Library_cli_cppuhelper_native.mk index 5582e77..32b9ffd 100644 --- a/cli_ure/Library_cli_cppuhelper_native.mk +++ b/cli_ure/Library_cli_cppuhelper_native.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Library_Library,cli_cppuhelper_native)) +$(eval $(call gb_Library_Assembly,cli_cppuhelper_native)) # When compiling for CLR, disable "warning C4339: use of undefined type detected # in CLR meta-data - use of this type may lead to a runtime exception": diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 151327e..180cb69 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -449,6 +449,13 @@ gb_Library_DLLFILENAMES :=\ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVEREXT)) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):$(lib)$(gb_Library_UNOEXT)) \ +# An assembly is a special kind of library for CLI +define gb_Library_Assembly +$(call gb_Library_Library,$(1)) +$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) : NATIVERES := + +endef + define gb_Library_Library_platform $(call gb_LinkTarget_set_dlltarget,$(2),$(3)) commit 2969b1007ae3df1e70c5fa18fab1b41fff6da210 Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 16 13:25:02 2012 +0200 strip executable flag Change-Id: I13da3924bc8d737d6a1133a0696d45dc463864ef diff --git a/librsvg/ExternalProject_librsvg.mk b/librsvg/ExternalProject_librsvg.mk old mode 100755 new mode 100644 diff --git a/librsvg/UnpackedTarball_rsvg.mk b/librsvg/UnpackedTarball_rsvg.mk old mode 100755 new mode 100644 diff --git a/librsvg/config.h b/librsvg/config.h old mode 100755 new mode 100644 commit 82b7f772ea9d30cd00324e48ef60cc3d28dad414 Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 16 10:28:45 2012 +0200 deliver librsvg build products Change-Id: If2d528f02a44e6828a26a843106a1005917dcb4e diff --git a/librsvg/ExternalPackage_librsvg.mk b/librsvg/ExternalPackage_librsvg.mk new file mode 100644 index 0000000..540da01 --- /dev/null +++ b/librsvg/ExternalPackage_librsvg.mk @@ -0,0 +1,25 @@ +# -*- 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_ExternalPackage_ExternalPackage,librsvg,rsvg)) + +$(eval $(call gb_ExternalPackage_use_external_project,librsvg,librsvg)) + +$(eval $(call gb_ExternalPackage_add_files,librsvg,lib,\ + .libs/librsvg-2.2.dylib \ +)) + +$(eval $(call gb_ExternalPackage_add_unpacked_files,librsvg,inc/external/librsvg-2.0/librsvg,\ + rsvg-cairo.h \ + rsvg-enum-types.h \ + rsvg-features.h \ + rsvg.h \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/librsvg/Module_librsvg.mk b/librsvg/Module_librsvg.mk index 3e58b9e..2fe5794 100644 --- a/librsvg/Module_librsvg.mk +++ b/librsvg/Module_librsvg.mk @@ -15,6 +15,7 @@ $(eval $(call gb_Module_add_targets,librsvg,\ )) ifeq ($(OS),MACOSX) $(eval $(call gb_Module_add_targets,librsvg,\ + ExternalPackage_librsvg \ ExternalProject_librsvg \ )) else ifeq ($(OS),WNT) commit 5b4fa31affcb4751552b717cfe5eb72c6a99460d Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 16 10:11:59 2012 +0200 use key directly from $(SRCDIR) Change-Id: Ib1671e416fa59a46e4936ae75de4e2c20d70997b diff --git a/cli_ure/CustomTarget_cli_ure_assemblies.mk b/cli_ure/CustomTarget_cli_ure_assemblies.mk index da66178..80a8e43 100644 --- a/cli_ure/CustomTarget_cli_ure_assemblies.mk +++ b/cli_ure/CustomTarget_cli_ure_assemblies.mk @@ -43,20 +43,20 @@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : \ $(call gb_CustomTarget_get_workdir,cli_ure/source)/basetypes/assembly.cs : $(GNUCOPY) $< $@.tmp && \ echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_BASETYPES_NEW_VERSION)" )]' >> $@.tmp && \ - $(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )]' >> $@.tmp &&) \ + $(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )]' >> $@.tmp &&) \ mv $@.tmp $@ # TODO use macros for this $(call gb_CustomTarget_get_workdir,cli_ure/source)/native/assembly.cxx : $(GNUCOPY) $< $@.tmp && \ echo '[assembly:System::Reflection::AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )];' >> $@.tmp && \ - echo '[assembly:System::Reflection::AssemblyKeyFile( "$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )];' >> $@.tmp && \ + echo '[assembly:System::Reflection::AssemblyKeyFile( "$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )];' >> $@.tmp && \ mv $@.tmp $@ $(call gb_CustomTarget_get_workdir,cli_ure/source)/ure/assembly.cs : $(GNUCOPY) $< $@.tmp && \ echo '[assembly:System.Reflection.AssemblyVersion( "$(CLI_URE_NEW_VERSION)" )]' >> $@.tmp && \ - $(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(OUTDIR)/bin/cliuno.snk)" )]' >> $@.tmp &&) \ + $(if $(cli_ure_CCNUMVER_GOOD),echo '[assembly:System.Reflection.AssemblyKeyFile( @"$(call gb_Helper_windows_path,$(SRCDIR)/cli_ure/source/cliuno.snk)" )]' >> $@.tmp &&) \ mv $@.tmp $@ # vim: set noet sw=4 ts=4: commit 83b86858636d2a4d392e290d8196abd338bfea40 Author: David Tardon <dtar...@redhat.com> Date: Tue Oct 16 09:03:49 2012 +0200 add dep on dir Change-Id: Ic5de7cb3de3e7ef907a8e331a6db7ecccc690d8e diff --git a/bridges/CustomTarget_gcc3_ios_arm.mk b/bridges/CustomTarget_gcc3_ios_arm.mk index fd97131..4d1796d 100644 --- a/bridges/CustomTarget_gcc3_ios_arm.mk +++ b/bridges/CustomTarget_gcc3_ios_arm.mk @@ -10,12 +10,11 @@ $(eval $(call gb_CustomTarget_CustomTarget,bridges/source/cpp_uno/gcc3_ios_arm)) $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_ios_arm) : \ - $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S \ - | $(dir $(call gb_CustomTarget_get_target,bridges/source/cpp_uno/gcc3_ios_arm)).dir + $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/codesnippets.S : \ - $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl - mkdir -p $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm) + $(SRCDIR)/bridges/source/cpp_uno/gcc3_ios_arm/generate-snippets.pl \ + | $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_ios_arm)/.dir $(PERL) $< > $@ # vim: set noet sw=4 ts=4: _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits