Kaydet (Commit) 6c1c06f1 authored tarafından Matúš Kukan's avatar Matúš Kukan

gbuild: remove some more realpaths

Where necessary, replace with wildcard, what does not change path.
üst 84b3f7b3
......@@ -37,7 +37,7 @@ data:
data/dict_%.cxx : data/dict_%_invis.cxx
sed 's/\tconst/\tSAL_DLLPUBLIC_EXPORT const/' $< > $@
data/dict_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.dic data
data/dict_%_invis.cxx : $(SRCDIR)/i18npool/source/breakiterator/data/%.dic data
ifeq ($(OS_FOR_BUILD),WNT)
$(call gb_Helper_execute,gendict `cygpath -m $<` $@)
else
......@@ -84,7 +84,7 @@ OpenOffice_dat.c : $(subst .brk,_brk.c,$(BRKFILES))
$(GENBRK) -r $< -o $@
# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
%.txt.p : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.txt
%.txt.p : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt
ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
sed "s#\[:LineBreak = Close_Punctuation:\]#\[\[:LineBreak = Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
else
......
......@@ -26,7 +26,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
txtlist := $(wildcard $(realpath $(SRC_ROOT)/i18npool/source/collator/data)/*.txt)
txtlist := $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)
all : lrl_include.hxx $(patsubst %.txt,collator_%.cxx,$(notdir $(txtlist)))
......@@ -35,7 +35,7 @@ include $(GBUILDDIR)/gbuild_simple.mk
collator_%.cxx : collator_%_invis.cxx
sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
collator_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/collator/data)/%.txt
collator_%_invis.cxx : $(SRCDIR)/i18npool/source/collator/data/%.txt
ifeq ($(OS_FOR_BUILD),WNT)
$(call gb_Helper_execute,gencoll_rule `cygpath -m $<` $@ $*)
else
......
......@@ -34,7 +34,7 @@ include $(GBUILDDIR)/gbuild_simple.mk
%.cxx : %_invis.cxx
sed 's/\(^.*get_\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/indexentry/data)/%.txt
%_invis.cxx : $(SRCDIR)/i18npool/source/indexentry/data/%.txt
ifeq ($(OS_FOR_BUILD),WNT)
$(call gb_Helper_execute,genindex_data `cygpath -m $<` $@ $*)
else
......
......@@ -38,11 +38,11 @@ localedata_%.cxx : localedata_%_invis.cxx
sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
ifeq ($(OS_FOR_BUILD),WNT)
localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
localedata_%_invis.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml saxparser.rdb \
$(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
$(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ $(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
else
localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
localedata_%_invis.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
$(call gb_Helper_execute,saxparser $* $< $@ $(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
endif
......
......@@ -34,7 +34,7 @@ include $(GBUILDDIR)/gbuild_simple.mk
%.cxx : %_invis.cxx
sed 's/\(^.*get\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/textconversion/data)/%.dic
%_invis.cxx : $(SRCDIR)/i18npool/source/textconversion/data/%.dic
ifeq ($(OS_FOR_BUILD),WNT)
$(call gb_Helper_execute,genconv_dict $* `cygpath -m $<` $@)
else
......
......@@ -57,7 +57,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
-p $(firstword $(subst /, ,$(2))) \
-i $(realpath $(3)) \
-i $(3) \
-o $(1) \
-m $(SDF) \
-l all)
......@@ -85,7 +85,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
-I$(dir $(3)) \
$(DEFS) \
-fp=$(1) \
$(realpath $(if $(MERGEDFILE),$(MERGEDFILE),$<))" > $${RESPONSEFILE} && \
$(if $(MERGEDFILE),$(MERGEDFILE),$<)" > $${RESPONSEFILE} && \
$(gb_SrsPartTarget_RSCCOMMAND) -presponse @$${RESPONSEFILE} && \
rm -rf $${RESPONSEFILE})
......@@ -112,7 +112,7 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
else
$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
endif
endef
......@@ -125,7 +125,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_
mkdir -p $$(dir $$@) && \
cp $$< $$@)
ifneq ($(strip $(WITH_LANG)),)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
$(call gb_SrsPartMergeTarget_get_target,$(1)) : $$(SDF)
endif
......@@ -310,7 +310,7 @@ endef
gb_ResTarget_RSCTARGET := $(gb_SrsPartTarget_RSCTARGET)
gb_ResTarget_RSCCOMMAND := $(gb_SrsPartTarget_RSCCOMMAND)
gb_ResTarget_DEFIMAGESLOCATION := $(realpath $(SRCDIR)/icon-themes/galaxy)/
gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/
$(call gb_ResTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),RES,2)
......@@ -326,15 +326,15 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) | $(gb_ResTarget_RSCT
echo "-r -p \
-lg$(LANGUAGE) \
-fs=$@ \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY)) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE)) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE)) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res) \
-lip=$(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/$(LIBRARY) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst/$(LANGUAGE) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/imglst \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res/$(LANGUAGE) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)/res \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res/$(LANGUAGE) \
-lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-subMODULE=$(dir $(realpath $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION))) \
-subMODULE=$(dir $(gb_ResTarget_DEFIMAGESLOCATION)$(RESLOCATION)) \
-subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \
-oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \
$(filter-out $(gb_Helper_MISCDUMMY),$^)" > $${RESPONSEFILE} && \
......
......@@ -36,7 +36,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_XSLTPROC) --nonet --stringparam uri \
'$(subst \d,$$,$(COMPONENTPREFIX))$(LIBFILENAME)' -o $(1) \
$(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
$(gb_ComponentTarget_XSLTCOMMANDFILE) $(2))
endef
......@@ -54,7 +54,7 @@ $(call gb_ComponentTarget_get_target,%) :
# the .dir is for make 3.81, which ignores trailing /
$(dir $(call gb_ComponentTarget_get_outdir_target,))%/.dir :
mkdir -p $(dir $@)
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_ComponentTarget_get_outdir_target,%) :
$(call gb_Deliver_deliver,$<,$@)
......
......@@ -103,9 +103,9 @@ $(call gb_XcsTarget_get_clean_target,%) :
# the .dir is for make 3.81, which ignores trailing /
$(dir $(call gb_XcsTarget_get_outdir_target,%))%/.dir :
$(if $(realpath $(dir $@)),,mkdir -p $(dir $@))
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(dir $(call gb_XcsTarget_get_outdir_target,%)).dir :
$(if $(realpath $(dir $@)),,mkdir -p $(dir $@))
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_XcsTarget_get_outdir_target,%) :
$(call gb_Helper_abbreviate_dirs,\
......@@ -150,9 +150,9 @@ $(call gb_XcuDataTarget_get_clean_target,%) :
# the .dir is for make 3.81, which ignores trailing /
$(dir $(call gb_XcuDataTarget_get_outdir_target,))%/.dir :
$(if $(realpath $(dir $@)),,mkdir -p $(dir $@))
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(dir $(call gb_XcuDataTarget_get_outdir_target,)).dir :
$(if $(realpath $(dir $@)),,mkdir -p $(dir $@))
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_XcuDataTarget_get_outdir_target,%) :
$(call gb_Helper_abbreviate_dirs,\
......@@ -193,7 +193,7 @@ $(call gb_XcuModuleTarget_get_clean_target,%) :
# the .dir is for make 3.81, which ignores trailing /
$(dir $(call gb_XcuModuleTarget_get_outdir_target,))%/.dir :
$(if $(realpath $(dir $@)),,mkdir -p $(dir $@))
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_XcuModuleTarget_get_outdir_target,%) :
$(call gb_Helper_abbreviate_dirs,\
......@@ -232,9 +232,9 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) :
# the .dir is for make 3.81, which ignores trailing /
$(dir $(call gb_XcuLangpackTarget_get_outdir_target,))%/.dir :
$(if $(realpath $(dir $@)),,mkdir -p $(dir $@))
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(dir $(call gb_XcuLangpackTarget_get_outdir_target,)).dir :
$(if $(realpath $(dir $@)),,mkdir -p $(dir $@))
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_XcuLangpackTarget_get_outdir_target,%) :
$(call gb_Helper_abbreviate_dirs,\
......@@ -271,9 +271,9 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
define gb_XcuMergeTarget_XcuMergeTarget
$(call gb_XcuMergeTarget_get_target,$(1)) : \
$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
$(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
$(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
$(call gb_XcuMergeTarget_get_target,$(1)) : \
SDF := $(realpath $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
SDF := $(wildcard $(gb_SDFLOCATION)/$(dir $(1))localize.sdf)
endef
......
......@@ -34,9 +34,9 @@
# the .dir is for make 3.81, which ignores trailing /
define gb_PackagePart__rule
$(1)/.dir :
$$(if $$(realpath $$(dir $$@)),,mkdir -p $$(dir $$@))
$$(if $$(wildcard $$(dir $$@)),,mkdir -p $$(dir $$@))
$(1)/%/.dir :
$$(if $$(realpath $$(dir $$@)),,mkdir -p $$(dir $$@))
$$(if $$(wildcard $$(dir $$@)),,mkdir -p $$(dir $$@))
$(1)/% :
$$(call gb_Deliver_deliver,$$<,$$@)
endef
......
......@@ -50,7 +50,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi | $(gb_SdiTarget_SVIDLTARGET
-fx$(EXPORTS) \
-fm$@ \
-fM$(call gb_SdiTarget_get_dep_target,$*) \
$(realpath $<))
$<)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_SdiTarget_get_dep_target,%) : $(call gb_SdiTarget_get_target,%)
......
......@@ -204,7 +204,7 @@ $(call gb_UnoApiTarget_get_clean_target,%) :
# be rebuilt and overwriting the .urd file again.
# the .dir is for make 3.81, which ignores trailing /
$(dir $(call gb_UnoApiPartTarget_get_target,))%/.dir :
$(if $(realpath $(dir $@)),,mkdir -p $(dir $@))
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
$(call gb_UnoApiPartTarget_get_target,%.urd) :
touch $@
......@@ -258,7 +258,7 @@ endef
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_UnoApiPartTarget_get_dep_target,%) :
$(if $(realpath $@),touch $@,\
$(if $(wildcard $@),touch $@,\
$(call gb_Object__command_dep,$@,$(call gb_UnoApiPartTarget_get_target,$*.urd)))
$(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_UnoApiTarget_get_target,%)
......
......@@ -287,8 +287,8 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_COMPILERDEPFLAGS) \
-I$(dir $(3)) \
$(INCLUDE) \
-c $(realpath $(3)) \
-Fo$(1)) $(call gb_create_deps,$(1),$(4),$(realpath $(3)))
-c $(3) \
-Fo$(1)) $(call gb_create_deps,$(1),$(4),$(3))
endef
......@@ -307,8 +307,8 @@ $(call gb_Helper_abbreviate_dirs_native,\
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE) \
$(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \
-c $(realpath $(3)) \
-Fo$(1)) $(call gb_create_deps,$(1),$(4),$(realpath $(3)))
-c $(3) \
-Fo$(1)) $(call gb_create_deps,$(1),$(4),$(3))
endef
......@@ -321,7 +321,7 @@ $(call gb_Output_announce,$(2),$(true),ASM,3)
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) $(dir $(4)) && \
"$(ML_EXE)" $(gb_AFLAGS) -D$(COM) /Fo$(1) $(3)) && \
echo "$(1) : $(realpath $(3))" > $(4)
echo "$(1) : $(3)" > $(4)
endef
......
......@@ -30,9 +30,9 @@ $(eval $(call gb_JunitTest_JunitTest,starmath_unoapi))
$(eval $(call gb_JunitTest_set_defs,starmath_unoapi,\
$$(DEFS) \
-Dorg.openoffice.test.arg.sce=$(realpath $(SRCDIR)/starmath/qa/unoapi/sm.sce) \
-Dorg.openoffice.test.arg.xcl=$(realpath $(SRCDIR)/starmath/qa/unoapi/knownissues.xcl) \
-Dorg.openoffice.test.arg.tdoc=$(realpath $(SRCDIR)/starmath/qa/unoapi/testdocuments) \
-Dorg.openoffice.test.arg.sce=$(SRCDIR)/starmath/qa/unoapi/sm.sce \
-Dorg.openoffice.test.arg.xcl=$(SRCDIR)/starmath/qa/unoapi/knownissues.xcl \
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/starmath/qa/unoapi/testdocuments \
))
$(eval $(call gb_JunitTest_add_jars,starmath_unoapi,\
......
......@@ -30,7 +30,7 @@ include $(GBUILDDIR)/gbuild_simple.mk
done :
$(call gb_Helper_abbreviate_dirs_native, \
$(call gb_Helper_execute,javamaker -BUCR -O$(realpath .) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
$(call gb_Helper_execute,javamaker -BUCR -O. $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
touch $@)
.DEFAULT_GOAL := all
......
......@@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,doctok,\
-I$(WORKDIR)/CustomTarget/writerfilter/source/doctok \
))
include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
include $(SRCDIR)/writerfilter/debug_setup.mk
$(eval $(call gb_Library_add_defs,doctok,\
-DWRITERFILTER_DOCTOK_DLLIMPLEMENTATION \
......
......@@ -25,8 +25,8 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
include $(realpath $(SRCDIR)/writerfilter/source/generated.mk)
include $(SRCDIR)/writerfilter/debug_setup.mk
include $(SRCDIR)/writerfilter/source/generated.mk
$(eval $(call gb_Library_Library,ooxml))
......
......@@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_api,rtftok,\
udkapi \
))
include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
include $(SRCDIR)/writerfilter/debug_setup.mk
$(eval $(call gb_Library_add_defs,rtftok,\
-DWRITERFILTER_RTFTOK_DLLIMPLEMENTATION \
......
......@@ -39,7 +39,7 @@ $(eval $(call gb_Library_add_api,writerfilter,\
$(eval $(call gb_Library_set_componentfile,writerfilter,writerfilter/util/writerfilter))
include $(realpath $(SRCDIR)/writerfilter/debug_setup.mk)
include $(SRCDIR)/writerfilter/debug_setup.mk
$(eval $(call gb_Library_add_defs,writerfilter,\
-DWRITERFILTER_WRITERFILTER_DLLIMPLEMENTATION \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment