some fixes to setup.py for Mac OS X, and .gitignore additions
This commit is contained in:
7
.gitignore
vendored
7
.gitignore
vendored
@@ -1,8 +1,15 @@
|
|||||||
*.pyc
|
*.pyc
|
||||||
build
|
build
|
||||||
|
|
||||||
|
# header files that may be copied over, if missing
|
||||||
|
ImPlatform.h
|
||||||
|
Imaging.h
|
||||||
|
|
||||||
# various forms of compiled _composite extensions
|
# various forms of compiled _composite extensions
|
||||||
_composite.so
|
_composite.so
|
||||||
_composite.pyd
|
_composite.pyd
|
||||||
_composite_d.pyd
|
_composite_d.pyd
|
||||||
_composite.dylib
|
_composite.dylib
|
||||||
|
|
||||||
|
# Mac OS X noise
|
||||||
|
.DS_Store
|
||||||
|
|||||||
6
setup.py
6
setup.py
@@ -32,7 +32,7 @@ if py2exe != None:
|
|||||||
# _composite.c extension
|
# _composite.c extension
|
||||||
#
|
#
|
||||||
|
|
||||||
setup_kwargs['ext_modules'].append(Extension('_composite', ['_composite.c']))
|
setup_kwargs['ext_modules'].append(Extension('_composite', ['_composite.c'], include_dirs=['.']))
|
||||||
# tell build_ext to build the extension in-place
|
# tell build_ext to build the extension in-place
|
||||||
# (NOT in build/)
|
# (NOT in build/)
|
||||||
setup_kwargs['options']['build_ext'] = {'inplace' : 1}
|
setup_kwargs['options']['build_ext'] = {'inplace' : 1}
|
||||||
@@ -48,8 +48,8 @@ class CustomClean(clean):
|
|||||||
# try to remove '_composite.{so,pyd,...}' extension,
|
# try to remove '_composite.{so,pyd,...}' extension,
|
||||||
# regardless of the current system's extension name convention
|
# regardless of the current system's extension name convention
|
||||||
build_ext = self.get_finalized_command('build_ext')
|
build_ext = self.get_finalized_command('build_ext')
|
||||||
fname = build_ext.get_ext_fullpath('_composite')
|
pretty_fname = build_ext.get_ext_filename('_composite')
|
||||||
pretty_fname = os.path.split(fname)[1]
|
fname = pretty_fname
|
||||||
if os.path.exists(fname):
|
if os.path.exists(fname):
|
||||||
try:
|
try:
|
||||||
if not self.dry_run:
|
if not self.dry_run:
|
||||||
|
|||||||
Reference in New Issue
Block a user