Kaydet (Commit) a5d14493 authored tarafından Vasily Melenchuk's avatar Vasily Melenchuk Kaydeden (comit) Thorsten Behrens

configure.ac: absolute paths for validator execution

Change-Id: I8440d784d9d2c07ab1c1fdbf291dcfc17270ee68
Reviewed-on: https://gerrit.libreoffice.org/28159Reviewed-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: 's avatarThorsten Behrens <Thorsten.Behrens@CIB.de>
üst 102815fe
...@@ -2747,7 +2747,7 @@ if test "$with_export_validation" = yes; then ...@@ -2747,7 +2747,7 @@ if test "$with_export_validation" = yes; then
# remember to download the ODF toolkit with validator later # remember to download the ODF toolkit with validator later
AC_MSG_NOTICE([no odfvalidator found, will download it]) AC_MSG_NOTICE([no odfvalidator found, will download it])
BUILD_TYPE="$BUILD_TYPE ODFVALIDATOR" BUILD_TYPE="$BUILD_TYPE ODFVALIDATOR"
ODFVALIDATOR="sh bin/odfvalidator.sh" ODFVALIDATOR="$SRC_ROOT/bin/odfvalidator.sh"
# and fetch name of odfvalidator jar name from download.lst # and fetch name of odfvalidator jar name from download.lst
ODFVALIDATOR_JAR=`sed -ne "s/export *ODFVALIDATOR_JAR *:= *\(.*\) */\1/p" download.lst` ODFVALIDATOR_JAR=`sed -ne "s/export *ODFVALIDATOR_JAR *:= *\(.*\) */\1/p" download.lst`
...@@ -2763,6 +2763,8 @@ if test "$with_export_validation" = yes; then ...@@ -2763,6 +2763,8 @@ if test "$with_export_validation" = yes; then
# so instead of "odfvalidator" it will be # so instead of "odfvalidator" it will be
# something like "bash.exe C:\cygwin\opt\lo\bin\odfvalidator" # something like "bash.exe C:\cygwin\opt\lo\bin\odfvalidator"
ODFVALIDATOR="bash.exe `cygpath -m "$ODFVALIDATOR"`" ODFVALIDATOR="bash.exe `cygpath -m "$ODFVALIDATOR"`"
else
ODFVALIDATOR="sh $ODFVALIDATOR"
fi fi
AC_SUBST(ODFVALIDATOR) AC_SUBST(ODFVALIDATOR)
...@@ -2772,7 +2774,7 @@ if test "$with_export_validation" = yes; then ...@@ -2772,7 +2774,7 @@ if test "$with_export_validation" = yes; then
# remember to download the officeotron with validator later # remember to download the officeotron with validator later
AC_MSG_NOTICE([no officeotron found, will download it]) AC_MSG_NOTICE([no officeotron found, will download it])
BUILD_TYPE="$BUILD_TYPE OFFICEOTRON" BUILD_TYPE="$BUILD_TYPE OFFICEOTRON"
OFFICEOTRON="sh bin/officeotron.sh" OFFICEOTRON="$SRC_ROOT/bin/officeotron.sh"
# and fetch name of officeotron jar name from download.lst # and fetch name of officeotron jar name from download.lst
OFFICEOTRON_JAR=`sed -ne "s/export *OFFICEOTRON_JAR *:= *\(.*\) */\1/p" download.lst` OFFICEOTRON_JAR=`sed -ne "s/export *OFFICEOTRON_JAR *:= *\(.*\) */\1/p" download.lst`
...@@ -2794,6 +2796,8 @@ if test "$with_export_validation" = yes; then ...@@ -2794,6 +2796,8 @@ if test "$with_export_validation" = yes; then
# so instead of "odfvalidator" it will be # so instead of "odfvalidator" it will be
# something like "bash.exe C:\cygwin\opt\lo\bin\odfvalidator" # something like "bash.exe C:\cygwin\opt\lo\bin\odfvalidator"
OFFICEOTRON="bash.exe `cygpath -m "$OFFICEOTRON"`" OFFICEOTRON="bash.exe `cygpath -m "$OFFICEOTRON"`"
else
OFFICEOTRON="sh $OFFICEOTRON"
fi fi
AC_SUBST(OFFICEOTRON) AC_SUBST(OFFICEOTRON)
else else
......
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