diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..87da9de --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +# generated files +OGDF/Makefile +OGDF/_release/ +OGDF/include/coin/config.h +OGDF/include/ogdf/internal/config_autogen.h +OGDF/ogdf.pc +OGDF/test/test-release + +# binaries +bundler +libcorrect +orientcontigs +spqr diff --git a/OGDF/makeMakefile.py b/OGDF/makeMakefile.py index 9c61506..9abfc20 100755 --- a/OGDF/makeMakefile.py +++ b/OGDF/makeMakefile.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python3 # Make Makefile # # October 2012 @@ -74,7 +74,8 @@ def checkSolver(name, defSolver, extSolvers): print('Loading makeMakefile.config...') try: - config.readfp(open('makeMakefile.config')) + with open('makeMakefile.config') as makefile_config_f: + config.read_file(makefile_config_f) except IOError: bailout('makeMakefile.config not found') @@ -278,7 +279,7 @@ def Walk(curdir): for v in versions: # print target&depend: add full path spec, incl. version & ignore extra line path = v.call() + '/' +fullname[:-len(name)] - makefile.write(path + targetAndDepend[:-1] + '\n') + makefile.write(path + targetAndDepend.decode()[:-1] + '\n') # ensure folder makefile.write('\t$(MKDIR) ' + v.call() + '/' + fullname[:-len(name)-1] + '\n') diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index cd73156..f18b4d9 --- a/install.sh +++ b/install.sh @@ -1,5 +1,6 @@ #!/bin/bash +set -euo pipefail #install OGDF cd OGDF