[Libreoffice-commits] .: 2 commits - desktop/unx solenv/gbuild

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Sep 21 04:41:22 PDT 2012 

 desktop/unx/source/args.c                   |    8 +++++---
 solenv/gbuild/platform/NETBSD_INTEL_GCC.mk  |    4 ++--
 solenv/gbuild/platform/NETBSD_X86_64_GCC.mk |    4 ++--
 solenv/gbuild/platform/WNT_INTEL_MSC.mk     |    2 +-
 solenv/gbuild/platform/com_GCC_defs.mk      |    2 +-
 solenv/gbuild/platform/macosx.mk            |    2 +-
 solenv/gbuild/platform/solaris.mk           |    2 +-
 solenv/gbuild/platform/unxgcc.mk            |    2 +-
 8 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit b247950eeeb2ea2345633ee018fbe2c55c1942c0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 21 13:33:37 2012 +0200

    Properly check cmdline args in oosplash
    
    ...so that e.g. --headless (starting with a "h") is not also mistaken as -h and
    disables pagein and javaldx.
    
    Change-Id: I8a7b2b0373d96ec586975e07e17e7eabe201dcd0

diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index 0952911..0e01123 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -126,14 +126,16 @@ Args *args_parse (void)
         }
 
         for ( j = 0; j < SAL_N_ELEMENTS (pArgDescr); ++j ) {
-            if (!rtl_ustr_indexOfAscii_WithLength
-                    (arg, length, pArgDescr[j].name, strlen (pArgDescr[j].name))) {
-
+            if (rtl_ustr_ascii_compare_WithLength(
+                    arg, length, pArgDescr[j].name)
+                == 0)
+            {
                 args->bInhibitSplash  |= pArgDescr[j].bInhibitSplash;
                 args->bInhibitPagein  |= pArgDescr[j].bInhibitPagein;
                 args->bInhibitJavaLdx |= pArgDescr[j].bInhibitJavaLdx;
                 if (pArgDescr[j].pPageinType)
                     args->pPageinType = pArgDescr[j].pPageinType;
+                break;
             }
         }
     }
commit 7a8e82a4e3806d5bd500eb6e553e0f40e4d33419
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 21 13:28:49 2012 +0200

    Honour preset LD_LIBRARY_PATH etc. in gbuild, too
    
    There is always the question whether we should add in front or after any
    existing value.  I add after here, mainly to keep gb_Helper_extend_ld_path
    consistent and simple.
    
    Also, WNT_INTEL_MSC JunitTest was causing the Java code to call soffice with
    empty (instead of unaugmented) PATH.
    
    Change-Id: I3888c0a9085cee7052eb6ea1ed7bbf4a2ea14408

diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index 6c79b78..81afdf3 100644
--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -34,7 +34,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
index d4288fa..3ece48b 100644
--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -33,7 +33,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk
 
 NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
 
-gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
-gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 2299980..b0721ad 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -642,7 +642,7 @@ endif # OOO_TEST_SOFFICE
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(OUTDIR)/installation/opt/program/soffice.exe}" \
-	-Dorg.openoffice.test.arg.env=PATH \
+	-Dorg.openoffice.test.arg.env=PATH="$$$$PATH" \
 	-Dorg.openoffice.test.arg.user=file:///$(call gb_JunitTest_get_userdir,$(1))
 
 endef
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index d0d6136..6145e82 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -152,7 +152,7 @@ else
 gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
 endif
 
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)="$(OUTDIR_FOR_BUILD)/lib"
+gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+:$$$(gb_Helper_LIBRARY_PATH_VAR)}"$(OUTDIR_FOR_BUILD)/lib"
 
 # $(1): list of directory pathnames to append at the end of the ld path
 define gb_Helper_extend_ld_path
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index e81f0f5..93cc450 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -396,7 +396,7 @@ endef
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
 	-Dorg.openoffice.test.arg.soffice="$$$${OOO_TEST_SOFFICE:-path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice}" \
-	-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH \
+	-Dorg.openoffice.test.arg.env=DYLD_LIBRARY_PATH"$$$${DYLD_LIBRARY_PATH+=$$$$DYLD_LIBRARY_PATH}" \
 	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
 	-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 1ecc970..7dcf498 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -382,7 +382,7 @@ endif
 
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-	-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR) \
+	-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
 	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
 	-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \
 	-Dorg.openoffice.test.arg.postprocesscommand=$(GBUILDDIR)/platform/unxgcc_gdbforjunit.sh \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 080a3ad..392de3e 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -377,7 +377,7 @@ endif
 
 define gb_JunitTest_JunitTest_platform
 $(call gb_JunitTest_get_target,$(1)) : DEFS := \
-	-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR) \
+	-Dorg.openoffice.test.arg.env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
 	-Dorg.openoffice.test.arg.user=file://$(call gb_JunitTest_get_userdir,$(1)) \
 	-Dorg.openoffice.test.arg.workdir=$(call gb_JunitTest_get_userdir,$(1)) \
 	-Dorg.openoffice.test.arg.postprocesscommand=$(GBUILDDIR)/platform/unxgcc_gdbforjunit.sh \

More information about the Libreoffice-commits mailing list