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

Fix sim.extra regex to match Python 2.7.x where x is two digits #394

Merged
merged 2 commits into from Jun 6, 2017
Merged

Fix sim.extra regex to match Python 2.7.x where x is two digits #394

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a868a4d
Fix sim.extra regex to match Python 2.7.x versions where x is two dig…
Jan 17, 2017
b94a736
Only match Python 2 or Python 3 in sim.extra
MBradbury Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion support/make/extras/sim.extra
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ LIBS = -lm -lstdc++
PFLAGS += -DTOSSIM -fnesc-nido-tosnodes=1000 -fnesc-simulate -fnesc-nido-motenumber='sim_node\(\)' -fnesc-gcc=$(GCC)
PFLAGS += -I%T/lib/tossim
WFLAGS = -Wno-nesc-data-race
PYTHON_VERSION ?= $(shell python --version 2>&1 | sed 's/Python 2\.\([0-9]\)\.[0-9]+\{0,1\}/2.\1/')
PYTHON_VERSION ?= $(shell python --version 2>&1 | sed 's/Python \([0-9]\)\.\([0-9]\)\.[0-9]+\{0,1\}.*/\1.\2/')

TOSMAKE_BUILD_DIR = simbuild/$(PLATFORM)
TOSSIMPY_DIR = $(TINYOS_OS_DIR)/lib/tossim
Expand Down