[Libreoffice-commits] core.git: 2 commits - instsetoo_native/CustomTarget_setup.mk instsetoo_native/Package_setup.mk jvmfwk/source

[Stephan Bergmann]

 instsetoo_native/CustomTarget_setup.mk |    9 +++++++++
 instsetoo_native/Package_setup.mk      |    2 ++
 jvmfwk/source/fwkbase.cxx              |   23 +++++++++--------------
 3 files changed, 20 insertions(+), 14 deletions(-)

New commits:
commit f924cf3c2203be22631e6a3c631f712558fd8161
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 28 16:08:30 2013 +0100

    Related fdo#70919 Missing instdir redirect ini-file
    
    ...makes javaldx re-scan on every start.
    
    Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b

diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 6f2c647..47a52f1 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -14,6 +14,8 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\
 	$(call gb_Helper_get_rcfile,fundamental) \
 	$(if $(ENABLE_OOENV),ooenv) \
 	$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
+	    $(call gb_Helper_get_rcfile,redirect))) \
 	$(call gb_Helper_get_rcfile,uno) \
 	$(call gb_Helper_get_rcfile,version) \
 ))
@@ -101,6 +103,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 				'$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ')))) \
 	) > $@
 
+$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) :
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
+	( \
+		echo '[Bootstrap]' \
+		&& echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \
+	) > $@
+
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	( \
diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk
index 8985f87..24ebae8 100644
--- a/instsetoo_native/Package_setup.mk
+++ b/instsetoo_native/Package_setup.mk
@@ -16,6 +16,8 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\
 	$(call gb_Helper_get_rcfile,fundamental) \
 	$(if $(ENABLE_OOENV),ooenv) \
 	$(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \
+	$(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \
+	    $(call gb_Helper_get_rcfile,redirect))) \
 	$(call gb_Helper_get_rcfile,uno) \
 	$(call gb_Helper_get_rcfile,version) \
 ))
commit 658e88c59d2e5303e6388037dcd99a8f218a6960
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Oct 28 16:06:43 2013 +0100

    Improve debug output (and some clean up)
    
    Change-Id: Ibce90b4eeab679d526f0e0b1e9a8ab3b14255622

diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 1b4cf3c..0b9535e 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -40,8 +40,6 @@ using namespace osl;
 #define UNO_JAVA_JFW_ENV_CLASSPATH "UNO_JAVA_JFW_ENV_CLASSPATH"
 #define UNO_JAVA_JFW_CLASSPATH_URLS "UNO_JAVA_JFW_CLASSPATH_URLS"
 #define UNO_JAVA_JFW_VENDOR_SETTINGS "UNO_JAVA_JFW_VENDOR_SETTINGS"
-#define UNO_JAVA_JFW_USER_DATA "UNO_JAVA_JFW_USER_DATA"
-#define UNO_JAVA_JFW_SHARED_DATA "UNO_JAVA_JFW_SHARED_DATA"
 
 namespace jfw
 {
@@ -65,21 +63,18 @@ OString getVendorSettingsPath(OUString const & sURL)
     return osSystemPathSettings;
 }
 
-OUString getParam(const char * name)
+OUString getParam(OUString const & name)
 {
     OUString retVal;
-    if (Bootstrap::get()->getFrom(OUString::createFromAscii(name), retVal))
-    {
-#if OSL_DEBUG_LEVEL >=2
-        OString sValue = OUStringToOString(retVal, osl_getThreadTextEncoding());
-        fprintf(stderr,"[Java framework] Using bootstrap parameter %s = %s.\n",
-                name, sValue.getStr());
-#endif
-    }
+    bool b = Bootstrap::get()->getFrom(name, retVal);
+    SAL_INFO(
+        "jfw",
+        "Using bootstrap parameter " << name << " = \"" << retVal << "\""
+            << (b ? "" : " (undefined)"));
     return retVal;
 }
 
-OUString getParamFirstUrl(const char * name)
+OUString getParamFirstUrl(OUString const & name)
 {
     // Some parameters can consist of multiple URLs (separated by space
     // characters, although trim() harmlessly also removes other white-space),
@@ -343,12 +338,12 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
 
 OUString BootParams::getUserData()
 {
-    return getParamFirstUrl(UNO_JAVA_JFW_USER_DATA);
+    return getParamFirstUrl("UNO_JAVA_JFW_USER_DATA");
 }
 
 OUString BootParams::getSharedData()
 {
-    return getParamFirstUrl(UNO_JAVA_JFW_SHARED_DATA);
+    return getParamFirstUrl("UNO_JAVA_JFW_SHARED_DATA");
 }
 
 OString BootParams::getClasspath()