Skip to content

Commit 43ce775

Browse files
committed
no-clean is not that usefull
1 parent 67a8e15 commit 43ce775

File tree

2 files changed

+45
-49
lines changed

2 files changed

+45
-49
lines changed

builder.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def cli(ctx):
1818

1919
@cli.command()
2020
@click.option('--no-update', help='Do not update source files.', is_flag=True)
21-
@click.option('--no-clean', help='Do not clean last build before build.', is_flag=True)
2221
@click.option('--force', help='Force build of specified target.', is_flag=True)
2322
@click.option('--target', default='default', show_default=True, help='Target project to build.')
2423
@click.option('--arch', default=getArchitecture(), show_default=True, help='Build architecture.')
@@ -28,15 +27,15 @@ def cli(ctx):
2827
@click.option('--single', help='Single target build (for CI only)', is_flag=True)
2928
@click.option('--tar', help='Single target package (for CI only)', is_flag=True)
3029
@click.option('-j', '--nproc', default=os.cpu_count(), show_default=True, help='Number of build process.')
31-
def build(no_update, no_clean, force, target, arch, rules, dry, src, single, tar, nproc):
30+
def build(no_update, force, target, arch, rules, dry, src, single, tar, nproc):
3231
"""Build tools"""
3332
for rule in rules.split(","):
3433
loadRules(rule)
3534
validateRules()
3635
validateTarget(target)
3736
validateArch(arch)
3837
pullCode(target, arch, getArchitecture(), no_update, single)
39-
buildCode(target, arch, nproc, no_clean, force, dry, src, single, tar)
38+
buildCode(target, arch, nproc, force, dry, src, single, tar)
4039

4140
@cli.command()
4241
@click.option('--arch', default=getArchitecture(), show_default=True, help='Build architecture.')

src/base.py

Lines changed: 43 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ def create_exe(exe_name, directory, cwd):
441441
if code!=0:
442442
log_error("Script returned error code {}.".format(code))
443443

444-
def buildCode(build_target, build_arch, nproc, no_clean, force, dry, pack_sources, single, tar):
444+
def buildCode(build_target, build_arch, nproc, force, dry, pack_sources, single, tar):
445445
log_info_triple("Building ", build_target, " for {} architecture ...".format(build_arch))
446446

447447
build_order = createBuildOrder(build_target, build_arch, getArchitecture(), True)
@@ -520,50 +520,47 @@ def buildCode(build_target, build_arch, nproc, no_clean, force, dry, pack_source
520520
os.makedirs(output_dir)
521521

522522
build_dir = os.path.join(BUILDS_ROOT, arch, target.name)
523-
if no_clean and os.path.exists(build_dir):
524-
log_step("Skipping clean of build dir ...")
525-
else:
526-
if not target.top_package:
527-
log_step("Remove old build dir ...")
528-
if os.path.exists(build_dir):
529-
shutil.rmtree(build_dir, onerror=removeError)
530-
log_step("Creating build dir ...")
531-
os.makedirs(build_dir)
532-
for s in target.sources:
533-
src_dir = os.path.join(SOURCES_ROOT, s)
534-
log_step_triple("Copy '", s, "' source to build dir ...")
535-
run(['rsync','-a', src_dir, build_dir])
536-
537-
deps = target.dependencies
538-
if t[1] == target.name and target.top_package:
539-
res = set()
540-
for d in build_order:
541-
dep = targets[d[1]]
542-
if (dep and dep.resources):
543-
for r in dep.resources:
544-
res.add(r)
545-
deps += list(res)
546-
547-
for d in deps:
548-
dep = targets[d]
549-
needed = True
550-
if dep.arch and arch not in dep.arch:
551-
needed = False
552-
if needed:
553-
dep_build_info = ""
554-
if (dep.build_native and build_arch != getArchitecture()):
555-
dep_build_info = " [" + getArchitecture() + "]"
556-
dep_dir = os.path.join(OUTPUTS_ROOT, getArchitecture(), d)
557-
else:
558-
dep_dir = os.path.join(OUTPUTS_ROOT, arch, d)
559-
if not os.path.exists(dep_dir):
560-
log_error("Dependency output directory for {} does not exist.".format(d + dep_build_info))
561-
if not target.top_package:
562-
log_step_triple("Copy '", d + dep_build_info, "' output to build dir ...")
563-
run(['rsync','-a', dep_dir, build_dir])
564-
else:
565-
log_step_triple("Copy '", d + dep_build_info, "' output to package dir ...")
566-
run(['rsync','-a', dep_dir+"/", output_dir])
523+
if not target.top_package:
524+
log_step("Remove old build dir ...")
525+
if os.path.exists(build_dir):
526+
shutil.rmtree(build_dir, onerror=removeError)
527+
log_step("Creating build dir ...")
528+
os.makedirs(build_dir)
529+
for s in target.sources:
530+
src_dir = os.path.join(SOURCES_ROOT, s)
531+
log_step_triple("Copy '", s, "' source to build dir ...")
532+
run(['rsync','-a', src_dir, build_dir])
533+
534+
deps = target.dependencies
535+
if t[1] == target.name and target.top_package:
536+
res = set()
537+
for d in build_order:
538+
dep = targets[d[1]]
539+
if (dep and dep.resources):
540+
for r in dep.resources:
541+
res.add(r)
542+
deps += list(res)
543+
544+
for d in deps:
545+
dep = targets[d]
546+
needed = True
547+
if dep.arch and arch not in dep.arch:
548+
needed = False
549+
if needed:
550+
dep_build_info = ""
551+
if (dep.build_native and build_arch != getArchitecture()):
552+
dep_build_info = " [" + getArchitecture() + "]"
553+
dep_dir = os.path.join(OUTPUTS_ROOT, getArchitecture(), d)
554+
else:
555+
dep_dir = os.path.join(OUTPUTS_ROOT, arch, d)
556+
if not os.path.exists(dep_dir):
557+
log_error("Dependency output directory for {} does not exist.".format(d + dep_build_info))
558+
if not target.top_package:
559+
log_step_triple("Copy '", d + dep_build_info, "' output to build dir ...")
560+
run(['rsync','-a', dep_dir, build_dir])
561+
else:
562+
log_step_triple("Copy '", d + dep_build_info, "' output to package dir ...")
563+
run(['rsync','-a', dep_dir+"/", output_dir])
567564

568565

569566
prefix = "/yosyshq"
@@ -625,7 +622,7 @@ def buildCode(build_target, build_arch, nproc, no_clean, force, dry, pack_source
625622
log_step("Packing {} ...".format(package_name))
626623
create_tar(package_name, output_dir, ".")
627624

628-
if not no_clean and not target.top_package:
625+
if not target.top_package:
629626
log_step("Remove build dir ...")
630627
if os.path.exists(build_dir):
631628
shutil.rmtree(build_dir, onerror=removeError)

0 commit comments

Comments
 (0)