diff --git a/.idea/encodings.xml b/.idea/encodings.xml index f49c862..7d25301 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,6 @@ - + @@ -29,11 +29,13 @@ + + diff --git a/build/.idea/build.iml b/build/.idea/build.iml index 7cfc769..14585d1 100644 --- a/build/.idea/build.iml +++ b/build/.idea/build.iml @@ -1,8 +1,10 @@ - - + + + + diff --git a/build/builder/build-external.py b/build/builder/build-external.py index f79ab9a..24b8f60 100644 --- a/build/builder/build-external.py +++ b/build/builder/build-external.py @@ -318,7 +318,8 @@ class BuilderLinux(BuilderBase): cc.w('already exists, skip.') def _build_openssl(self, file_name): - pass # we do not need build openssl anymore, because first time run build.sh we built Python, it include openssl. + # we do not need build openssl anymore, because first time run build.sh we built Python with openssl included. + pass def _build_libuv(self, file_name): if not os.path.exists(self.LIBUV_PATH_SRC): @@ -347,6 +348,8 @@ class BuilderLinux(BuilderBase): # use os.unlink() because some file should be a link. os.unlink(os.path.join(self.PATH_RELEASE, 'lib', i)) + utils.ensure_file_exists(os.path.join(self.PATH_RELEASE, 'lib', 'libuv.a')) + def _build_mbedtls(self, file_name): if not os.path.exists(self.MBEDTLS_PATH_SRC): os.system('unzip "{}/{}" -d "{}"'.format(PATH_DOWNLOAD, file_name, self.PATH_TMP)) @@ -382,8 +385,6 @@ class BuilderLinux(BuilderBase): # fix source file utils.ensure_file_exists(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'include', 'mbedtls', 'config.h')) utils.copy_file(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'include', 'mbedtls'), os.path.join(self.MBEDTLS_PATH_SRC, 'include', 'mbedtls'), 'config.h') - # utils.ensure_file_exists(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'library', 'rsa.c')) - # utils.copy_file(os.path.join(PATH_EXTERNAL, 'fix-external', 'mbedtls', 'library'), os.path.join(self.MBEDTLS_PATH_SRC, 'library'), 'rsa.c') old_p = os.getcwd() os.chdir(self.MBEDTLS_PATH_SRC)