diff options
| -rw-r--r-- | helpcontent2/helpers/update_tree.pl | 6 | ||||
| -rw-r--r-- | helpcontent2/source/auxiliary/makefile.mk | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/helpcontent2/helpers/update_tree.pl b/helpcontent2/helpers/update_tree.pl index 80befc2d4e..7408b315bc 100644 --- a/helpcontent2/helpers/update_tree.pl +++ b/helpcontent2/helpers/update_tree.pl @@ -309,7 +309,11 @@ sub processtreefiles { unlink "$tree_dest/$lng/$tv" ; my $ret=mv $treetmpfile , "$tree_dest/$lng/$tv$inpath" or &terminate("Cannot write to $tree_dest/$lng/$tv$inpath - Error $!"); my $ret=mv "$tree_dest/$lng/$tv$inpath" , "$tree_dest/$lng/$tv" or &terminate("Cannot write to $tree_dest/$lng/$tv - Error $!"); - system("$xmllint --noout --noent $tree_dest/$lng/$tv") == 0 or &terminate("$tree_dest/$lng/$tv is illformed xml (xmllint)" ); + #xmllint is crashing on windows, fixme + if( $^O ne 'cygwin' ) + { + system("$xmllint --noout --noent $tree_dest/$lng/$tv") == 0 or &terminate("$tree_dest/$lng/$tv is illformed xml ($xmllint on $^O)" ); + } } } else { &terminate("Cannot write to $tvout"); diff --git a/helpcontent2/source/auxiliary/makefile.mk b/helpcontent2/source/auxiliary/makefile.mk index 049879b29d..d969e3fa3e 100644 --- a/helpcontent2/source/auxiliary/makefile.mk +++ b/helpcontent2/source/auxiliary/makefile.mk @@ -47,6 +47,8 @@ TREEFILES = \ .INCLUDE : target.mk .EXPORT : LOCALIZESDF LOCALIZATION_FOUND TRYSDF L10N_MODULE +XMLLINT !:=$(XMLLINT) +.EXPORT : XMLLINT ALLTAR : aux_dirs $(COMMONMISC)$/treefiles.done $(COMMONBIN)$/helpimg.ilst @@ -62,9 +64,6 @@ aux_alllangiso:=$(foreach,i,$(aux_alllangiso_all) $(foreach,j,$(help_exist) $(eq WITH_LANG!:=$(aux_alllangiso) .EXPORT : WITH_LANG -XMLLINT !:=$(XMLLINT) -.EXPORT : XMLLINT - LOCTREEFILES:=$(foreach,i,$(aux_alllangiso) $(foreach,j,$(TREEFILES) $(COMMONMISC)$/$i$/$j)) .ELSE #IF "$(WITH_LANG)"!="" aux_langdirs:=en-US |