diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2018-05-29 21:01:46 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2018-05-29 21:07:50 -0400 |
| commit | 17409e9352f4b1fcf3822a79165d172247da0796 (patch) | |
| tree | a9cf8459c353d8254463ecf87084518d96eb95b3 | |
| parent | 0f4d9379eddcd0367800353e0aaa80d5965b3657 (diff) | |
| download | pycurl-17409e9352f4b1fcf3822a79165d172247da0796.tar.gz | |
Standardize directory names
| -rw-r--r-- | winbuild.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/winbuild.py b/winbuild.py index c396ac9..a1d2d6c 100644 --- a/winbuild.py +++ b/winbuild.py @@ -596,12 +596,13 @@ class CaresBuilder(StandardBuilder): def build(self): fetch('http://c-ares.haxx.se/download/c-ares-%s.tar.gz' % (self.bconf.cares_version)) untar('c-ares-%s' % self.bconf.cares_version) + os.rename('c-ares-%s' % self.bconf.cares_version, 'cares-s' % self.bconf.cares_version) if self.bconf.cares_version == '1.12.0': # msvc_ver.inc is missing in c-ares-1.12.0.tar.gz # https://github.com/c-ares/c-ares/issues/69 fetch('https://raw.githubusercontent.com/c-ares/c-ares/cares-1_12_0/msvc_ver.inc', archive='c-ares-1.12.0/msvc_ver.inc') - cares_dir = rename_for_vc('c-ares-%s' % self.bconf.cares_version, self.vc_tag) + cares_dir = rename_for_vc('cares-%s' % self.bconf.cares_version, self.vc_tag) with in_dir(cares_dir): with self.execute_batch() as b: if self.bconf.cares_version == '1.10.0': @@ -620,7 +621,7 @@ class CaresBuilder(StandardBuilder): @property def output_dir_path(self): - return 'c-ares-%s-%s' % (self.bconf.cares_version, self.vc_tag) + return 'cares-%s-%s' % (self.bconf.cares_version, self.vc_tag) class Libssh2Builder(StandardBuilder): def build(self): @@ -783,7 +784,8 @@ class LibcurlBuilder(StandardBuilder): def build(self): fetch('https://curl.haxx.se/download/curl-%s.tar.gz' % self.bconf.libcurl_version) untar('curl-%s' % self.bconf.libcurl_version) - curl_dir = rename_for_vc('curl-%s' % self.bconf.libcurl_version, self.vc_tag) + os.rename('curl-%s' % self.bconf.libcurl_version, 'libcurl-%s' % self.bconf.libcurl_version) + curl_dir = rename_for_vc('libcurl-%s' % self.bconf.libcurl_version, self.vc_tag) with in_dir(os.path.join(curl_dir, 'winbuild')): if self.bconf.vc_version == 'vc9': |