Skip to content

Commit

Permalink
#77 setuptools bug that can wipe out python root if empty data_files …
Browse files Browse the repository at this point in the history
…added

data_files only needed to install dlls on windows, previously a single empty entry was being added on other operating systems, now the list is completely empty
  • Loading branch information
OKaluza committed Sep 5, 2019
1 parent 7553424 commit 8c693cd
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions setup.py
Expand Up @@ -206,8 +206,9 @@ def check_libraries(libraries, headers):
lib_dirs += [os.path.join(os.getcwd(), 'src', 'windows', LIBS)]
ldflags += ['/LIBPATH:' + os.path.join(os.getcwd(), 'src', 'windows', LIBS)]
libs += ['opengl32', 'pthreadVC2', 'glfw3dll']
install += [os.path.join('src', 'windows', LIBS, 'pthreadVC2.dll')]
install += [os.path.join('src', 'windows', LIBS, 'glfw3.dll')]
dlls = [os.path.join('src', 'windows', LIBS, 'pthreadVC2.dll'),
os.path.join('src', 'windows', LIBS, 'glfw3.dll')]
install = [('', dlls)]
else:
#POSIX only - find external dependencies
cflags += ['-std=c++0x']
Expand Down Expand Up @@ -310,7 +311,7 @@ def check_libraries(libraries, headers):
]
},
package_data = {'lavavu': glob.glob('lavavu/shaders/*.*') + glob.glob('lavavu/html/*.*') + ['lavavu/font.bin', 'lavavu/dict.json']},
data_files = [('lavavu', ['lavavu/font.bin', 'lavavu/dict.json']), ('', install)],
data_files = install,
include_package_data = True,
classifiers = [
'Intended Audience :: Developers',
Expand Down

0 comments on commit 8c693cd

Please sign in to comment.