[Libreoffice-commits] .: 3 commits - Makefile.post scripting/Jar_ScriptProviderForBeanShell.mk solenv/gbuild

[Matus Kukan]

 Makefile.post                               |    6 +++++-
 scripting/Jar_ScriptProviderForBeanShell.mk |    3 +--
 solenv/gbuild/LinkTarget.mk                 |   11 ++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit a4f4e51304e9c26b58d4ab5ee4f0a63e3cd4ec91
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Apr 11 17:24:06 2012 +0200

    use gb_Helper_make_url here

diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index abe6125..7ef9af6 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -42,10 +42,9 @@ $(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
 
 $(eval $(call gb_Jar_set_manifest,ScriptProviderForBeanShell,$(SRCDIR)/scripting/java/com/sun/star/script/framework/provider/beanshell/MANIFEST.MF))
 
-#TODO: Ensure "file://$(BSH_JAR)" is a proper file URL:
 ifeq ($(SYSTEM_BSH),YES)
 $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
-    ScriptFramework.jar file://$(BSH_JAR)))
+    ScriptFramework.jar $(call gb_Helper_make_url,$(BSH_JAR))))
 else
 $(eval $(call gb_Jar_set_jarclasspath,ScriptProviderForBeanShell, \
     ScriptFramework.jar bsh.jar))
commit 803b1840c860be843e370108febb2222f7b89e71
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Apr 10 12:12:40 2012 +0200

    include environment also here

diff --git a/Makefile.post b/Makefile.post
index bfa8b34..76ea25b 100644
--- a/Makefile.post
+++ b/Makefile.post
@@ -1,7 +1,11 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))config_host.mk
+endif
+
 include $(SOLARENV)/gbuild/gbuild.mk
+
 $(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
 
 # vim: set noet sw=4 ts=4:
commit 5a248896bee2a20685ec32f85b3992a1b747355d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Tue Apr 10 03:04:49 2012 +0200

    gbuild: use => external headers
    
    This fixes circular dependencies.

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 37e2025..8d886c6 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -617,7 +617,8 @@ endif
 endef
 
 define gb_LinkTarget__use_internal_api_one
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_UnoApiHeadersTarget_get_$(3)target,$(api)))
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+	$(call gb_UnoApiHeadersTarget_get_$(3)target,$(api))
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_UnoApiHeadersTarget_get_$(3)dir,$(api))
 ifeq ($(gb_FULLDEPS),$(true))
@@ -995,13 +996,13 @@ $$(call gb_Output_error,\
 endef
 
 define gb_LinkTarget__use_custom_headers
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+	$(call gb_CustomTarget_get_target,$(2))
 $(call gb_LinkTarget_get_headers_target,$(1)) \
 $(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2))
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2))
 endif
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_CustomTarget_get_target,$(2)))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2))
 
 endef
 
@@ -1028,8 +1029,8 @@ endef
 
 # use a header package, possibly from another module (i.e. via OUTDIR)
 define gb_LinkTarget_use_package
-$(call gb_LinkTarget_get_headers_target,$(1) : | \
-	$(call gb_Package_get_target,$(strip $(2))))
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+	$(call gb_Package_get_target,$(strip $(2)))
 
 endef