[Libreoffice-commits] .: 12 commits - accessibility/CustomTarget_bridge_inc.mk accessibility/CustomTarget_bridge.mk clucene/CustomTarget_source.mk cppu/CppunitTest_cppu_qa_any.mk cppu/CppunitTest_cppu_qa_recursion.mk cppu/CppunitTest_cppu_qa_reference.mk cppu/CppunitTest_cppu_qa_unotype.mk cppu/CppunitTest_cppu_test_cppumaker.mk cppuhelper/InternalUnoApi_cppuhelper.mk cppuhelper/Library_cppuhelper.mk cppuhelper/Module_cppuhelper.mk cppuhelper/Package_unotypes.mk cppuhelper/unotypes cppu/InternalUnoApi_cppu.mk cppu/Library_affine_uno.mk cppu/Library_cppu.mk cppu/Library_log_uno.mk cppu/Library_purpenvhelper.mk cppu/Library_unsafe_uno.mk cppu/Module_cppu.mk cppu/Package_generated.mk cppu/qa desktop/CustomTarget_soffice.mk extensions/CustomTarget_so_activex_idl.mk extensions/CustomTarget_so_activex_x64.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/WinResTarget_activex.mk filter/CustomTarget_svg.mk i18npool/CustomTarget_breakiterator.mk i18npool/CustomTar get_collator.mk i18npool/CustomTarget_indexentry.mk i18npool/CustomTarget_localedata.mk i18npool/CustomTarget_textconversion.mk javaunohelper/cppumaker javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk javaunohelper/Module_javaunohelper.mk javaunohelper/Package_cppumaker.mk jurt/CustomTarget_jnilib.mk jurt/CustomTarget_test_urp.mk jvmfwk/CustomTarget_jreproperties.mk officecfg/CustomTarget_registry.mk packimages/CustomTarget_images.mk ridljar/CustomTarget_javamaker.mk sal/CustomTarget_generated.mk scaddins/Library_analysis.mk scaddins/Library_date.mk sdext/CustomTarget_pdfimport.mk sdext/CustomTarget_presenter.mk solenv/gbuild tools/CustomTarget_reversemap.mk unoil/CustomTarget_climaker.mk unoil/CustomTarget_javamaker.mk vcl/CustomTarget_afm_hash.mk vcl/CustomTarget_kde4_moc.mk vcl/CustomTarget_kde_moc.mk writerfilter/CustomTarget_source.mk
Matus Kukan
mkukan at kemper.freedesktop.org
Mon Apr 9 12:06:36 PDT 2012
accessibility/CustomTarget_bridge.mk | 2
accessibility/CustomTarget_bridge_inc.mk | 4 -
clucene/CustomTarget_source.mk | 2
cppu/CppunitTest_cppu_qa_any.mk | 7 -
cppu/CppunitTest_cppu_qa_recursion.mk | 7 -
cppu/CppunitTest_cppu_qa_reference.mk | 7 -
cppu/CppunitTest_cppu_qa_unotype.mk | 7 -
cppu/CppunitTest_cppu_test_cppumaker.mk | 7 -
cppu/InternalUnoApi_cppu.mk | 47 +++++++++++
cppu/Library_affine_uno.mk | 5 -
cppu/Library_cppu.mk | 8 --
cppu/Library_log_uno.mk | 5 -
cppu/Library_purpenvhelper.mk | 5 -
cppu/Library_unsafe_uno.mk | 5 -
cppu/Module_cppu.mk | 2
cppu/Package_generated.mk | 39 ---------
cppu/qa/Makefile | 48 ------------
cppuhelper/InternalUnoApi_cppuhelper.mk | 43 ++++++++++
cppuhelper/Library_cppuhelper.mk | 7 -
cppuhelper/Module_cppuhelper.mk | 2
cppuhelper/Package_unotypes.mk | 40 ----------
cppuhelper/unotypes/Makefile | 120 ------------------------------
desktop/CustomTarget_soffice.mk | 2
extensions/CustomTarget_so_activex_idl.mk | 2
extensions/CustomTarget_so_activex_x64.mk | 2
extensions/Library_so_activex.mk | 2
extensions/Library_so_activex_x64.mk | 2
extensions/WinResTarget_activex.mk | 2
filter/CustomTarget_svg.mk | 2
i18npool/CustomTarget_breakiterator.mk | 2
i18npool/CustomTarget_collator.mk | 2
i18npool/CustomTarget_indexentry.mk | 2
i18npool/CustomTarget_localedata.mk | 12 +--
i18npool/CustomTarget_textconversion.mk | 2
javaunohelper/Library_juh.mk | 11 --
javaunohelper/Library_juhx.mk | 9 --
javaunohelper/Module_javaunohelper.mk | 1
javaunohelper/Package_cppumaker.mk | 37 ---------
javaunohelper/cppumaker/Makefile | 61 ---------------
jurt/CustomTarget_jnilib.mk | 2
jurt/CustomTarget_test_urp.mk | 2
jvmfwk/CustomTarget_jreproperties.mk | 2
officecfg/CustomTarget_registry.mk | 2
packimages/CustomTarget_images.mk | 2
ridljar/CustomTarget_javamaker.mk | 2
sal/CustomTarget_generated.mk | 2
scaddins/Library_analysis.mk | 13 ---
scaddins/Library_date.mk | 7 -
sdext/CustomTarget_pdfimport.mk | 2
sdext/CustomTarget_presenter.mk | 2
solenv/gbuild/CppunitTest.mk | 3
solenv/gbuild/CustomTarget.mk | 51 +-----------
solenv/gbuild/Extension.mk | 4 -
solenv/gbuild/Helper.mk | 2
solenv/gbuild/Jar.mk | 20 -----
solenv/gbuild/JavaClassSet.mk | 13 ---
solenv/gbuild/JunitTest.mk | 22 -----
solenv/gbuild/Package.mk | 7 -
solenv/gbuild/UnoApiTarget.mk | 10 +-
solenv/gbuild/WinResTarget.mk | 2
solenv/gbuild/gbuild.mk | 1
solenv/gbuild/gbuild_simple.mk | 109 ---------------------------
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 45 -----------
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 20 -----
solenv/gbuild/platform/com_GCC_class.mk | 48 ++++++++++++
solenv/gbuild/platform/com_GCC_defs.mk | 39 ---------
solenv/gbuild/platform/solaris.mk | 32 --------
solenv/gbuild/platform/unxgcc.mk | 22 -----
tools/CustomTarget_reversemap.mk | 2
unoil/CustomTarget_climaker.mk | 2
unoil/CustomTarget_javamaker.mk | 2
vcl/CustomTarget_afm_hash.mk | 2
vcl/CustomTarget_kde4_moc.mk | 2
vcl/CustomTarget_kde_moc.mk | 2
writerfilter/CustomTarget_source.mk | 2
75 files changed, 219 insertions(+), 855 deletions(-)
New commits:
commit f98ffc5be6ec51149e9a44b366d14565d2598829
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Apr 9 19:50:58 2012 +0200
use gb_Helper_make_url here
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index c5d2358..c21fcd9 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -34,17 +34,13 @@ $(call gb_CustomTarget_get_target,i18npool/localedata) : \
$(patsubst %.xml,$(IPLD)/localedata_%.cxx, \
$(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
-# TODO: move this to gbuild/
-my_file := file://$(if $(filter $(OS_FOR_BUILD),WNT),/)
-my_components := component/sax/source/expatwrap/expwrap.component
-
$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \
$(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,saxparser) $* $< $@.tmp \
- $(my_file)$(IPLD)/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \
- -env:LO_LIB_DIR=$(my_file)$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR) \
+ $(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) $(OUTDIR_FOR_BUILD)/bin/types.rdb \
+ -env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
rm $@.tmp)
@@ -58,6 +54,6 @@ $(IPLD)/saxparser.rdb : $(IPLD)/saxparser.input \
$(IPLD)/saxparser.input :| $(IPLD)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- echo '<list><filename>$(my_components)</filename></list>' > $@
+ echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@
# vim: set noet sw=4 ts=4:
commit badfd77af86647fa3fe4a38d4675d34b1d591dd6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Apr 9 18:31:55 2012 +0200
do not overwrite definition included from com_GCC_defs.mk
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 2d18aee..6edece5 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -123,13 +123,6 @@ gb_STDLIBS := \
mingwex \
-# Helper class
-
-# Convert path to file URL.
-define gb_Helper_make_url
-file://$(strip $(1))
-endef
-
# LinkTarget class
gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 770c7d7..894841b 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -159,11 +159,6 @@ gb_LinkTarget_LDFLAGS += \
endif
-# Convert path to file URL.
-define gb_Helper_make_url
-file://$(strip $(1))
-endef
-
ifneq ($(HAVE_LD_BSYMBOLIC_FUNCTIONS),)
gb_LinkTarget_LDFLAGS += \
-Wl,--dynamic-list-cpp-new \
commit 4c34a4698fcf5621266e95b30a1cb5ba0a9e891e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 12:21:13 2012 +0200
remove unused makefile code
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 393d25f..ac1c151 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -241,26 +241,6 @@ $(foreach customtarget,$(2),$(call gb_Jar_use_customtarget,$(1),$(customtarget))
endef
-define gb_Jar_add_package_dependency
-$$(call gb_Output_error,\
- gb_Jar_add_package_dependency: use gb_Jar_use_package instead.)
-endef
-
-define gb_Jar_use_package
-$(call gb_JavaClassSet_use_package,$(call gb_Jar_get_classsetname,$(1)),$(2))
-
-endef
-
-define gb_Jar_add_package_dependencies
-$$(call gb_Output_error,\
- gb_Jar_add_package_dependencies: use gb_Jar_use_packages instead.)
-endef
-
-define gb_Jar_use_packages
-$(foreach package,$(2),$(call gb_Jar_use_package,$(1),$(package)))
-
-endef
-
# possible directories for jar files containing UNO services
gb_Jar_COMPONENTPREFIXES := \
OOO:vnd.sun.star.expand:\dLO_JAVA_DIR/ \
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index b1bfa07..7e0954a 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -195,15 +195,4 @@ $(call gb_JavaClassSet_get_preparation_target,$(1)) : \
endef
-define gb_JavaClassSet_add_package_dependency
-$$(call gb_Output_error,\
- gb_JavaClassSet_add_package_dependency: use gb_JavaClassSet_use_package instead.)
-endef
-
-define gb_JavaClassSet_use_package
-$(call gb_JavaClassSet_get_preparation_target,$(1)) : \
- $(call gb_Package_get_target,$(2))
-
-endef
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index 187b067..40c23aa 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -159,26 +159,6 @@ $(foreach dependency,$(2),$(call gb_JunitTest_use_customtarget,$(1),$(dependency
endef
-define gb_JunitTest_add_package_dependency
-$$(call gb_Output_error,\
- gb_JunitTest_add_package_dependency: use gb_JunitTest_use_package instead.)
-endef
-
-define gb_JunitTest_use_package
-$(call gb_JavaClassSet_use_package,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
-
-endef
-
-define gb_JunitTest_add_package_dependencies
-$$(call gb_Output_error,\
- gb_JunitTest_add_package_dependencies: use gb_JunitTest_use_packages instead.)
-endef
-
-define gb_JunitTest_use_packages
-$(foreach dependency,$(2),$(call gb_JunitTest_use_package,$(1),$(dependency)))
-
-endef
-
else # OOO_JUNIT_JAR
.PHONY : $(call gb_JunitTest_get_target,$(1))
@@ -200,8 +180,6 @@ gb_JunitTest_use_jars :=
gb_JunitTest_use_jar_classset :=
gb_JunitTest_use_customtarget :=
gb_JunitTest_use_customtargets :=
-gb_JunitTest_use_package :=
-gb_JunitTest_use_packages :=
endif # OOO_JUNIT_JAR
# vim: set noet sw=4:
commit 23572492b12a64f84dadbdd8e922ae71fe2d9c2b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 10:42:47 2012 +0200
WNT_INTEL_GCC: gb_LinkTarget_EXCEPTIONFLAGS are included from com_GCC_defs
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index d9c085a..2d18aee 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -93,11 +93,6 @@ ifeq ($(HAVE_CXX0X),TRUE)
# FIXME still does not compile fully gb_CXXFLAGS += -std=gnu++0x
endif
-ifeq ($(gb_PRODUCT),$(true))
-gb_LinkTarget_EXCEPTIONFLAGS += \
- -fno-enforce-eh-specs
-endif
-
# At least sal defines its own __main, which would cause DLLs linking against
# sal to pick up sal's __main instead of the one from MinGW's dllcrt2.o:
gb_LinkTarget_LDFLAGS := \
commit 2907aa4e47ab51e4d7161cdb306cabf09f723ac4
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 10:30:18 2012 +0200
gbuild: move gb_AsmObject__command to com_GCC_class
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index ff1759d..d9c085a 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -135,27 +135,6 @@ define gb_Helper_make_url
file://$(strip $(1))
endef
-# AsmObject class
-
-gb_AsmObject_get_source = $(1)/$(2).s
-
-# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
-define gb_AsmObject__command
-$(call gb_Output_announce,$(2),$(true),ASM,3)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) $(dir $(4)) && \
- $(gb_CC) \
- $(DEFS) \
- $(T_CFLAGS) \
- $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
- -c $(3) \
- -o $(1) \
- -I$(dir $(3)) \
- $(INCLUDE)) && \
- echo "$(1) : $(3)" > $(4)
-endef
-
-
# LinkTarget class
gb_LinkTarget_CFLAGS := $(gb_CFLAGS)
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 989205a..9b302d3 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -20,6 +20,24 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+# AsmObject class
+
+gb_AsmObject_get_source = $(1)/$(2).s
+
+# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
+define gb_AsmObject__command
+$(call gb_Output_announce,$(2),$(true),ASM,3)
+$(call gb_Helper_abbreviate_dirs,\
+ $(gb_CC) \
+ $(DEFS) \
+ $(T_CFLAGS) \
+ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
+ -c $(3) \
+ -o $(1) \
+ -I$(dir $(3)) \
+ $(INCLUDE)) && \
+ echo "$(1) : $(3)" > $(4)
+endef
# CObject class
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 360fc6a..770c7d7 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -190,28 +190,6 @@ gb_DEBUG_CFLAGS := -ggdb3 -finline-limit=0 -fno-inline -fno-default-inline
gb_COMPILERNOOPTFLAGS := -O0
-# AsmObject class
-
-gb_AsmObject_get_source = $(1)/$(2).s
-
-# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
-define gb_AsmObject__command
-$(call gb_Output_announce,$(2),$(true),ASM,3)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) $(dir $(4)) && \
- $(gb_CC) \
- $(DEFS) \
- $(T_CFLAGS) \
- $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \
- -c $(3) \
- -o $(1) \
- -MMD -MT $(1) \
- -MP -MF $(4) \
- -I$(dir $(3)) \
- $(INCLUDE)) && \
- echo "$(1) : $(3)" > $(4)
-endef
-
# LinkTarget class
define gb_LinkTarget__get_rpath_for_layer
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5fb5f57..ada3ede 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -193,28 +193,6 @@ gb_DEBUG_CXXFLAGS := -fno-default-inline
gb_COMPILERNOOPTFLAGS := -O0
-# AsmObject class
-
-gb_AsmObject_get_source = $(1)/$(2).s
-
-# $(call gb_AsmObject__command,object,relative-source,source,dep-file)
-define gb_AsmObject__command
-$(call gb_Output_announce,$(2),$(true),ASM,3)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) $(dir $(4)) && \
- echo "FIXME: Building assembler with gcc not yet implemented." && exit 1
- #$(gb_CC) \
- # $(DEFS) \
- # $(T_CFLAGS) \
- # -c $(3) \
- # -o $(1) \
- # -MMD -MT $(1) \
- # -MP -MF $(4) \
- # -I$(dir $(3)) \
- # $(INCLUDE))
-endef
-
-
# LinkTarget class
define gb_LinkTarget__get_rpath_for_layer
commit 6c8c0732bcbde443b5efc92b0066bab4438bd5e4
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 10:06:49 2012 +0200
gbuild: simplify and unify gb_Helper_*native*
diff --git a/accessibility/CustomTarget_bridge_inc.mk b/accessibility/CustomTarget_bridge_inc.mk
index b641147..795c23c 100644
--- a/accessibility/CustomTarget_bridge_inc.mk
+++ b/accessibility/CustomTarget_bridge_inc.mk
@@ -36,6 +36,6 @@ $(ACBI)/WindowsAccessBridgeAdapter.h :| $(ACBI)/.dir \
$(call gb_Jar_get_target,java_uno_accessbridge)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVH,1)
cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \
- javah -classpath . -o $(call gb_Helper_convert_native,$@) org.openoffice.accessibility.WindowsAccessBridgeAdapter
+ javah -classpath . -o $(call gb_Helper_native_path,$@) org.openoffice.accessibility.WindowsAccessBridgeAdapter
# vim: set ts=4 sw=4 et:
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 44bbf3e..71eb7f4 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_Library_add_exception_objects,so_activex,\
))
$(eval $(call gb_Library_add_ldflags,so_activex,\
- /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \
+ /DEF:$(call gb_Helper_native_path,$(SRCDIR)/extensions/source/activex/so_activex.def) \
))
$(eval $(call gb_Library_use_libraries,so_activex,\
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 723c667..4b9b867 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -57,7 +57,7 @@ $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\
))
$(eval $(call gb_Library_add_ldflags,so_activex_x64,\
- /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \
+ /DEF:$(call gb_Helper_native_path,$(SRCDIR)/extensions/source/activex/so_activex.def) \
))
$(eval $(call gb_Library_use_libraries,so_activex_x64,\
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index 5e297a5..6b1ca4b 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_WinResTarget_add_file,activex_res,extensions/source/activex/so_
$(eval $(call gb_WinResTarget_set_defs,activex_res,\
$$(DEFS) \
- -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(call gb_Helper_convert_native,$(SRCDIR)),../../..,$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/extensions/source/activex/idl))) \
+ -DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(call gb_Helper_native_path,$(SRCDIR)),../../..,$(call gb_Helper_native_path,$(WORKDIR)/CustomTarget/extensions/source/activex/idl))) \
))
$(call gb_WinResTarget_get_target,activex_res) : $(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 202521e..71abde0 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -77,8 +77,8 @@ $(call gb_Extension_get_workdir,%)/description.xml : $(gb_Extension_XRMEXTARGET)
mkdir -p $(call gb_Extension_get_workdir,$*) && \
$(gb_Extension_XRMEXCOMMAND) \
-p $(PRJNAME) \
- -i $(call gb_Helper_native_path,$(filter %.xml,$^)) \
- -o $(call gb_Helper_native_path,$@) \
+ -i $(filter %.xml,$^) \
+ -o $@ \
-m $(SDF) \
-l all)
endif
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 10dac0b..3d41f77 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -47,7 +47,7 @@ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst $(WORKDI
endef
define gb_Helper_abbreviate_dirs_native
-$(call gb_Helper_convert_native,$(call gb_Helper_abbreviate_dirs,$(1)))
+$(call gb_Helper_native_path,$(call gb_Helper_abbreviate_dirs,$(1)))
endef
define gb_Helper_make_clean_target
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 35ab6d7..b1bfa07 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -42,7 +42,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(if $(filter-out $(JARDEPS),$(4)), \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
- $(call gb_Helper_convert_native,\
+ $(call gb_Helper_native_path,\
$(filter-out $(JARDEPS),$(4)))) && \
$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
$(gb_JavaClassSet_JAVACDEBUG) \
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 3096e0e..02d2391 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -56,7 +56,7 @@ define gb_UnoApiPartTarget__command
$(call gb_Output_announce,$(2),$(true),IDL,2)
mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
- $(call gb_Helper_convert_native,$(INCLUDE) \
+ $(call gb_Helper_native_path,$(INCLUDE) \
-M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \
-O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose -C \
$(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3))))) && \
@@ -95,7 +95,7 @@ $(if $(1),$(foreach type,$(shell $(gb_UnoApiTarget_XML2CMPCOMMAND) -types stdout
endef
define gb_UnoApiTarget__command_impl
-RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_convert_native,$(2))) && \
+RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,$(call gb_Helper_native_path,$(2))) && \
$(1) @$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE}
endef
@@ -121,8 +121,8 @@ $(if $(UNOAPI_REFERENCE), \
$(call gb_Output_announce,$*,$(true),DBc,3) \
&& $(gb_UnoApiTarget_REGCOMPARECOMMAND) \
-f -t \
- -r1 $(call gb_Helper_convert_native,$(UNOAPI_REFERENCE)) \
- -r2 $(call gb_Helper_convert_native,$(1)))
+ -r1 $(call gb_Helper_native_path,$(UNOAPI_REFERENCE)) \
+ -r2 $(call gb_Helper_native_path,$(1)))
endef
define gb_UnoApiTarget__check_mode
@@ -275,7 +275,7 @@ gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(gb_Helper_set_ld_path) SOLARBINDIR=
define gb_UnoApiHeadersTarget__command
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
- $(call gb_Helper_convert_native,-Gc $(4) -BUCR \
+ $(call gb_Helper_native_path,-Gc $(4) -BUCR \
-O$(3) $(call gb_UnoApiTarget_get_target,$(2)) $(UNOAPI_DEPS))) && \
$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE} && \
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 7a4fee9..563a74f 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -59,7 +59,7 @@ $(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(2)
endef
define gb_WinResTarget_add_file
-$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(gb_Helper_SRCDIR_NATIVE)/$(2).rc
+$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(SRCDIR)/$(strip $(2)).rc
$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(SRCDIR)/$(strip $(2)).rc
$(call gb_WinResTarget_get_target,$(1)) : $(SRCDIR)/$(strip $(2)).rc
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 71b644c..ff1759d 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -130,18 +130,6 @@ gb_STDLIBS := \
# Helper class
-# Convert parameters filesystem root to native notation
-# does some real work only on Windows, and this file is for
-# cross-compilation.
-define gb_Helper_convert_native
-$(1)
-endef
-
-# Convert path to native notation
-define gb_Helper_native_path
-$(1)
-endef
-
# Convert path to file URL.
define gb_Helper_make_url
file://$(strip $(1))
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 0df48c4..fff0b8a 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -245,26 +245,12 @@ endif
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/bin
-gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
-
gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
-# convert parameters 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
-$(strip \
-$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
-$(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
-$(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1)))))
-endef
-
+gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR))
# Convert path to native notation
define gb_Helper_native_path
-$(shell cygpath -m $(1))
+$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE),$(1))
endef
# Convert path to file URL.
@@ -355,7 +341,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
rm -f $(1) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100, \
- $(call gb_Helper_convert_native,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+ $(call gb_Helper_native_path,$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index a131239..8287624 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -134,14 +134,6 @@ define gb_Helper_extend_ld_path
$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir))
endef
-
-# convert parameters 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
-
# Convert path to native notation
define gb_Helper_native_path
$(1)
@@ -155,6 +147,4 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
gb_Helper_OUTDIR_FOR_BUILDLIBDIR := $(OUTDIR_FOR_BUILD)/lib
-gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs)
-
gb_Helper_get_rcfile = $(1)rc
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 6e7199c..360fc6a 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -159,11 +159,6 @@ gb_LinkTarget_LDFLAGS += \
endif
-# Convert path to native notation
-define gb_Helper_native_path
-$(1)
-endef
-
# Convert path to file URL.
define gb_Helper_make_url
file://$(strip $(1))
commit d455d7252a52eacce59bf4ea59217c760e869b0c
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 09:43:10 2012 +0200
gbuild: move YaccTarget__command to com_GCC_class
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index b8de73e..989205a 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -72,3 +72,33 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
endef
+# YaccTarget class
+
+ifeq ($(ANCIENT_BISON),YES)
+#
+# There are ancient versions of bison out there, which do not handle
+# well .cxx extensions, nor do they support --defines=<file>. The
+# result is that the header is named <foo>.cxx.h instead of <foo>.hxx
+# so we queue a mv to rename the header accordingly.
+# One example is XCode versions 2.x, which are used on OSX ppc
+# machines.
+#
+define gb_YaccTarget__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $(3)) && \
+ $(gb_YACC) $(T_YACCFLAGS) -d -o $(5) $(1) && mv $(5).h $(4) && touch $(3) )
+
+endef
+
+else
+define gb_YaccTarget__command
+$(call gb_Output_announce,$(2),$(true),YAC,3)
+$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $(3)) && \
+ $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) )
+
+endef
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 36b2cc7..a131239 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -25,35 +25,6 @@ gb_YACC := bison
gb_CLASSPATHSEP := :
-# YaccTarget class
-
-ifeq ($(ANCIENT_BISON),YES)
-#
-# There are ancient versions of bison out there, which do not handle
-# well .cxx extensions, nor do they support --defines=<file>. The
-# result is that the header is named <foo>.cxx.h instead of <foo>.hxx
-# so we queue a mv to rename the header accordingly.
-# One example is XCode versions 2.x, which are used on OSX ppc
-# machines.
-#
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(3)) && \
- $(gb_YACC) $(T_YACCFLAGS) -d -o $(5) $(1) && mv $(5).h $(4) && touch $(3) )
-
-endef
-
-else
-define gb_YaccTarget__command
-$(call gb_Output_announce,$(2),$(true),YAC,3)
-$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(3)) && \
- $(gb_YACC) $(T_YACCFLAGS) --defines=$(4) -o $(5) $(1) && touch $(3) )
-
-endef
-endif
-
# use CC/CXX if they are nondefaults
ifneq ($(origin CC),default)
gb_CC := $(CC)
commit 0a45deba2be4a77db7540bd050b25bd6c26d7513
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 08:40:35 2012 +0200
enforce only one possible use of gb_CustomTarget
This brings two changes:
- no more recursive calling of make
- gbuild_simple is now not used => removed
diff --git a/accessibility/CustomTarget_bridge.mk b/accessibility/CustomTarget_bridge.mk
index bc58988..1d26e84 100644
--- a/accessibility/CustomTarget_bridge.mk
+++ b/accessibility/CustomTarget_bridge.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge))
ACBR := $(call gb_CustomTarget_get_workdir,accessibility/bridge)
diff --git a/accessibility/CustomTarget_bridge_inc.mk b/accessibility/CustomTarget_bridge_inc.mk
index d64b19b..b641147 100644
--- a/accessibility/CustomTarget_bridge_inc.mk
+++ b/accessibility/CustomTarget_bridge_inc.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge/inc,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge/inc))
ACBI := $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)
diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk
index c1d8586..474d1b8 100644
--- a/clucene/CustomTarget_source.mk
+++ b/clucene/CustomTarget_source.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,clucene/source,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,clucene/source))
CLSO := $(call gb_CustomTarget_get_workdir,clucene/source)
diff --git a/desktop/CustomTarget_soffice.mk b/desktop/CustomTarget_soffice.mk
index 5e12856..8d49935 100644
--- a/desktop/CustomTarget_soffice.mk
+++ b/desktop/CustomTarget_soffice.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice))
DESO := $(call gb_CustomTarget_get_workdir,desktop/soffice)
diff --git a/extensions/CustomTarget_so_activex_idl.mk b/extensions/CustomTarget_so_activex_idl.mk
index 80d8089..582b031 100644
--- a/extensions/CustomTarget_so_activex_idl.mk
+++ b/extensions/CustomTarget_so_activex_idl.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl))
EXAI := $(call gb_CustomTarget_get_workdir,extensions/source/activex/idl)
diff --git a/extensions/CustomTarget_so_activex_x64.mk b/extensions/CustomTarget_so_activex_x64.mk
index f894bac..88b07b1 100644
--- a/extensions/CustomTarget_so_activex_x64.mk
+++ b/extensions/CustomTarget_so_activex_x64.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex))
EXSA := $(call gb_CustomTarget_get_workdir,extensions/source/activex)
diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk
index 29156a7..d841dbd 100644
--- a/filter/CustomTarget_svg.mk
+++ b/filter/CustomTarget_svg.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,filter/source/svg,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,filter/source/svg))
FISS := $(call gb_CustomTarget_get_workdir,filter/source/svg)
diff --git a/i18npool/CustomTarget_breakiterator.mk b/i18npool/CustomTarget_breakiterator.mk
index a8379d7..4ba03d5 100644
--- a/i18npool/CustomTarget_breakiterator.mk
+++ b/i18npool/CustomTarget_breakiterator.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
IPBI := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
diff --git a/i18npool/CustomTarget_collator.mk b/i18npool/CustomTarget_collator.mk
index 54a2d0c..9be28e0 100644
--- a/i18npool/CustomTarget_collator.mk
+++ b/i18npool/CustomTarget_collator.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator))
IPCO := $(call gb_CustomTarget_get_workdir,i18npool/collator)
TXTLIST := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt))
diff --git a/i18npool/CustomTarget_indexentry.mk b/i18npool/CustomTarget_indexentry.mk
index c28dbf1..681dd4c 100644
--- a/i18npool/CustomTarget_indexentry.mk
+++ b/i18npool/CustomTarget_indexentry.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/indexentry,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/indexentry))
IPIE := $(call gb_CustomTarget_get_workdir,i18npool/indexentry)
diff --git a/i18npool/CustomTarget_localedata.mk b/i18npool/CustomTarget_localedata.mk
index 48b611e..c5d2358 100644
--- a/i18npool/CustomTarget_localedata.mk
+++ b/i18npool/CustomTarget_localedata.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata))
IPLD := $(call gb_CustomTarget_get_workdir,i18npool/localedata)
diff --git a/i18npool/CustomTarget_textconversion.mk b/i18npool/CustomTarget_textconversion.mk
index fa07733..da58b1b 100644
--- a/i18npool/CustomTarget_textconversion.mk
+++ b/i18npool/CustomTarget_textconversion.mk
@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,i18npool/textconversion,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,i18npool/textconversion))
IPTC := $(call gb_CustomTarget_get_workdir,i18npool/textconversion)
diff --git a/jurt/CustomTarget_jnilib.mk b/jurt/CustomTarget_jnilib.mk
index 71d90f6..5badfc2 100644
--- a/jurt/CustomTarget_jnilib.mk
+++ b/jurt/CustomTarget_jnilib.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,jurt/util,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,jurt/util))
JUJL := $(call gb_CustomTarget_get_workdir,jurt/util)
diff --git a/jurt/CustomTarget_test_urp.mk b/jurt/CustomTarget_test_urp.mk
index 73f6fad..f5c2f6b 100644
--- a/jurt/CustomTarget_test_urp.mk
+++ b/jurt/CustomTarget_test_urp.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp))
JUTU := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp)
diff --git a/jvmfwk/CustomTarget_jreproperties.mk b/jvmfwk/CustomTarget_jreproperties.mk
index 6b49d64..ffeb578 100644
--- a/jvmfwk/CustomTarget_jreproperties.mk
+++ b/jvmfwk/CustomTarget_jreproperties.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jreproperties,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jreproperties))
JFJP := $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)
diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk
index 8f5ea48..7bf0ba7 100644
--- a/officecfg/CustomTarget_registry.mk
+++ b/officecfg/CustomTarget_registry.mk
@@ -29,7 +29,7 @@
OCDIR := $(SRCDIR)/officecfg/registry
include $(OCDIR)/files.mk
-$(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry))
OCRG := $(call gb_CustomTarget_get_workdir,officecfg/registry)
diff --git a/packimages/CustomTarget_images.mk b/packimages/CustomTarget_images.mk
index d602137..3e4efda 100644
--- a/packimages/CustomTarget_images.mk
+++ b/packimages/CustomTarget_images.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,packimages/images,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,packimages/images))
PIIM := $(call gb_CustomTarget_get_workdir,packimages/images)
diff --git a/ridljar/CustomTarget_javamaker.mk b/ridljar/CustomTarget_javamaker.mk
index ef72abd..31a7739 100644
--- a/ridljar/CustomTarget_javamaker.mk
+++ b/ridljar/CustomTarget_javamaker.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,ridljar/javamaker,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,ridljar/javamaker))
RJJM := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk
index b968acc..c0be5b6 100644
--- a/sal/CustomTarget_generated.mk
+++ b/sal/CustomTarget_generated.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,sal/generated,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,sal/generated))
SAUT := $(call gb_CustomTarget_get_workdir,sal/generated)
diff --git a/sdext/CustomTarget_pdfimport.mk b/sdext/CustomTarget_pdfimport.mk
index 3e57b3d..c5fae4a 100644
--- a/sdext/CustomTarget_pdfimport.mk
+++ b/sdext/CustomTarget_pdfimport.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,sdext/pdfimport,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,sdext/pdfimport))
SEPI := $(call gb_CustomTarget_get_workdir,sdext/pdfimport)
diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk
index fee465c..5b61881 100644
--- a/sdext/CustomTarget_presenter.mk
+++ b/sdext/CustomTarget_presenter.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen))
SEPR := $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index c2456c0..31c5e9c 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -26,66 +26,23 @@
#
#*************************************************************************
-# N.B.: putting the "+" there at the start activates the GNU make job server
-define gb_CustomTarget__command
-+$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
- O='$(OUTDIR)' S='$(SRCDIR)' W='$(WORKDIR)' gb_AWK='$(gb_AWK)' \
- gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' SRCDIR='$(SRCDIR)' \
- $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
- touch $(1))
-
-endef
-
# the .dir is for make 3.81, which ignores trailing /
$(call gb_CustomTarget_get_workdir,%)/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_CustomTarget_get_target,%) :
- $(call gb_Output_announce,$*,$(true),MAK,3)
- $(if $(NEW_STYLE),touch $@,\
- $(call gb_CustomTarget__command,$@,$*))
+ $(call gb_Output_announce,$*,$(true),CUS,3)
+ touch $@
.PHONY: $(call gb_CustomTarget_get_clean_target,%)
$(call gb_CustomTarget_get_clean_target,%) :
- $(call gb_Output_announce,$*,$(false),MAK,3)
+ $(call gb_Output_announce,$*,$(false),CUS,3)
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(call gb_CustomTarget_get_workdir,$*) && \
rm -f $(call gb_CustomTarget_get_target,$*))
-define gb_CustomTarget__get_makefile
-$(SRCDIR)/$(1)/Makefile
-endef
-
define gb_CustomTarget_CustomTarget
-$(call gb_CustomTarget_get_target,$(1)) : NEW_STYLE := $(2)
-ifeq ($(2),)
-$(call gb_CustomTarget_get_target,$(1)) : \
- $(call gb_CustomTarget__get_makefile,$(1))
-else
-$$(eval $$(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
-endif
-
-endef
-
-
-define gb_CustomTarget_add_dependency
-$(call gb_CustomTarget_get_target,$(1)) : $(SRCDIR)/$(2)
-
-endef
-
-define gb_CustomTarget_add_dependencies
-$(foreach dependency,$(2),$(call gb_CustomTarget_add_dependency,$(1),$(dependency)))
-
-endef
-
-define gb_CustomTarget_add_outdir_dependency
-$(call gb_CustomTarget_get_target,$(1)) : $(2)
-
-endef
-
-define gb_CustomTarget_add_outdir_dependencies
-$(foreach dependency,$(2),$(call gb_CustomTarget_add_outdir_dependency,$(1),$(dependency)))
+$(eval $(call gb_Module_register_target,$(call gb_CustomTarget_get_target,$(1)),$(call gb_CustomTarget_get_clean_target,$(1))))
endef
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 1a4bf52..62d82bd 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -83,11 +83,4 @@ $(call gb_PackagePart_PackagePart,$(2),$$(gb_Package_SOURCEDIR_$(1))/$(3),$(call
endef
-define gb_Package_add_customtarget
-$(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2))
-$(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2))
-$(eval $(call gb_CustomTarget_CustomTarget,$(2)))
-
-endef
-
# vim: set noet sw=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 45d3b4a..b12c88f 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -49,7 +49,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
.DELETE_ON_ERROR:
SHELL := /bin/sh
-MAKEFLAGS+=-r
true := T
false :=
define NEWLINE
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
deleted file mode 100644
index 6ee9e09..0000000
--- a/solenv/gbuild/gbuild_simple.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2011 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.
-#
-#*************************************************************************
-
-GBUILDDIR:=$(SRC_ROOT)/solenv/gbuild
-
-# this is a subset of gbuild functionality, for use in custom makefiles
-
-COMMA :=,
-
-include $(GBUILDDIR)/Output.mk
-
-# BuildDirs overrides *DIR variables for Windows
-include $(GBUILDDIR)/BuildDirs.mk
-
-# Presumably the common parts in gbuild.mk and gbuild_simple.mk should
-# be factored out into one file instead of duplicating, but... perhaps
-# wait until this stabilizes a bit and we know with more certainty
-# what is needed in both.
-
-# Or alternatively: Just mark these variables for export in gbuild.mk?
-# I think any use of gbuild_simple.mk is in a sub-make under one that
-# uses gbuild.mk anyway.
-
-ifneq ($(strip $(PRODUCT)$(product)),)
-gb_PRODUCT := $(true)
-else
-gb_PRODUCT := $(false)
-endif
-
-# These are useful, too, for stuff built in "custom" Makefiles
-ifneq ($(strip $(ENABLE_SYMBOLS)$(enable_symbols)),)
-gb_SYMBOL := $(true)
-else
-gb_SYMBOL := $(false)
-endif
-
-gb_DEBUGLEVEL := 0
-ifneq ($(strip $(DEBUG)$(debug)),)
-gb_DEBUGLEVEL := 1
-endif
-
-ifneq ($(strip $(DBGLEVEL)$(dbglevel)),)
-ifneq ($(strip $(dbglevel)),)
-gb_DEBUGLEVEL := $(strip $(dbglevel))
-else
-gb_DEBUGLEVEL := $(strip $(DBGLEVEL))
-endif
-endif
-
-ifneq ($(gb_DEBUGLEVEL),0)
-gb_SYMBOL := $(true)
-endif
-
-include $(GBUILDDIR)/Helper.mk
-include $(GBUILDDIR)/Tempfile.mk
-
-# Include platform/cpu/compiler specific config/definitions
-include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
-
-ifeq ($(CROSS_COMPILING),YES)
-# We can safely Assume all cross-compilation is from Unix systems.
-gb_Executable_EXT_for_build :=
-else
-gb_Executable_EXT_for_build := $(gb_Executable_EXT)
-endif
-
-ifeq ($(SYSTEM_PYTHON),YES)
-gb_PYTHONTARGET :=
-gb_PYTHON := $(PYTHON)
-else ifeq ($(OS),MACOSX)
-#fixme: remove this MACOSX ifeq branch by filling in gb_PYTHON_PRECOMMAND in
-#gbuild/platform/macosx.mk correctly for mac, e.g. PYTHONPATH and PYTHONHOME
-#dirs for in-tree internal python
-gb_PYTHONTARGET :=
-gb_PYTHON := $(PYTHON)
-else ifeq ($(DISABLE_PYTHON),TRUE)
-# Build-time python
-gb_PYTHON := python
-else
-gb_PYTHONTARGET := $(OUTDIR)/bin/python
-gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET)
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/tools/CustomTarget_reversemap.mk b/tools/CustomTarget_reversemap.mk
index c15dc0e..71efdc8 100644
--- a/tools/CustomTarget_reversemap.mk
+++ b/tools/CustomTarget_reversemap.mk
@@ -23,7 +23,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,tools/reversemap,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,tools/reversemap))
TLRM := $(call gb_CustomTarget_get_workdir,tools/reversemap)
diff --git a/unoil/CustomTarget_climaker.mk b/unoil/CustomTarget_climaker.mk
index 0e529d0..78eda26 100644
--- a/unoil/CustomTarget_climaker.mk
+++ b/unoil/CustomTarget_climaker.mk
@@ -27,7 +27,7 @@
include $(SRCDIR)/unoil/climaker/version.txt
-$(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker))
UICM := $(call gb_CustomTarget_get_workdir,unoil/climaker)
diff --git a/unoil/CustomTarget_javamaker.mk b/unoil/CustomTarget_javamaker.mk
index 636a65d..73fd436 100644
--- a/unoil/CustomTarget_javamaker.mk
+++ b/unoil/CustomTarget_javamaker.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker))
UIJM := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
diff --git a/vcl/CustomTarget_afm_hash.mk b/vcl/CustomTarget_afm_hash.mk
index 57ec6cc..23cc4ca 100644
--- a/vcl/CustomTarget_afm_hash.mk
+++ b/vcl/CustomTarget_afm_hash.mk
@@ -23,7 +23,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/generic/fontmanager,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/generic/fontmanager))
VCFM := $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)
diff --git a/vcl/CustomTarget_kde4_moc.mk b/vcl/CustomTarget_kde4_moc.mk
index 5d0e4b5..bd887e5 100644
--- a/vcl/CustomTarget_kde4_moc.mk
+++ b/vcl/CustomTarget_kde4_moc.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4))
VCKM := $(call gb_CustomTarget_get_workdir,vcl/unx/kde4)
diff --git a/vcl/CustomTarget_kde_moc.mk b/vcl/CustomTarget_kde_moc.mk
index 7d54c0b..85a65ea 100644
--- a/vcl/CustomTarget_kde_moc.mk
+++ b/vcl/CustomTarget_kde_moc.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker))
VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index e0dda39..95fe266 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -27,7 +27,7 @@
#*************************************************************************
-$(eval $(call gb_CustomTarget_CustomTarget,writerfilter/source,new_style))
+$(eval $(call gb_CustomTarget_CustomTarget,writerfilter/source))
WFSG := $(call gb_CustomTarget_get_workdir,writerfilter/source)
WFDIR := $(SRCDIR)/writerfilter/source/
commit 7b743c9628d9479ee3fe2650a43eee5a9a02b8a4
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 01:33:26 2012 +0200
javaunohelper: use InternalUnoApi
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
index 19297e7..4783bd9 100644
--- a/javaunohelper/Library_juh.mk
+++ b/javaunohelper/Library_juh.mk
@@ -27,16 +27,7 @@
$(eval $(call gb_Library_Library,juh))
-$(eval $(call gb_Library_use_package,juh,\
- javaunohelper_cppumaker \
-))
-
-$(eval $(call gb_Library_set_include,juh,\
- $$(INCLUDE) \
- -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \
-))
-
-$(eval $(call gb_Library_use_api,juh,\
+$(eval $(call gb_Library_use_internal_comprehensive_api,juh,\
udkapi \
))
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk
index f35ec61..7f1f604 100644
--- a/javaunohelper/Library_juhx.mk
+++ b/javaunohelper/Library_juhx.mk
@@ -27,13 +27,8 @@
$(eval $(call gb_Library_Library,juhx))
-$(eval $(call gb_Library_use_package,juhx,\
- javaunohelper_cppumaker \
-))
-
-$(eval $(call gb_Library_set_include,juhx,\
- $$(INCLUDE) \
- -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \
+$(eval $(call gb_Library_use_internal_comprehensive_api,juhx,\
+ udkapi \
))
$(eval $(call gb_Library_use_libraries,juhx,\
diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk
index 153f8b2..27c53e4 100644
--- a/javaunohelper/Module_javaunohelper.mk
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,javaunohelper,\
Library_juh \
Library_juhx \
Jar_juh \
- Package_cppumaker \
Zip_juh \
))
endif
diff --git a/javaunohelper/Package_cppumaker.mk b/javaunohelper/Package_cppumaker.mk
deleted file mode 100644
index b53301a..0000000
--- a/javaunohelper/Package_cppumaker.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,javaunohelper_cppumaker,$(WORKDIR)/CustomTarget/javaunohelper/cppumaker))
-
-$(eval $(call gb_Package_add_customtarget,javaunohelper_cppumaker,javaunohelper/cppumaker))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,javaunohelper/cppumaker,\
- $(OUTDIR_FOR_BUILD)/bin/cppumaker$(gb_Executable_EXT_for_build) \
- $(OUTDIR)/bin/udkapi.rdb \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile
deleted file mode 100644
index 8ed1298..0000000
--- a/javaunohelper/cppumaker/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-gb_PARTIALBUILD := T
-include $(GBUILDDIR)/gbuild_simple.mk
-
-done : $(gb_UnoApiTarget_CPPUMAKERTARGET) $(OUTDIR)/bin/udkapi.rdb
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,cppumaker -C -BUCR -O. \
- -Tcom.sun.star.beans.NamedValue \
- -Tcom.sun.star.beans.XPropertySet \
- -Tcom.sun.star.container.XHierarchicalNameAccess \
- -Tcom.sun.star.lang.DisposedException \
- -Tcom.sun.star.lang.IllegalArgumentException \
- -Tcom.sun.star.lang.XComponent \
- -Tcom.sun.star.lang.XInitialization \
- -Tcom.sun.star.lang.XMultiComponentFactory \
- -Tcom.sun.star.lang.XMultiServiceFactory \
- -Tcom.sun.star.lang.XServiceInfo \
- -Tcom.sun.star.lang.XSingleComponentFactory \
- -Tcom.sun.star.lang.XSingleServiceFactory \
- -Tcom.sun.star.lang.XTypeProvider \
- -Tcom.sun.star.loader.XImplementationLoader \
- -Tcom.sun.star.registry.XRegistryKey \
- -Tcom.sun.star.registry.XSimpleRegistry \
- -Tcom.sun.star.uno.TypeClass \
- -Tcom.sun.star.uno.XAggregation \
- -Tcom.sun.star.uno.XComponentContext \
- -Tcom.sun.star.uno.XWeak \
- $(OUTDIR)/bin/udkapi.rdb) && \
- touch $@)
-
-.DEFAULT_GOAL := all
-.PHONY : all
-all : done
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
commit 02736329564fa54c9a1401515774e7cf58899295
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 01:27:55 2012 +0200
cppuhelper: use InternalUnoApi
diff --git a/cppuhelper/InternalUnoApi_cppuhelper.mk b/cppuhelper/InternalUnoApi_cppuhelper.mk
new file mode 100644
index 0000000..0779595
--- /dev/null
+++ b/cppuhelper/InternalUnoApi_cppuhelper.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppuhelper))
+
+$(eval $(call gb_InternalUnoApi_use_api,cppuhelper,\
+ udkapi \
+))
+
+$(eval $(call gb_InternalUnoApi_set_include,cppuhelper,\
+ -I$(OUTDIR)/idl \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppuhelper,cppuhelper/unotypes/cppuhelper/detail,\
+ XExceptionThrower \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index c653f04..18837ac 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -30,13 +30,12 @@ $(eval $(call gb_Library_Library,cppuhelper))
$(eval $(call gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map))
$(eval $(call gb_Library_use_packages,cppuhelper,\
- cppuhelper_generated \
cppuhelper_inc \
))
-$(eval $(call gb_Library_set_include,cppuhelper,\
- -I$(WORKDIR)/CustomTarget/cppuhelper/unotypes \
- $$(INCLUDE) \
+$(eval $(call gb_Library_use_internal_comprehensive_api,cppuhelper,\
+ cppuhelper \
+ udkapi \
))
$(eval $(call gb_Library_add_defs,cppuhelper,\
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
index e547e0b..e2e0fb2 100644
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -28,11 +28,11 @@
$(eval $(call gb_Module_Module,cppuhelper))
$(eval $(call gb_Module_add_targets,cppuhelper,\
+ InternalUnoApi_cppuhelper \
Library_cppuhelper \
Package_findsofficepath \
Package_inc \
Package_unorc \
- Package_unotypes \
))
$(eval $(call gb_Module_add_check_targets,cppuhelper,\
diff --git a/cppuhelper/Package_unotypes.mk b/cppuhelper/Package_unotypes.mk
deleted file mode 100644
index 4e17584..0000000
--- a/cppuhelper/Package_unotypes.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,cppuhelper_generated))
-
-$(eval $(call gb_Package_add_customtarget,cppuhelper_generated,cppuhelper/unotypes))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,cppuhelper/unotypes,\
- $(gb_UnoApiTarget_CPPUMAKERTARGET) \
- $(gb_UnoApiTarget_IDLCTARGET) \
- $(gb_UnoApiTarget_REGMERGETARGET) \
- $(OUTDIR_FOR_BUILD)/bin/types.rdb \
- $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/unotypes/Makefile b/cppuhelper/unotypes/Makefile
deleted file mode 100644
index c92ad45..0000000
--- a/cppuhelper/unotypes/Makefile
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com>
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild.mk
-
-all: private_types.flag unotypes.flag
-
-# private_types
-private_types.flag: private_types.rdb $(gb_UnoApiTarget_CPPUMAKERTARGET)
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,cppumaker) -O. -BUCR -C $< \
- -Tcppuhelper.detail.XExceptionThrower \
- -X$(OUTDIR_FOR_BUILD)/bin/types.rdb)
- touch $@
-
-private_types.rdb: XExceptionThrower.urd
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,regmerge) $@ /UCR $< \
- $(OUTDIR_FOR_BUILD)/bin/types.rdb)
-
-XExceptionThrower.urd: $(SRCDIR)/cppuhelper/unotypes/cppuhelper/detail/XExceptionThrower.idl
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,idlc) -I. -I$(OUTDIR_FOR_BUILD)/idl -O. $<)
-
-# unotypes
-unotypes.flag: $(gb_UnoApiTarget_CPPUMAKERTARGET)
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,cppumaker) -O. -BUCR -C \
- $(foreach type,$(UNOTYPES),-T$(type)) $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb)
- touch $@
-
-UNOTYPES := \
- com.sun.star.beans.PropertyAttribute \
- com.sun.star.beans.PropertyValue \
- com.sun.star.beans.XFastPropertySet \
- com.sun.star.beans.XMultiPropertySet \
- com.sun.star.beans.XPropertyAccess \
- com.sun.star.beans.XPropertySet \
- com.sun.star.beans.XPropertySetOption \
- com.sun.star.bridge.UnoUrlResolver \
- com.sun.star.bridge.XUnoUrlResolver \
- com.sun.star.connection.SocketPermission \
- com.sun.star.container.XElementAccess \
- com.sun.star.container.XEnumerationAccess \
- com.sun.star.container.XHierarchicalNameAccess \
- com.sun.star.container.XNameAccess \
- com.sun.star.container.XNameContainer \
- com.sun.star.container.XSet \
- com.sun.star.io.FilePermission \
- com.sun.star.io.IOException \
- com.sun.star.lang.DisposedException \
- com.sun.star.lang.WrappedTargetRuntimeException \
- com.sun.star.lang.XComponent \
- com.sun.star.lang.XEventListener \
- com.sun.star.lang.XInitialization \
- com.sun.star.lang.XMultiComponentFactory \
- com.sun.star.lang.XMultiServiceFactory \
- com.sun.star.lang.XServiceInfo \
- com.sun.star.lang.XSingleComponentFactory \
- com.sun.star.lang.XSingleServiceFactory \
- com.sun.star.lang.XTypeProvider \
- com.sun.star.loader.XImplementationLoader \
- com.sun.star.reflection.XArrayTypeDescription \
- com.sun.star.reflection.XCompoundTypeDescription \
- com.sun.star.reflection.XEnumTypeDescription \
- com.sun.star.reflection.XIdlClass \
- com.sun.star.reflection.XIdlField2 \
- com.sun.star.reflection.XIdlReflection \
- com.sun.star.reflection.XIndirectTypeDescription \
- com.sun.star.reflection.XInterfaceAttributeTypeDescription \
- com.sun.star.reflection.XInterfaceAttributeTypeDescription2 \
- com.sun.star.reflection.XInterfaceMemberTypeDescription \
- com.sun.star.reflection.XInterfaceMethodTypeDescription \
- com.sun.star.reflection.XInterfaceTypeDescription2 \
- com.sun.star.reflection.XMethodParameter \
- com.sun.star.reflection.XStructTypeDescription \
- com.sun.star.reflection.XTypeDescription \
- com.sun.star.reflection.XUnionTypeDescription \
- com.sun.star.registry.XImplementationRegistration \
- com.sun.star.registry.XRegistryKey \
- com.sun.star.registry.XSimpleRegistry \
- com.sun.star.security.RuntimePermission \
- com.sun.star.security.XAccessController \
- com.sun.star.uno.DeploymentException \
- com.sun.star.uno.RuntimeException \
- com.sun.star.uno.XAggregation \
- com.sun.star.uno.XComponentContext \
- com.sun.star.uno.XCurrentContext \
- com.sun.star.uno.XUnloadingPreference \
- com.sun.star.uno.XWeak \
- com.sun.star.util.XMacroExpander
-
-.DEFAULT_GOAL:=all
-.PHONY: all
-# vim: set noet sw=4 ts=4:
commit 9e7d5cd530365450a404cc26716890ecdc4281b6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 01:17:07 2012 +0200
cppu: use InternalUnoApi
diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk
index 6263e7d..200abe9 100644
--- a/cppu/CppunitTest_cppu_qa_any.mk
+++ b/cppu/CppunitTest_cppu_qa_any.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_qa_any,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_any, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk
index 1534e38..9ff9af3 100644
--- a/cppu/CppunitTest_cppu_qa_recursion.mk
+++ b/cppu/CppunitTest_cppu_qa_recursion.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_qa_recursion,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_recursion, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
index 1dc96fe..a49d546 100644
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_qa_reference,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_reference, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk
index bb1ac91..9e4619c 100644
--- a/cppu/CppunitTest_cppu_qa_unotype.mk
+++ b/cppu/CppunitTest_cppu_qa_unotype.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_qa_unotype,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_qa_unotype, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk
index 0c495c0..a3bb717 100644
--- a/cppu/CppunitTest_cppu_test_cppumaker.mk
+++ b/cppu/CppunitTest_cppu_test_cppumaker.mk
@@ -37,10 +37,9 @@ $(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_test_cppumaker,\
- -I$(WORKDIR)/CustomTarget/cppu/qa \
- -I$(SRCDIR)/cppu/inc \
- $$(INCLUDE) \
+$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_test_cppumaker, \
+ cppu \
+ udkapi \
))
# vim: set noet sw=4 ts=4:
diff --git a/cppu/InternalUnoApi_cppu.mk b/cppu/InternalUnoApi_cppu.mk
new file mode 100644
index 0000000..b60e2b7
--- /dev/null
+++ b/cppu/InternalUnoApi_cppu.mk
@@ -0,0 +1,47 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_InternalUnoApi_InternalUnoApi,cppu))
+
+$(eval $(call gb_InternalUnoApi_use_api,cppu,\
+ udkapi \
+))
+
+$(eval $(call gb_InternalUnoApi_set_include,cppu,\
+ -I$(OUTDIR)/idl \
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu,cppu/qa,\
+ types \
+))
+
+$(eval $(call gb_InternalUnoApi_add_idlfiles,cppu,cppu/qa/cppumaker,\
+ types \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk
index 3318271..b4ab2fd 100644
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_Library_Library,affine_uno))
-$(eval $(call gb_Library_set_include,affine_uno,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_Library_use_api,affine_uno,\
udkapi \
offapi \
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index 9dcb35a..78eae8f 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -29,13 +29,7 @@ $(eval $(call gb_Library_Library,cppu))
$(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map))
-# Unit tests depend on cppu_generated custom target
-$(eval $(call gb_Library_use_package,cppu,cppu_generated))
-
-$(eval $(call gb_Library_set_include,cppu,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
+$(eval $(call gb_Library_use_package,cppu,cppu_inc))
$(eval $(call gb_Library_use_api,cppu,\
udkapi \
diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk
index 582414d..7e371e9 100644
--- a/cppu/Library_log_uno.mk
+++ b/cppu/Library_log_uno.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_Library_Library,log_uno))
-$(eval $(call gb_Library_set_include,log_uno,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_Library_use_api,log_uno,\
udkapi \
offapi \
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index 60d0485..1deaca4 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -29,11 +29,6 @@ $(eval $(call gb_Library_Library,purpenvhelper))
$(eval $(call gb_Library_set_soversion_script,purpenvhelper,3,$(SRCDIR)/cppu/util/uno_purpenvhelpergcc3.map))
-$(eval $(call gb_Library_set_include,purpenvhelper,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_Library_add_defs,purpenvhelper,\
-DPURPENV_DLLIMPLEMENTATION \
))
diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk
index 49724f5..bd680c0 100644
--- a/cppu/Library_unsafe_uno.mk
+++ b/cppu/Library_unsafe_uno.mk
@@ -27,11 +27,6 @@
$(eval $(call gb_Library_Library,unsafe_uno))
-$(eval $(call gb_Library_set_include,unsafe_uno,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_Library_use_api,unsafe_uno,\
udkapi \
offapi \
diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk
index e4e12d0..c34117b 100644
--- a/cppu/Module_cppu.mk
+++ b/cppu/Module_cppu.mk
@@ -28,12 +28,12 @@
$(eval $(call gb_Module_Module,cppu))
$(eval $(call gb_Module_add_targets,cppu,\
+ InternalUnoApi_cppu \
Library_affine_uno \
Library_cppu \
Library_log_uno \
Library_purpenvhelper \
Library_unsafe_uno \
- Package_generated \
Package_inc \
))
diff --git a/cppu/Package_generated.mk b/cppu/Package_generated.mk
deleted file mode 100644
index 0272192..0000000
--- a/cppu/Package_generated.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,cppu_generated))
-
-$(eval $(call gb_Package_add_customtarget,cppu_generated,cppu/qa))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,cppu/qa,\
- $(gb_UnoApiTarget_CPPUMAKERTARGET) \
- $(gb_UnoApiTarget_IDLCTARGET) \
- $(gb_UnoApiTarget_REGMERGETARGET) \
- $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cppu/qa/Makefile b/cppu/qa/Makefile
deleted file mode 100644
index a68567d..0000000
--- a/cppu/qa/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-gb_PARTIALBUILD:=T
-include $(GBUILDDIR)/gbuild.mk
-
-all: qa/cppumaker.flag qa/cppumaker/cppumaker.flag
-
-%/cppumaker.flag: %/cppumaker.rdb $(gb_UnoApiTarget_CPPUMAKERTARGET)
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,cppumaker) -O. -BUCR -C $< $(OUTDIR_FOR_BUILD)/bin/udkapi.rdb)
- touch $@
-
-%/cppumaker.rdb: %/types.urd
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,regmerge) $@ /UCR $<)
-
-%/types.urd: $(SRCDIR)/cppu/%/types.idl
- $(call gb_Helper_abbreviate_dirs_native, \
- $(call gb_Helper_execute,idlc) -O$* -I$(OUTDIR_FOR_BUILD)/idl -cid -we $<)
-
-.DEFAULT_GOAL:=all
-.PHONY: all
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 2fb3411..6f6b325 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -348,6 +348,9 @@ $(eval $(foreach method,\
add_ldflags \
set_ldflags \
add_libs \
+ use_internal_api \
+ use_internal_bootstrap_api \
+ use_internal_comprehensive_api \
set_library_path_flags \
set_objcflags \
set_objcxxflags \
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index fdbe5a4..3096e0e 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -56,7 +56,7 @@ define gb_UnoApiPartTarget__command
$(call gb_Output_announce,$(2),$(true),IDL,2)
mkdir -p $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
- $(call gb_Helper_convert_native,$(INCLUDE) $(DEFS) \
+ $(call gb_Helper_convert_native,$(INCLUDE) \
-M $(basename $(call gb_UnoApiPartTarget_get_dep_target,$(dir $(2)))) \
-O $(call gb_UnoApiPartTarget_get_target,$(dir $(2))) -verbose -C \
$(sort $(patsubst $(call gb_UnoApiPartTarget_get_target,%.urd),$(SRCDIR)/%.idl,$(3))))) && \
commit bd988a23a17dff20c8ee136750e32e16531080d8
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Apr 7 00:39:57 2012 +0200
scaddins: clean makefiles
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index b040b2b..fa5175d 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -30,15 +30,10 @@ $(eval $(call gb_Library_Library,analysis))
$(eval $(call gb_Library_set_componentfile,analysis,scaddins/source/analysis/analysis))
-$(eval $(call gb_Library_set_include,analysis,\
- $$(INCLUDE) \
- -I$(WORKDIR)/UnoApiHeaders/offapi \
-))
-
$(eval $(call gb_Library_use_internal_comprehensive_api,analysis,\
offapi \
scaddins \
- udkapi \
+ udkapi \
))
$(eval $(call gb_Library_use_libraries,analysis,\
@@ -49,12 +44,6 @@ $(eval $(call gb_Library_use_libraries,analysis,\
$(gb_STDLIBS) \
))
-ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_use_libraries,analysis,\
- uwinapi \
-))
-endif
-
$(eval $(call gb_Library_add_exception_objects,analysis,\
scaddins/source/analysis/analysis \
scaddins/source/analysis/analysishelper \
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index e937ed6..77d5eb6 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -30,15 +30,10 @@ $(eval $(call gb_Library_Library,date))
$(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date))
-$(eval $(call gb_Library_set_include,date,\
- $$(INCLUDE) \
- -I$(WORKDIR)/UnoApiHeaders/offapi \
-))
-
$(eval $(call gb_Library_use_internal_comprehensive_api,date,\
offapi \
scaddins \
- udkapi \
+ udkapi \
))
$(eval $(call gb_Library_use_libraries,date,\
More information about the Libreoffice-commits
mailing list