From: <mi...@st...> - 2003-08-22 02:49:32
|
Mauro Cicognini wrote: > Michael Str=F6der wrote: >=20 >> >BTW Michael, how would you let the different setp.cfg versions co-exi= st? >> I think Build/ is the right place.=20 >=20 > Right. I'd create a "Build/win32" dir and put the setup.cfg there. Already checked in Build/setup.cfg.win32 and Build/setup.cfg.suse-linux a= nd=20 added it to MANIFEST.in. > Obviously the main dir should have pointers to let people know they=20 > should look into "Build/<platform>". Already added comment to INSTALL. >> We should stick with one way which is DistUtils. >=20 > OK. I guess you can zap directory "Win32" from the CVS tree altogether,= =20 > then. Was never in the normal source distribution anyway. >>> I did have to extend setup.py a bit; I attach the unified diff here. >> >> Hmm, can web apply changes one-by-one? I'd really like to see in the=20 >> diff what was changed. >=20 > Right. I attach a file where I try to let changes stand out more. I already checked in your previous diffs. In the end it wasn't that hard = to=20 figure out what has changed. But just as advice for next time... > 1. I needed extra options for the linker; so I added "extra_link_args" = > to the class definition and passed it to the constructor. > 2. I hijacked the "data files" mechanism in Distutils to carry over the= =20 > Cyrus-SASL DLL. I added "extra_files" to the class definition and passe= d=20 > it to setup() as the "data_files" param. I also had to add a loop to=20 > process that setting in the setup.cfg. > 3. I added the library names I got under Win32 for LDAP (oldap_r) and=20 > SASL (libsasl) to the macro-definition logic. Noted. >> error: build_py: supplying both 'packages' and 'py_modules' options is= =20 >> not allowed=20 >=20 > Hmmm, this is unfortunate. I wasn't aware of this limitation. I wonder = why? I wonder why, too. :-/ > If so, let's revert to the old style. Already done. > However, there's one file missing=20 > from the manually-built list (ldap/filter.py). Is this intentional? Ouch! Good catch! Fixed. I will now test your Win32 build... Ciao, Michael. |