billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strip newlines.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-19 18:08:21 +00:00
parent a29b2d580e
commit 31200e4ad8
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ognibuild/buildsystem.py
View file

@ -709,7 +709,7 @@ class Make(BuildSystem):
except UnidentifiedError as e: except UnidentifiedError as e:
if ( if (
"Gnulib not yet bootstrapped; " "Gnulib not yet bootstrapped; "
"run ./bootstrap instead.\n" in e.lines "run ./bootstrap instead." in e.lines
): ):
run_with_build_fixers(session, ["./bootstrap"], fixers) run_with_build_fixers(session, ["./bootstrap"], fixers)
run_with_build_fixers(session, ["./autogen.sh"], fixers) run_with_build_fixers(session, ["./autogen.sh"], fixers)
@ -754,23 +754,23 @@ class Make(BuildSystem):
try: try:
run_with_build_fixers(session, ["make", "dist"], fixers) run_with_build_fixers(session, ["make", "dist"], fixers)
except UnidentifiedError as e: except UnidentifiedError as e:
if "make: *** No rule to make target 'dist'. Stop.\n" in e.lines: if "make: *** No rule to make target 'dist'. Stop." in e.lines:
raise NotImplementedError raise NotImplementedError
elif "make[1]: *** No rule to make target 'dist'. Stop.\n" in e.lines: elif "make[1]: *** No rule to make target 'dist'. Stop." in e.lines:
raise NotImplementedError raise NotImplementedError
elif ( elif (
"Reconfigure the source tree " "Reconfigure the source tree "
"(via './config' or 'perl Configure'), please.\n" "(via './config' or 'perl Configure'), please."
) in e.lines: ) in e.lines:
run_with_build_fixers(session, ["./config"], fixers) run_with_build_fixers(session, ["./config"], fixers)
run_with_build_fixers(session, ["make", "dist"], fixers) run_with_build_fixers(session, ["make", "dist"], fixers)
elif ( elif (
"Please try running 'make manifest' and then run " "Please try running 'make manifest' and then run "
"'make dist' again.\n" in e.lines "'make dist' again." in e.lines
): ):
run_with_build_fixers(session, ["make", "manifest"], fixers) run_with_build_fixers(session, ["make", "manifest"], fixers)
run_with_build_fixers(session, ["make", "dist"], fixers) run_with_build_fixers(session, ["make", "dist"], fixers)
elif "Please run ./configure first\n" in e.lines: elif "Please run ./configure first" in e.lines:
run_with_build_fixers(session, ["./configure"], fixers) run_with_build_fixers(session, ["./configure"], fixers)
run_with_build_fixers(session, ["make", "dist"], fixers) run_with_build_fixers(session, ["make", "dist"], fixers)
elif any( elif any(
@ -778,7 +778,7 @@ class Make(BuildSystem):
re.match( re.match(
r"(Makefile|GNUmakefile|makefile):[0-9]+: " r"(Makefile|GNUmakefile|makefile):[0-9]+: "
r"\*\*\* Missing \'Make.inc\' " r"\*\*\* Missing \'Make.inc\' "
r"Run \'./configure \[options\]\' and retry. Stop.\n", r"Run \'./configure \[options\]\' and retry. Stop.",
line, line,
) )
for line in e.lines for line in e.lines
@ -948,7 +948,7 @@ class Cabal(BuildSystem):
try: try:
run_with_build_fixers(session, ["runhaskell", "Setup.hs"] + args, fixers) run_with_build_fixers(session, ["runhaskell", "Setup.hs"] + args, fixers)
except UnidentifiedError as e: except UnidentifiedError as e:
if "Run the 'configure' command first.\n" in e.lines: if "Run the 'configure' command first." in e.lines:
run_with_build_fixers( run_with_build_fixers(
session, ["runhaskell", "Setup.hs", "configure"], fixers session, ["runhaskell", "Setup.hs", "configure"], fixers
) )