Skip to content

System platform check is broken for Cygwin #3

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

Closed
wants to merge 3 commits into from
Closed

System platform check is broken for Cygwin #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d553603
using python to check system platform instead of $OS makefile variabl…
Feb 18, 2014
0185b42
added ability to have separate unit/integration test requirements
Feb 18, 2014
b3ed649
removed test-depends junk
Feb 18, 2014
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: 8 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ ENV := env
DEPENDS := $(ENV)/.depends
EGG_INFO := $(subst -,_,$(PROJECT)).egg-info

ifeq ($(OS),Windows_NT)
PLATFORM := $(shell python -c 'import sys; print sys.platform')

ifneq ($(findstring win32, $(PLATFORM)), )
SYS_PYTHON := C:\\Python33\\python.exe
SYS_VIRTUALENV := C:\\Python33\\Scripts\\virtualenv.exe
BIN := $(ENV)/Scripts
Expand All @@ -20,6 +22,7 @@ else
BIN := $(ENV)/bin
OPEN := open
endif

MAN := man
SHARE := share

Expand Down Expand Up @@ -50,7 +53,7 @@ $(PIP):
.PHONY: depends
depends: .virtualenv $(DEPENDS) Makefile
$(DEPENDS):
$(PIP) install docutils pdoc pep8 pylint nose coverage wheel
$(PIP) install docutils pdoc pep8 pylint nose coverage wheel mock
touch $(DEPENDS) # flag to indicate dependencies are installed

# Documentation ##############################################################
Expand Down Expand Up @@ -82,7 +85,7 @@ read: doc

.PHONY: pep8
pep8: depends
$(PEP8) $(PACKAGE) --ignore=E501
$(PEP8) $(PACKAGE) --ignore=E501

.PHONY: pylint
pylint: depends
Expand Down Expand Up @@ -112,7 +115,7 @@ tests: env depends
clean: .clean-dist .clean-test .clean-doc .clean-build

.PHONY: clean-all
clean-all: clean .clean-env
clean-all: clean .clean-env

.PHONY: .clean-env
.clean-env:
Expand Down Expand Up @@ -143,7 +146,7 @@ dist: env depends check test tests doc
$(PYTHON) setup.py sdist
$(PYTHON) setup.py bdist_wheel
$(MAKE) read

.PHONY: upload
upload: env depends doc
$(PYTHON) setup.py register sdist upload
Expand Down