l10ntools/Package_scripts.mk | 3 +++ l10ntools/scripts/propex.bat | 8 ++++++++ solenv/gbuild/Extension.mk | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-)
New commits: commit 4eadfa3acd50e80dc07b5c2b00fff46d0f3dd498 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat May 5 10:33:41 2012 +0200 propmerge is not executable, only a script Change-Id: I35c88dc5ffe1b4082d0ef9611dd2c698c0d4217e diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 3de3af9..94ef7b3 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -36,7 +36,8 @@ endif gb_Extension_XRMEXTARGET := $(call gb_Executable_get_target_for_build,xrmex) gb_Extension_XRMEXCOMMAND := \ $(gb_Helper_set_ld_path) $(gb_Extension_XRMEXTARGET) -gb_Extension_PROPMERGETARGET := $(call gb_Executable_get_target_for_build,propmerge) +# propmerge is a perl script +gb_Extension_PROPMERGETARGET := $(OUTDIR_FOR_BUILD)/bin/propmerge gb_Extension_PROPMERGECOMMAND := \ $(PERL) $(gb_Extension_PROPMERGETARGET) gb_Extension_HELPEXTARGET := $(call gb_Executable_get_target_for_build,helpex) commit d28ffc8856295035f297be4613ed68ac05653609 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat May 5 10:25:30 2012 +0200 add propex.bat back; it is used on Windows Change-Id: I9fd6cc52533d95f67685a595171f035ca78e84df diff --git a/l10ntools/Package_scripts.mk b/l10ntools/Package_scripts.mk index 5040488..999b4b6 100644 --- a/l10ntools/Package_scripts.mk +++ b/l10ntools/Package_scripts.mk @@ -33,5 +33,8 @@ $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/po2lo,po2lo)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propex,propex)) $(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propmerge,propmerge)) +ifeq ($(OS_FOR_BUILD),WNT) +$(eval $(call gb_Package_add_file,l10ntools_scripts,bin/propex,propex.bat)) +endif # vim: set noet sw=4 ts=4: diff --git a/l10ntools/scripts/propex.bat b/l10ntools/scripts/propex.bat new file mode 100755 index 0000000..1174286 --- /dev/null +++ b/l10ntools/scripts/propex.bat @@ -0,0 +1,8 @@ +@echo off + +if "x%PERL%x" EQU "xx" ( + echo ERROR: Perl not found. Environment is not set. + exit /b 1 +) + +%PERL% %SOLARVER%\%INPATH%\bin\propex %* \ No newline at end of file
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits