Browse Source

option --local is superfluous, use --prefix

PYADPT-100
heck 5 years ago
parent
commit
5d6013ea9c
  1. 12
      setup.py

12
setup.py

@ -32,13 +32,11 @@ def pEpLog(*msg):
class BuildExtCommand(build_ext): class BuildExtCommand(build_ext):
user_options = build_ext.user_options + [ user_options = build_ext.user_options + [
('local', None, 'Use local pEp install in HOME/USERPROFILE for libs/includes'), ('prefix=', None, 'Use pEp-base installation in prefix (libs/includes)'),
('prefix=', None, 'Use local pEp install in prefix for libs/includes'),
] ]
def initialize_options(self): def initialize_options(self):
build_ext.initialize_options(self) build_ext.initialize_options(self)
self.local = None != environ.get('PER_USER_DIRECTORY')
self.prefix = getattr(self, "prefix=", None) self.prefix = getattr(self, "prefix=", None)
def windowsGetInstallLocation(self): def windowsGetInstallLocation(self):
@ -130,7 +128,6 @@ class BuildExtCommand(build_ext):
def finalize_options(self): def finalize_options(self):
build_ext.finalize_options(self) build_ext.finalize_options(self)
pEpLog("local: ", self.local)
pEpLog("prefix: ", self.prefix) pEpLog("prefix: ", self.prefix)
pEpLog("sys.platform: ", sys.platform) pEpLog("sys.platform: ", sys.platform)
@ -152,13 +149,6 @@ class BuildExtCommand(build_ext):
includes = [] includes = []
libdirs = [] libdirs = []
# Append home-dir
if self.local:
pEpLog("local mode")
home_include = [join(home, 'include')]
home_libdirs = [join(home, 'lib')]
includes += home_include
libdirs += home_libdirs
# Append prefix-dir # Append prefix-dir
if self.prefix: if self.prefix:

Loading…
Cancel
Save