[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - solenv/gbuild solenv/inc
solenv/gbuild/platform/com_MSC_class.mk |1 + solenv/inc/DeclareDPIAware.manifest |7 +++ 2 files changed, 8 insertions(+) New commits: commit c905068b9d3b7406d629728e01a5f9460521de8f Author: Andras Timar ati...@suse.com Date: Mon May 20 20:30:04 2013 +0200 fdo#46553 Update embedded manifest on win32 builds to declare dpiAware Reviewed-on: https://gerrit.libreoffice.org/3981 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org Conflicts: solenv/gbuild/platform/com_MSC_class.mk Change-Id: I71a3960b21f2c996b97e1a5707f20b30819fd6bd Reviewed-on: https://gerrit.libreoffice.org/3987 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index c965f2b..9adb9ff 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -152,6 +152,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(DLLTARGET),; if [ ! -f $(DLLTARGET) ]; then rm -f $(1) false; fi) \ $(if $(filter Library,$(TARGETTYPE)),; if [ -f $(DLLTARGET).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(DLLTARGET).manifest -outputresource:$(DLLTARGET)\;2; fi) \ $(if $(filter Executable,$(TARGETTYPE)),; if [ -f $(1).manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(1).manifest -outputresource:$(1)\;1; fi) \ + $(if $(filter YES,$(TARGETGUI)),; if [ -f $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest ]; then mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/inc/DeclareDPIAware.manifest -updateresource:$(1)\;1 ; fi) \ ; exit $$RC) endef diff --git a/solenv/inc/DeclareDPIAware.manifest b/solenv/inc/DeclareDPIAware.manifest new file mode 100644 index 000..bb01230 --- /dev/null +++ b/solenv/inc/DeclareDPIAware.manifest @@ -0,0 +1,7 @@ +assembly xmlns=urn:schemas-microsoft-com:asm.v1 manifestVersion=1.0 xmlns:asmv3=urn:schemas-microsoft-com:asm.v3 + asmv3:application +asmv3:windowsSettings xmlns=http://schemas.microsoft.com/SMI/2005/WindowsSettings; + dpiAwaretrue/dpiAware +/asmv3:windowsSettings + /asmv3:application +/assembly ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - solenv/gbuild
solenv/gbuild/Deliver.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e260bd6d6e341b24dc5094b3657047e5fdb406c6 Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 19 14:38:58 2013 +0100 fix race condition when using hardlinks to deliver into solver We need to use touch --no-dereference on the delivered files. Otherwise, it creates empty target file when you touch symlinks and delivering the real target file might fail. This caused many build failures when delivering: liblcms2.so - liblcms2.so.2.0.4 liblcms2.so.2 - liblcms2.so.2.0.4 liblcms2.so.2.0.4 Change-Id: Ibd61815c12e002b495e848a125a959b8524b0935 Reviewed-on: https://gerrit.libreoffice.org/2840 Reviewed-by: Fridrich Strba fridr...@documentfoundation.org Tested-by: Fridrich Strba fridr...@documentfoundation.org diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index 0f257e5..ab56dab 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -60,7 +60,7 @@ endif endef define gb_Deliver__deliver -$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch -r $(1) $(2) +$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch --no-dereference -r $(1) $(2) endef ifneq ($(strip $(gb_Deliver_GNUCOPY)),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - solenv/gbuild
solenv/gbuild/Deliver.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c0e016ae93097e1de2c9d315176c2561b691854b Author: Petr Mladek pmla...@suse.cz Date: Tue Mar 19 18:05:29 2013 +0100 touch --no-dereference does not work on MACOSX Change-Id: I71e8658453e0e96e631cc2ef3996d660950c49cc diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index ab56dab..1e0fef5 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -60,7 +60,7 @@ endif endef define gb_Deliver__deliver -$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch --no-dereference -r $(1) $(2) +$(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) ) $(if $(gb_Deliver_HARDLINK),ln,cp -P -f) $(1) $(2) touch $(if $(filter-out MACOSX,$(OS_FOR_BUILD)),--no-dereference) -r $(1) $(2) endef ifneq ($(strip $(gb_Deliver_GNUCOPY)),) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - solenv/gbuild
solenv/gbuild/platform/unxgcc.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7a9b0c3ac363870f826422f7515e323865b7cbaa Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Mar 15 09:25:28 2013 +0100 remove trailing whitespace - as this is being quoted, this causes breakage Change-Id: I6834a3235ae2334a0d6f7df0f97dcde7cdc6a5d0 Reviewed-on: https://gerrit.libreoffice.org/2739 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 53d51ac..0b88221 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -339,7 +339,7 @@ endef # JunitTest class ifneq ($(OOO_TEST_SOFFICE),) -gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE) +gb_JunitTest_SOFFICEARG:=$(OOO_TEST_SOFFICE) else ifneq ($(gb_JunitTest_DEBUGRUN),) gb_JunitTest_SOFFICEARG:=connect:pipe,name=$(USER) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
