Skip to content

Commit

Permalink
#1789 win32 setup and packaging for pyu2f
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@18807 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Mar 23, 2018
1 parent 75ab8cd commit 70b5f91
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,7 @@ def add_service_exe(script, icon, base_name):
add_data_files('', ['win32\\DirectShow.tlb'])

remove_packages(*external_excludes)
external_includes.append("pyu2f")
external_includes.append("mmap")
external_includes.append("comtypes") #used by webcam and netdev_query
remove_packages("comtypes.gen") #this is generated at runtime
Expand Down
2 changes: 1 addition & 1 deletion src/win32/MINGW_SETUP.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ $PACMAN --noconfirm -S ${XPKG}python2-numpy ${XPKG}python2-pillow ${XPKG}cython2
$PACMAN --noconfirm -S ${XPKG}python3-numpy ${XPKG}python3-pillow ${XPKG}cython
#using easy-install for python libraries which are not packaged by mingw:
easy_install-2.7 -U -Z enum34 enum-compat
for x in rencode xxhash zeroconf lz4 websocket-client netifaces comtypes PyOpenGL PyOpenGL_accelerate websockify cffi pycparser cryptography nvidia-ml-py appdirs setproctitle; do
for x in rencode xxhash zeroconf lz4 websocket-client netifaces comtypes PyOpenGL PyOpenGL_accelerate websockify cffi pycparser cryptography nvidia-ml-py appdirs setproctitle pyu2f; do
easy_install-2.7 -U -Z $x
easy_install-3.6 -U -Z $x
done
Expand Down
2 changes: 1 addition & 1 deletion src/win32/UPDATE_PYTHON_LIBS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#using easy-install for python libraries which are not packaged by mingw:
# currently disabled, build from patched source only: websockify
# currently disabled, do not update past 1.8.x: cryptography
for x in rencode xxhash enum34 enum-compat zeroconf lz4 websocket-client comtypes PyOpenGL PyOpenGL_accelerate cffi cryptography pycparser nvidia-ml-py appdirs setproctitle netifaces;
for x in rencode xxhash enum34 enum-compat zeroconf lz4 websocket-client comtypes PyOpenGL PyOpenGL_accelerate cffi cryptography pycparser nvidia-ml-py appdirs setproctitle netifaces pyu2f;
do
easy_install-2.7 -U -Z $x
easy_install-3.6 -U -Z $x
Expand Down

0 comments on commit 70b5f91

Please sign in to comment.