Merge pull request #6790 from dumganhar/download-fix

Updates download-deps.py for execute this python where not in the root of cocos2d-x.
This commit is contained in:
James Chen 2014-05-17 12:04:35 +08:00
commit ca6234e11a
1 changed files with 3 additions and 2 deletions

View File

@ -68,7 +68,7 @@ class CocosZipInstaller(object):
self._url = data["repo_parent"] + self._repo_name + '/archive/' + self._filename self._url = data["repo_parent"] + self._repo_name + '/archive/' + self._filename
self._zip_file_size = int(data["zip_file_size"]) self._zip_file_size = int(data["zip_file_size"])
# 'v' letter was swallowed by github, so we need to substring it from the 2nd letter # 'v' letter was swallowed by github, so we need to substring it from the 2nd letter
self._extracted_folder_name = self._repo_name + '-' + self._current_version[1:] self._extracted_folder_name = os.path.join(self._workpath, self._repo_name + '-' + self._current_version[1:])
try: try:
data = self.load_json_file(version_path) data = self.load_json_file(version_path)
@ -291,8 +291,9 @@ def main():
print("=======================================================") print("=======================================================")
print("==> Prepare to download external libraries!") print("==> Prepare to download external libraries!")
external_path = os.path.join(workpath, 'external')
installer = CocosZipInstaller(workpath, os.path.join(workpath, 'external', 'config.json'), os.path.join(workpath, 'external', 'version.json'), "prebuilt_libs_version") installer = CocosZipInstaller(workpath, os.path.join(workpath, 'external', 'config.json'), os.path.join(workpath, 'external', 'version.json'), "prebuilt_libs_version")
installer.run("external", opts.remove_downloaded, opts.force_update, opts.download_only) installer.run(external_path, opts.remove_downloaded, opts.force_update, opts.download_only)
print("=======================================================") print("=======================================================")
print("==> Prepare to download lua runtime binaries") print("==> Prepare to download lua runtime binaries")