Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable build on python3 #19

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions OGDF/makeMakefile.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python2.7
#!/usr/bin/env python3
# Make Makefile
#
# October 2012
Expand Down Expand Up @@ -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')

Expand Down Expand Up @@ -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')
Expand Down
1 change: 1 addition & 0 deletions install.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

set -euo pipefail

#install OGDF
cd OGDF
Expand Down