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.

Sign up for GitHub

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

Jump to bottom

build: fix travis ci #108

Merged
merged 2 commits into from
Nov 1, 2019
Merged

build: fix travis ci #108

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
682c1c6
build: fix travis ci
Velaron Oct 31, 2019
b604d86
Update wscript
Velaron Nov 1, 2019
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
Next Next commit
build: fix travis ci 
I think travis is still using Python 3.4.*, so f-strings are not supported yet and android engine doesn't build.
  • Loading branch information
@Velaron
Velaron authored Oct 31, 2019
commit 682c1c6da97da447f9807e90ab7d83f77bc59d4b
2 changes: 1 addition & 1 deletion dlls/wscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def configure(conf):
hlDefNode = conf.path.find_resource("./hl.def")

if hlDefNode is not None:
conf.env.append_unique('LINKFLAGS', f'/def:{hlDefNode.abspath()}')
conf.env.append_unique('LINKFLAGS', '/def:{}'.format(hlDefNode.abspath()))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's then use % notation, i.e. '/def:%s' % hlDefNode.abspath(), it's shorter and easier to read, IMO.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As you wish, I'm not a huge fan of C style formatting in Python :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fan or not fan, but even python programmers on my main job uses this style.

else:
conf.fatal("Could not find hl.def")

Expand Down