Don't create copy of sources and drop zips in main dir

parent 61e8dd59
Pipeline #3018 passed with stages
in 30 minutes and 43 seconds
......@@ -27,8 +27,6 @@ def main():
# create sources jar before building
jar_name = create_sources_jar(versions)
jar_name_android = get_sources_file_name(versions, android=True)
copy(jar_name, jar_name_android)
# build Tor for various platforms and architectures
build()
......@@ -54,11 +52,11 @@ def main():
# print hashes for debug purposes
for file in file_list + [zip_name, jar_name, pom_name]:
sha256hash = get_sha256(os.path.join(REPO_DIR, file))
sha256hash = get_sha256(file)
print("%s: %s" % (file, sha256hash))
print("Android:")
for file in file_list_android + [zip_name_android, jar_name_android, pom_name_android]:
sha256hash = get_sha256(os.path.join(REPO_DIR, file))
for file in file_list_android + [zip_name_android, pom_name_android]:
sha256hash = get_sha256(file)
print("%s: %s" % (file, sha256hash))
......@@ -238,7 +236,7 @@ def pack(versions, file_list, android=False):
for filename in file_list:
reset_time(os.path.join(REPO_DIR, filename)) # make file times deterministic before zipping
zip_name = get_final_file_name(versions, android)
check_call(['zip', '-D', '-X', zip_name] + file_list, cwd=REPO_DIR)
check_call(['zip', '-D', '-X', '../' + zip_name] + file_list, cwd=REPO_DIR)
return zip_name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment