Skip to content

Commit a23b60b

Browse files
authored
Merge pull request #153 from firebase/version_workflow
build package fix
2 parents d68cd5b + 36362e3 commit a23b60b

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

build_package.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def main(argv):
169169
p = subprocess.Popen(cmd_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
170170
output, error = p.communicate()
171171
if p.returncode != 0:
172-
logging.info("Generate new Guids")
172+
logging.info("Generating new guids.")
173173
error_str = str(error)
174174
error_str = error_str.split("assets:")[-1]
175175
error_str = error_str.rstrip("\\n\'")
@@ -188,16 +188,13 @@ def main(argv):
188188
print(file)
189189
gen_cmd_args.append(file)
190190
subprocess.call(gen_cmd_args)
191-
else:
192-
#error_list = str(error).split("\\n")
193-
logging.info("No need to generate new Guids")
194-
195-
# Package with new guids
196-
logging.info("Start Package")
197-
if os.path.exists(output_folder):
198-
shutil.rmtree(output_folder)
199-
subprocess.call(cmd_args)
200191

192+
# Need to package again if has that error
193+
subprocess.call(cmd_args)
194+
else:
195+
logging.info("No new guid generated.")
196+
error_list = str(error).split("\\n")
197+
logging.info("\n".join(error_list))
201198
logging.info("Packaging done for version %s", last_version)
202199

203200
if __name__ == '__main__':

cmake/build_shared.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
5555
else()
5656
set_target_properties(${shared_target}
5757
PROPERTIES
58-
PREFIX "lib"
58+
PREFIX ""
5959
)
6060
endif()
6161

0 commit comments

Comments
 (0)