[Libreoffice-commits] .: 6 commits - RepositoryModule_ooo.mk solenv/gbuild solenv/inc tail_build/prj
David Tardon
dtardon at kemper.freedesktop.org
Sat Jun 18 02:31:38 PDT 2011
RepositoryModule_ooo.mk | 3
solenv/gbuild/AllLangResTarget.mk | 4
solenv/gbuild/ComponentTarget.mk | 2
solenv/gbuild/CppunitTest.mk | 1
solenv/gbuild/Deliver.mk | 23 +++-
solenv/gbuild/Executable.mk | 3
solenv/gbuild/Library.mk | 3
solenv/gbuild/LinkTarget.mk | 11 +
solenv/gbuild/Package.mk | 8 -
solenv/gbuild/StaticLibrary.mk | 3
solenv/gbuild/TargetLocations.mk | 8 +
solenv/gbuild/UnoApiTarget.mk | 210 +++++++++++++++++++++++++++++++++++++
solenv/gbuild/gbuild.mk | 5
solenv/gbuild/platform/linux.mk | 22 +++
solenv/gbuild/platform/macosx.mk | 20 +++
solenv/gbuild/platform/solaris.mk | 19 +++
solenv/gbuild/platform/windows.mk | 24 ++++
solenv/gbuild/platform/winmingw.mk | 24 ++++
solenv/inc/target.mk | 2
tail_build/prj/build.lst | 2
20 files changed, 380 insertions(+), 17 deletions(-)
New commits:
commit 73aaaedee47e94ad56d4734e5cf293dd3cf11e16
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 30 20:08:12 2011 +0200
disable RDB check for now
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 43c9bc1..951d205 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -195,11 +195,12 @@ endef
# - generate dependencies for included idls
# - empty $? in headertarget?
+# TODO: reenable the check
$(call gb_UnoApiTarget_get_target,%):
$(call gb_Output_announce,$*,$(true),RDB,3)
$(if $(gb_UnoApiTarget_IDLFILES_$*),$(call gb_UnoApiTarget__command,$@,$*,$<,UCR,$(addprefix $(call gb_UnoApiPartTarget_get_target,),$(patsubst %.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*)))))
$(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE)))
- $(if $(UNOAPI_REFERENCE), \
+ $(if $(and $(false),$(UNOAPI_REFERENCE)), \
$(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
$(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$@))
$(if $(gb_UnoApiTarget_IDLFILES_$*), \
commit 8117db23f2ffaf23e9bc3774e44036cd5b0164a9
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 30 18:54:48 2011 +0200
remove offuh from tail_build
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index fbca641..a29e4d9 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi offuh oovbaapi oox package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript NULL
+tb tail_build : BOOST:boost LIBXML2:libxml2 LIBXSLT:libxslt MDDS:mdds MESA:Mesa REDLAND:redland TRANSLATIONS:translations animations avmedia basegfx canvas comphelper connectivity cppcanvas cppu cppuhelper filter offapi oovbaapi oox package qadevOOo DESKTOP:rdbmaker sal sax sfx2 soltools sot stoc svtools svx test toolkit tools ucbhelper unotools ure uui vbahelper vcl writerperfect xmlscript NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 5240f094a8a8d749e813e08c8a1589cf561457aa
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 30 18:47:49 2011 +0200
remove all traces of offuh from makefiles
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index f6bd6bb..320074d 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -80,6 +80,7 @@ gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_StaticLibrary_get_
endef
$(eval $(foreach method,\
+ add_api \
add_cobject \
add_cobjects \
add_cxxobject \
commit bbd617b4691c7e080da5facb26e6491ee304c2fc
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon May 30 18:20:07 2011 +0200
ause130: #i117218# complete compatibility check
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 9141904..43c9bc1 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -126,8 +126,9 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$
endef
+#UNOAPI_REFERENCE_$(1) := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
define gb_UnoApiTarget_add_reference_rdbfile
-UNOAPI_REFERENCE_$(1) := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
endef
@@ -200,7 +201,7 @@ $(call gb_UnoApiTarget_get_target,%):
$(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE)))
$(if $(UNOAPI_REFERENCE), \
$(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
- $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(UNOAPI_REFERENCE) -r2 $@)
+ $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) -r2 $(call gb_Helper_convert_native,$@))
$(if $(gb_UnoApiTarget_IDLFILES_$*), \
$(call gb_Output_announce,$*,$(true),HPP,4) \
$(call gb_UnoApiHeaderTarget__command,$@,$*,$<,$?,$(INCLUDE),$(DEFS),$(UNOAPI_DEPS)))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 2bb252c..f6f2a3d 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -489,6 +489,8 @@ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 7385021..cd96833 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -403,6 +403,8 @@ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index b067c51..06567c5 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -707,6 +707,8 @@ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 67ffc23..5f1130a 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -717,6 +717,8 @@ gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare.exe
+gb_UnoApiTarget_REGCOMPARECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
commit 262b0520262354c7c0b5dc179b831285d046ecc7
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon May 30 18:17:31 2011 +0200
ause130: #i117218# cleanup
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index b96d469..9141904 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -43,7 +43,7 @@ $(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \
endef
$(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call gb_UnoApiTarget_get_target,$(1))
- mkdir -p $$(dir $$@) && echo lala $$@
+ mkdir -p $$(dir $$@)
define gb_UnoApiTarget_UnoApiTarget
$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1))))
@@ -192,7 +192,6 @@ endef
# TODO:
# - get idlc switch "-P" (generate .urd into package dir)
# - generate dependencies for included idls
-# - check idlc defines
# - empty $? in headertarget?
$(call gb_UnoApiTarget_get_target,%):
commit a767de9269d94ba7f2b6feda18c4c1417cc61a08
Author: Hans-Joachim Lankenau <hjs at openoffice.org>
Date: Mon May 30 18:05:01 2011 +0200
ause130: #i117218# change .idl handling to gnu make
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 1942617..37c0df5 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -40,6 +40,8 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
framework \
hwpfilter \
lotuswordpro \
+ offapi \
+ oovbaapi \
oox \
padmin \
sc \
@@ -53,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
sw \
toolkit \
tools \
+ udkapi \
unotools \
unoxml \
xmloff \
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index fe4f306..fa62710 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -343,8 +343,8 @@ $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,
$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
$(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
+$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1))
endef
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 7b76fd3..c6e4a25 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -62,7 +62,7 @@ define gb_ComponentTarget_ComponentTarget
$(call gb_ComponentTarget_get_target,$(4)) : LIBFILENAME := $(3)
$(call gb_ComponentTarget_get_target,$(4)) : COMPONENTPREFIX := $(2)
$(call gb_ComponentTarget_get_outdir_target,$(1)) : $(call gb_ComponentTarget_get_target,$(4))
-$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(4)))
+$(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(4)),$(4))
endef
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index ad8eb82..3bdd9bf 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -150,6 +150,7 @@ gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_lin
endef
$(eval $(foreach method,\
+ add_api \
add_cobject \
add_cobjects \
add_cxxobject \
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index c2a5e08..aa5835a 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -34,15 +34,30 @@ gb_Deliver_CLEARONDELIVER := $(true)
define gb_Deliver_init
gb_Deliver_DELIVERABLES :=
+gb_Deliver_DELIVERABLES_INDEX :=
endef
-define gb_Deliver_add_deliverable
-gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+define gb_Deliver_do_add
+$$(if $(3),,$$(error - missing third parameter for deliverable $(1)))
+gb_Deliver_DELIVERABLES_$(notdir $(3)) += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1))
+gb_Deliver_DELIVERABLES_INDEX := $(sort $(gb_Deliver_DELIVERABLES_INDEX) $(notdir $(3)))
$(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),)
endef
+define gb_Deliver_add_deliverable
+ifeq ($(MAKECMDGOALS),showdeliverables)
+$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
+else
+ifneq ($(CWS_WORK_STAMP),)
+else
+$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3))
+endif
+endif
+
+endef
+
ifeq ($(strip $(gb_Deliver_GNUCOPY)),)
define gb_Deliver_deliver
mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -f) $(1) $(2) && touch -r $(1) $(2)
@@ -64,7 +79,7 @@ ifeq ($$(words $(gb_Module_ALLMODULES)),1)
$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1))
deliverlog : COMMAND := \
mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \
- && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(gb_Deliver_DELIVERABLES))) \
+ && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(foreach list,$$(gb_Deliver_DELIVERABLES_INDEX),$$(gb_Deliver_DELIVERABLES_$$(list))))) \
&& $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \
> $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \
&& rm -f $$$${RESPONSEFILE}
@@ -89,7 +104,7 @@ endef
showdeliverables :
$(eval MAKEFLAGS := s)
- $(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\
+ $(foreach deliverable,$(sort $(foreach list,$(gb_Deliver_DELIVERABLES_INDEX),$(gb_Deliver_DELIVERABLES_$(list)))),\
$(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable)))))
true
# vim: set noet sw=4:
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index bd3eb7d..077c0ac 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -53,7 +53,7 @@ $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
$(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
$(call gb_Executable_Executable_platform,$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_Executable_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
endef
@@ -83,6 +83,7 @@ $(eval $(foreach method,\
set_include \
set_ldflags \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
add_package_headers \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 7eafe5b..cd508de 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -75,7 +75,7 @@ $(call gb_Library_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
$(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
$(call gb_Library_Library_platform,$(1),$(2),$(gb_Library_DLLDIR)/$(call gb_Library_get_dllname,$(1)))
$$(eval $$(call gb_Module_register_target,$(call gb_Library_get_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_Library_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
endef
@@ -125,6 +125,7 @@ $(eval $(foreach method,\
set_include \
set_ldflags \
set_library_path_flags \
+ add_api \
add_linked_libs \
add_linked_static_libs \
add_package_headers \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index fd08e72..9f32df5 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -553,6 +553,17 @@ define gb_LinkTarget_set_ldflags
$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
endef
+define gb_LinkTarget_add_api
+$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
+ $$(foreach api,$(2),$$(call gb_Package_get_target,$$(api)_inc))
+$(call gb_LinkTarget_get_headers_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += $$(foreach api,$(2),-I$(OUTDIR)/inc/$$(api))
+endif
+
+endef
+
define gb_LinkTarget_add_linked_libs
ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 0ade856..9bc7e63 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -34,8 +34,7 @@ $(foreach destination,$(call gb_PackagePart_get_destinations), $(destination)/%)
define gb_PackagePart_PackagePart
$(OUTDIR)/$(1) : $(2)
$(2) :| $(3)
-$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2))
-
+$(call gb_Deliver_add_deliverable,$(OUTDIR)/$(1),$(2),$(3))
endef
@@ -44,8 +43,9 @@ endef
.PHONY : $(call gb_Package_get_clean_target,%)
$(call gb_Package_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PKG,2)
- -$(call gb_Helper_abbreviate_dirs,\
- rm -f $(FILES))
+ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(FILES)) \
+ && cat $${RESPONSEFILE} | xargs rm -f \
+ && rm -f $${RESPONSEFILE}
$(call gb_Package_get_preparation_target,%) :
mkdir -p $(dir $@) && touch $@
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index 5b85f56..f6bd6bb 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -70,7 +70,7 @@ $(call gb_StaticLibrary_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2))
$(call gb_StaticLibrary_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2))
$(call gb_StaticLibrary_StaticLibrary_platform,$(1),$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_StaticLibrary_get_clean_target,$(1))))
-$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)))
+$(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(call gb_LinkTarget_get_target,$(2)),$(1))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 155ff8b..ff208f3 100755
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -34,6 +34,7 @@ gb_PackagePart_get_destinations = \
$(OUTDIR)/xml \
$(OUTDIR)/pck \
$(OUTDIR)/inc \
+ $(OUTDIR)/idl \
$(OUTDIR)/bin \
gb_PackagePart_get_target = $(OUTDIR)/$(1)
@@ -93,6 +94,10 @@ gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/inc/$(firstword $(subst /, ,$(1)))/$(subst _tmpl,,$(notdir $(1)))
gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
+gb_UnoApiTarget_get_target = $(WORKDIR)/UnoApiTarget/$(1).rdb
+gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb
+gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
+gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
define gb_Library_get_external_headers_target
@@ -129,6 +134,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
SrsTemplateTarget \
CppunitTest \
CustomTarget \
+ UnoApiTarget \
))
$(eval $(call gb_Helper_make_outdir_clean_targets,\
@@ -136,6 +142,7 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
Library \
Package \
StaticLibrary \
+ UnoApiOutTarget \
))
$(eval $(call gb_Helper_make_dep_targets,\
@@ -146,6 +153,7 @@ $(eval $(call gb_Helper_make_dep_targets,\
LinkTarget \
SrsPartTarget \
SrsTarget \
+ UnoApiTarget \
))
# needs to use same dep target because we use gb_CxxObject__command
gb_GenCxxObject_get_dep_target = $(gb_CxxObject_get_dep_target)
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
new file mode 100644
index 0000000..b96d469
--- /dev/null
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -0,0 +1,209 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+define gb_UnoApiTarget_autopackage_inc
+$$(eval $$(call gb_Package_Package,$(1)_inc,$$(patsubst %/empty,%,$$(call gb_UnoApiTarget_get_header_target,empty))))
+$(foreach onefile,$(gb_UnoApiTarget_HPPFILES_$(1)), \
+ $$(eval $$(call gb_Package_add_file,$(1)_inc,$(patsubst $(1)/%,inc/$(1)/%,$(onefile)),$(onefile))))
+
+$(call gb_Package_get_target,$(1)_inc) : $(call gb_UnoApiTarget_get_target,$(1))
+
+endef
+
+# TODO: make multi repo safe
+define gb_UnoApiTarget_autopackage_idl
+$$(eval $$(call gb_Package_Package,$(1)_idl,$(SRCDIR)))
+$(foreach onefile,$(gb_UnoApiTarget_IDLFILES_$(1)), \
+ $$(eval $$(call gb_Package_add_file,$(1)_idl,$(patsubst $(1)/%,idl/%,$(onefile)),$(onefile))))
+
+endef
+
+$(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call gb_UnoApiTarget_get_target,$(1))
+ mkdir -p $$(dir $$@) && echo lala $$@
+
+define gb_UnoApiTarget_UnoApiTarget
+$$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1))))
+$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
+gb_UnoApiTarget_HPPFILES_$(1) :=
+gb_UnoApiTarget_IDLFILES_$(1) :=
+
+.DELETE_ON_ERROR : \
+ $(call gb_UnoApiTarget_get_clean_target,$(1)) \
+ $(call gb_UnoApiTarget_get_target,$(1))
+
+endef
+
+define gb_UnoApiTarget_add_idlfiles
+$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile,$(1),$(idl)))
+
+endef
+
+define gb_UnoApiTarget_add_idlfile
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
+$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
+gb_UnoApiTarget_HPPFILES_$(1) += $(2).hdl
+gb_UnoApiTarget_HPPFILES_$(1) += $(2).hpp
+gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
+
+$(call gb_UnoApiTarget_get_header_target,)$(2).hpp :| $(call gb_UnoApiTarget_get_target,$(1))
+$(call gb_UnoApiTarget_get_header_target,)$(2).hdl :| $(call gb_UnoApiTarget_get_target,$(1))
+
+endef
+
+define gb_UnoApiTarget_add_idlfiles_noheader
+$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(idl)))
+
+endef
+
+define gb_UnoApiTarget_add_idlfile_noheader
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
+$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
+gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
+
+endef
+
+define gb_UnoApiTarget_add_idlfiles_nohdl
+$(foreach idl,$(2),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(idl)))
+
+endef
+
+define gb_UnoApiTarget_add_idlfile_nohdl
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiPartTarget_get_target,$(2).urd)
+$(call gb_UnoApiPartTarget_get_target,$(2).urd) : $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(2).idl))
+gb_UnoApiTarget_HPPFILES_$(1) += $(2).hpp
+gb_UnoApiTarget_IDLFILES_$(1) += $(2).idl
+
+$(call gb_UnoApiTarget_get_header_target,)$(2).hpp :| $(call gb_UnoApiTarget_get_target,$(1))
+
+endef
+
+define gb_UnoApiTarget_add_rdbfiles
+$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_rdbfile,$(1),$(rdb)))
+
+endef
+
+define gb_UnoApiTarget_add_rdbfile
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS += -X$(call gb_UnoApiOutTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_target,$(1)) : \
+ $(call gb_UnoApiOutTarget_get_target,$(2)) \
+ $(call gb_Package_get_target,$(2)_idl)
+
+endef
+
+define gb_UnoApiTarget_add_merge_rdbfiles
+$(foreach rdb,$(2),$(call gb_UnoApiTarget_add_merge_rdbfile,$(1),$(rdb)))
+
+endef
+
+define gb_UnoApiTarget_add_merge_rdbfile
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_MERGE += $(call gb_UnoApiOutTarget_get_target,$(2))
+$(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$(2))
+
+endef
+
+define gb_UnoApiTarget_add_reference_rdbfile
+UNOAPI_REFERENCE_$(1) := $(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(2)).rdb))
+
+endef
+
+define gb_UnoApiTarget_set_include
+$(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(2)
+
+endef
+
+.PHONY : $(call gb_UnoApiOutTarget_get_clean_target,%)
+$(call gb_UnoApiOutTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),UNOAPI,1)
+ -$(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_UnoApiOutTarget_get_target,$*))
+
+.PHONY : $(call gb_UnoApiTarget_get_clean_target,%)
+$(call gb_UnoApiTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),UNOAPI,1)
+ -$(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_UnoApiTarget_get_target,$*))
+ -rm -rf $(call gb_UnoApiTarget_get_header_target,$*)\
+ $(call gb_UnoApiPartTarget_get_target,$*)
+
+# idlc doesn't return error codes != 0 in case of an error, so
+# check self
+define gb_UnoApiPartTarget__command
+mkdir -p $(dir $(1)) && \
+ mkdir -p $(gb_Helper_MISC) && \
+ RESPONSEFILE=`$(gb_MKTEMP)` && \
+ echo "$(call gb_Helper_convert_native,$(5) $(6) -O $(call gb_UnoApiPartTarget_get_target,$(2)) -verbose -C $(4))" > $${RESPONSEFILE} && \
+ $(gb_UnoApiTarget_IDLCCOMMAND) @$${RESPONSEFILE} > /dev/null && \
+ rm -f $${RESPONSEFILE} && \
+ test -f $(@)
+
+endef
+
+$(call gb_UnoApiPartTarget_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),IDL,2)
+ $(call gb_UnoApiPartTarget__command,$@,$(dir $*),$<,$?,$(INCLUDE),$(DEFS))
+
+
+define gb_UnoApiTarget__command
+ mkdir -p $(dir $(1)) && \
+ RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(1) $(4) $(5))) && \
+ $(gb_UnoApiTarget_REGMERGECOMMAND) @$${RESPONSEFILE} && \
+ rm -f $${RESPONSEFILE}
+
+endef
+
+define gb_UnoApiHeaderTarget__command
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ mkdir -p $(gb_Helper_MISC) && \
+ RESPONSEFILE=`$(gb_MKTEMP)` && \
+ echo " -Gc -L -BUCR -O$(call gb_UnoApiTarget_get_header_target,$*) $(7) \
+ $(1) \
+ " > $${RESPONSEFILE} && \
+ $(gb_UnoApiTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
+ rm -f $${RESPONSEFILE})
+
+endef
+
+# TODO:
+# - get idlc switch "-P" (generate .urd into package dir)
+# - generate dependencies for included idls
+# - check idlc defines
+# - empty $? in headertarget?
+
+$(call gb_UnoApiTarget_get_target,%):
+ $(call gb_Output_announce,$*,$(true),RDB,3)
+ $(if $(gb_UnoApiTarget_IDLFILES_$*),$(call gb_UnoApiTarget__command,$@,$*,$<,UCR,$(addprefix $(call gb_UnoApiPartTarget_get_target,),$(patsubst %.idl,%.urd,$(gb_UnoApiTarget_IDLFILES_$*)))))
+ $(if $(UNOAPI_MERGE),$(call gb_UnoApiTarget__command,$@,$*,$<,/,$(UNOAPI_MERGE)))
+ $(if $(UNOAPI_REFERENCE), \
+ $(call gb_Output_announce,$*,$(true),RDBCHEK,4) \
+ $(gb_UnoApiTarget_REGCOMPARECOMMAND) -f -t -r1 $(UNOAPI_REFERENCE) -r2 $@)
+ $(if $(gb_UnoApiTarget_IDLFILES_$*), \
+ $(call gb_Output_announce,$*,$(true),HPP,4) \
+ $(call gb_UnoApiHeaderTarget__command,$@,$*,$<,$?,$(INCLUDE),$(DEFS),$(UNOAPI_DEPS)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 54bd791..15322a3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -175,6 +175,8 @@ endif
include $(GBUILDDIR)/Tempfile.mk
+include $(GBUILDDIR)/Tempfile.mk
+
include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
$(eval $(call gb_Helper_collect_knownlibs))
@@ -248,6 +250,8 @@ include $(GBUILDDIR)/Deliver.mk
$(eval $(call gb_Deliver_init))
+include $(SOLARENV)/inc/minor.mk
+
# We are using a set of scopes that we might as well call classes.
# It is important to include them in the right order as that is
@@ -282,6 +286,7 @@ include $(foreach class, \
JavaClassSet \
JunitTest \
Module \
+ UnoApiTarget \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 4ef02d5..da42720 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -30,4 +30,24 @@ gb_LinkTarget_LDFLAGS += \
include $(GBUILDDIR)/platform/unxgcc.mk
-# vim: set noet sw=4:
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_REGCOMPARETARGET := $(OUTDIR)/bin/regcompare
+gb_UnoApiTarget_REGCOMPARECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGCOMPARETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 70bcdbb..2bb252c 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -153,6 +153,13 @@ define gb_Helper_convert_native
$(1)
endef
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
# CObject class
@@ -476,5 +483,16 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 14ba349..7385021 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -135,6 +135,13 @@ define gb_Helper_convert_native
$(1)
endef
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(1)
+endef
+
# CObject class
@@ -390,5 +397,15 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
+gb_UnoApiTarget_IDLCCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge
+gb_UnoApiTarget_REGMERGECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker
+gb_UnoApiTarget_CPPUMAKERCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview
+gb_UnoApiTarget_REGVIEWCOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 996517e..b067c51 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -254,6 +254,17 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
$(1)))))
endef
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
# CObject class
@@ -690,4 +701,15 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 9bfe6e7..67ffc23 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -218,6 +218,17 @@ $(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
$(1)))))
endef
+# convert parametters filesystem root to native notation
+# does some real work only on windows, make sure not to
+# break the dummy implementations on unx*
+define gb_Helper_convert_native
+$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \
+$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \
+$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \
+$(1)))))
+endef
+
# CObject class
ifeq ($(gb_FULLDEPS),$(true))
@@ -700,4 +711,15 @@ gb_Library_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/ \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
+# UnoApiTarget
+
+gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
+gb_UnoApiTarget_IDLCCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_IDLCTARGET)
+gb_UnoApiTarget_REGMERGETARGET := $(OUTDIR)/bin/regmerge.exe
+gb_UnoApiTarget_REGMERGECOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGMERGETARGET)
+gb_UnoApiTarget_CPPUMAKERTARGET := $(OUTDIR)/bin/cppumaker.exe
+gb_UnoApiTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_CPPUMAKERTARGET)
+gb_UnoApiTarget_REGVIEWTARGET := $(OUTDIR)/bin/regview.exe
+gb_UnoApiTarget_REGVIEWCOMMAND := SOLARBINDIR=$(OUTDIR)/bin $(gb_UnoApiTarget_REGVIEWTARGET)
+
# vim: set noet sw=4:
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index ed4a7b9..2eccf82 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -49,7 +49,7 @@ INCEXT*=.
INCPRE*=.
INCPOST*=.
.IF "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
-UNOINCLUDES=$(SOLARINCDIR)/offuh
+UNOINCLUDES=$(SOLARINCDIR)/udkapi -I$(SOLARINCDIR)/offapi -I$(SOLARINCDIR)/oovbaapi
.ENDIF # "$(BOOTSTRAP_SERVICE)"!="TRUE" && "$(NO_OFFUH)"==""
SOLARINC+=$(JDKINCS)
# make sure INCLUDE isn't set
More information about the Libreoffice-commits
mailing list