Permalink
Browse files

issue #8: hard wire jsl to use python2.6 to avoid problems with it no…

…t being the first python on the PATH
  • Loading branch information...
1 parent 74e65c4 commit 296565189dfb08e22f0f23b666e04df529e1124f @trentm trentm committed Feb 15, 2012
Showing with 8 additions and 10 deletions.
  1. +2 −4 Makefile
  2. +2 −2 README.md
  3. +1 −1 javascriptlint/jsl
  4. +1 −1 javascriptlint/jsl.py
  5. +1 −1 javascriptlint/jsparse.py
  6. +1 −1 javascriptlint/lint.py
View
@@ -25,11 +25,9 @@ ifeq ($(BUILDOS),Darwin)
LD=gcc -arch $(PY_FIRST_ARCH)
CC=gcc -arch $(PY_FIRST_ARCH)
else
+ PY_PREFIX=$(shell python2.6 -c "import sys; sys.stdout.write(sys.prefix)")
CPPFLAGS += \
- -I/opt/local/include/db4 \
- -I/usr/local/include/python2.7 \
- -I/opt/local/include/ncurses \
- -I/opt/local/include/python2.4
+ -I$(PY_PREFIX)/include/python2.6
endif
SOFILE = $(BUILDDIR)/pyspidermonkey.so
View
@@ -55,8 +55,8 @@ Supported Platforms
This branch of JSL has been tested on:
-- SmartOS (Illumos-based) with Python 2.4
-- Mac OSX 10.6.8 with Python 2.6
+- SmartOS (Illumos-based) with Python 2.6.
+- Mac OS X >=10.6 with Python 2.6. I.e. does `which python2.6` return something?
History
View
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.6
import os
import sys
View
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.6
# vim: ts=4 sw=4 expandtab
import codecs
import fnmatch
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.6
# vim: ts=4 sw=4 expandtab
""" Parses a script into nodes. """
import bisect
View
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2.6
# vim: ts=4 sw=4 expandtab
import os.path
import re

0 comments on commit 2965651

Please sign in to comment.