mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 18npool build on Windows.

Browse Source
This commit is contained in:
Bjoern Michaelsen
2011-12-08 16:43:26 +01:00
committed by Jan Holesovsky
parent 5214f7843c
commit c240dbc820
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
i18npool/source/localedata/Makefile
View File

@@ -40,15 +40,11 @@ localedata_%.cxx : localedata_%_invis.cxx
ifeq ($(OS_FOR_BUILD),WNT) ifeq ($(OS_FOR_BUILD),WNT)
localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR)/bin/saxparser$(gb_Executable_EXT) $(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
$(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ \ $(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`)
$(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 else
localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \ localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build) $(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
$(call gb_Helper_execute,saxparser $* $< $@ \ $(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)
$(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 endif
saxparser.rdb : saxparser.input saxparser.rdb : saxparser.input

2
solenv/gbuild/Helper.mk
View File

@@ -165,7 +165,7 @@ gb_StaticLibrary_$(1) += $(2)
endef endef
define gb_Helper_execute define gb_Helper_execute
$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1) $(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
endef endef
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use

2
solenv/gbuild/platform/WNT_INTEL_MSC.mk
View File

@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1))))))))) $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
endef endef
gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin" gb_Helper_set_ld_path := PATH=\"$${PATH}:$(OUTDIR)/bin\"
# convert parameters filesystem root to native notation # convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to # does some real work only on windows, make sure not to

2
solenv/gbuild/platform/com_GCC_defs.mk
View File

@@ -144,7 +144,7 @@ else
gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
endif endif
gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=\"$(OUTDIR_FOR_BUILD)/lib\"
# $(1): list of directory pathnames to append at the end of the ld path # $(1): list of directory pathnames to append at the end of the ld path
define gb_Helper_extend_ld_path define gb_Helper_extend_ld_path