@@ -32,7 +32,6 @@ if sys.platform == 'win32':
32
32
env = Environment (tools = ['default' , 'packaging' , enscons .generate , enscons .cpyext .generate ],
33
33
PACKAGE_METADATA = metadata ,
34
34
WHEEL_TAG = full_tag ,
35
- ROOT_IS_PURELIB = False ,
36
35
MSVC_VERSION = MSVC_VERSION ,
37
36
TARGET_ARCH = TARGET_ARCH )
38
37
@@ -72,21 +71,15 @@ py_source = (Glob('cryptacular/*.py') +
72
71
Glob ('cryptacular/crypt/*.py' ) +
73
72
Glob ('cryptacular/pbkdf2/*.py' ))
74
73
75
- whl = env .Whl ('platlib' , py_source + extension , root = '' )
74
+ platlib = env .Whl ('platlib' , py_source + extension , root = '' )
75
+ whl = env .WhlFile (source = platlib )
76
76
77
77
# Add automatic source files, plus any other needed files.
78
- sdist_source = (FindSourceFiles () +
78
+ sdist_source = list ( set (FindSourceFiles () +
79
79
['PKG-INFO' , 'setup.py' ] +
80
- Glob ('crypt_blowfish-1.2/*' , exclude = ['crypt_blowfish-1.2/*.os' ]))
81
-
82
- sdist = env .Package (
83
- NAME = env ['PACKAGE_NAME' ],
84
- VERSION = env ['PACKAGE_METADATA' ]['version' ],
85
- PACKAGETYPE = 'src_zip' ,
86
- source = sdist_source ,
87
- target = ['/' .join ([env ['DIST_BASE' ], env ['PACKAGE_NAME' ] + '-' + env ['PACKAGE_VERSION' ] + '.zip' ])],
88
- )
80
+ Glob ('crypt_blowfish-1.2/*' , exclude = ['crypt_blowfish-1.2/*.os' ])))
89
81
82
+ sdist = env .SDist (source = sdist_source )
90
83
env .Alias ('sdist' , sdist )
91
84
92
85
install = env .Command ("#DUMMY" , whl ,
0 commit comments