Skip to content

Commit db00c00

Browse files
committed
update build scripts for Windows
1 parent 6c8448f commit db00c00

10 files changed

+12
-15
lines changed

Makefile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
USE_WHEEL := no
1+
USE_MISC_BUILD := no
22
RM := rm -rf
33

44
ifeq ($(OS),Windows_NT)
55
output_file_extension = .pex
66
rm_path := $(shell python -c "import distutils.spawn; print(distutils.spawn.find_executable('rm'))")
7-
ifeq ($(rm_path),None)
8-
RM := rmdir /S /Q
9-
endif
7+
ifeq ($(rm_path),None)
8+
RM := rmdir /S /Q
9+
endif
1010
python_arch := $(shell python -c "import platform; print platform.architecture()[0]")
11-
ifeq ($(python_arch),64bit)
12-
python_ldap_requirements := misc/build/Win64/python-ldap-requirements.txt
13-
USE_WHEEL := yes
14-
endif
11+
ifeq ($(python_arch),64bit)
12+
misc_build_location := misc/build/Win64/
13+
USE_MISC_BUILD := yes
14+
endif
1515
endif
1616

1717
output_dir = dist
@@ -21,11 +21,10 @@ pex:
2121
pip install --upgrade pip
2222
pip install pex requests wheel
2323
-$(RM) $(output_dir)
24-
ifeq ($(USE_WHEEL),yes)
25-
pip wheel -w wheelhouse -r $(python_ldap_requirements)
24+
ifeq ($(USE_MISC_BUILD),yes)
2625
pex \
2726
-v -o $(output_dir)/$(output_filename)$(output_file_extension) -m user_sync.app \
28-
-f wheelhouse \
27+
-f misc_build_location \
2928
--disable-cache \
3029
--not-zip-safe .
3130
-$(RM) wheelhouse
133 KB
Binary file not shown.
132 KB
Binary file not shown.
132 KB
Binary file not shown.
1.04 MB
Binary file not shown.
1.04 MB
Binary file not shown.
1.04 MB
Binary file not shown.
1.04 MB
Binary file not shown.

misc/build/Win64/python-ldap-requirements.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
packages=['user_sync', 'user_sync.connector'],
4747
install_requires=[
4848
'pycryptodome',
49-
'pyldap',
50-
'PyYAML',
49+
'pyldap==2.4.35.1',
50+
'PyYAML==3.12',
5151
'umapi-client>=2.5',
5252
'psutil',
5353
'keyring',

0 commit comments

Comments
 (0)