Skip to content

Commit 5408c05

Browse files
rolfbjarnespouliot
rolfbjarne
authored and
spouliot
committed
[xharness] Remove Classic logic from makefile generation. (#823)
1 parent 3eb0fdf commit 5408c05

File tree

1 file changed

+7
-29
lines changed

1 file changed

+7
-29
lines changed

‎tests/xharness/MakefileGenerator.cs‎

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
290290

291291
if (target is ClassicTarget) {
292292
// target that builds both Classic+Unified
293-
writer.WriteTarget ("build{0}-sim-{1}", "build{0}-simclassic-{1} build{0}-simunified-{1}", make_escaped_suffix, make_escaped_name);
293+
writer.WriteTarget ("build{0}-sim-{1}", "build{0}-simunified-{1}", make_escaped_suffix, make_escaped_name);
294294
writer.WriteLine ("\t$(Q) echo Build succeeded"); // This is important, otherwise we'll end up executing the catch-all build-% target
295295
writer.WriteLine ();
296296
}
@@ -351,18 +351,12 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
351351
// target that runs both Classic+Unified
352352
writer.WriteTarget ("run{0}-sim-{1}", string.Empty, make_escaped_suffix, make_escaped_name);
353353
writer.WriteLine ("\t$(Q) rm -f \"[email protected]\"");
354-
writer.WriteLine ("\t$(Q) $(MAKE) build{0}-simclassic-{1} build{0}-simunified-{1}", make_escaped_suffix, make_escaped_name);
355-
writer.WriteLine ("\t$(Q) $(MAKE) exec{0}-simclassic-{1} || echo \"exec{0}-simclassic-{1} failed\" >> \"[email protected]\"", make_escaped_suffix, make_escaped_name);
354+
writer.WriteLine ("\t$(Q) $(MAKE) build{0}-simunified-{1}", make_escaped_suffix, make_escaped_name);
356355
writer.WriteLine ("\t$(Q) $(MAKE) exec{0}-sim32-{1} || echo \"exec{0}-sim32-{1} failed\" >> \"[email protected]\"", make_escaped_suffix, make_escaped_name);
357356
writer.WriteLine ("\t$(Q) $(MAKE) exec{0}-sim64-{1} || echo \"exec{0}-sim64-{1} failed\" >> \"[email protected]\"", make_escaped_suffix, make_escaped_name);
358357
writer.WriteLine ("\t$(Q) if test -e \"[email protected]\"; then cat \"[email protected]\"; rm \"[email protected]\"; exit 1; fi");
359358
writer.WriteLine ();
360359

361-
// compat targets for finger memory
362-
writer.WriteTarget ("run-simcompat-{1}", "run-ios-simclassic-{1}", make_escaped_suffix, make_escaped_name);
363-
writer.WriteLine ("\t$(Q) echo Run succeeded"); // This is important, otherwise we'll end up executing the catch-all run-% target
364-
writer.WriteLine ();
365-
366360
writer.WriteTarget ("run-simdual-{1}", "run-ios-simunified-{1}", make_escaped_suffix, make_escaped_name);
367361
writer.WriteLine ("\t$(Q) echo Run succeeded"); // This is important, otherwise we'll end up executing the catch-all run-% target
368362
writer.WriteLine ();
@@ -411,7 +405,7 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
411405

412406
if (target is ClassicTarget) {
413407
// target that builds both Classic+Unified
414-
writer.WriteTarget ("build{0}-dev-{1}", "build{0}-devclassic-{1} build{0}-devunified-{1}", make_escaped_suffix, make_escaped_name);
408+
writer.WriteTarget ("build{0}-dev-{1}", "build{0}-devunified-{1}", make_escaped_suffix, make_escaped_name);
415409
writer.WriteLine ("\t$(Q) echo Build succeeded"); // This is important, otherwise we'll end up executing the catch-all build-% target
416410
writer.WriteLine ();
417411
}
@@ -497,19 +491,13 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
497491
// target that runs both Classic+Unified
498492
writer.WriteTarget ("run{0}-dev-{1}", string.Empty, make_escaped_suffix, make_escaped_name);
499493
writer.WriteLine ("\t$(Q) rm -f \"[email protected]\"");
500-
writer.WriteLine ("\t$(Q) $(MAKE) build{0}-devclassic-{1} build{0}-devunified-{1}", make_escaped_suffix, make_escaped_name);
501-
writer.WriteLine ("\t$(Q) $(MAKE) install{0}-devclassic-{1}", make_escaped_suffix, make_escaped_name);
502-
writer.WriteLine ("\t$(Q) $(MAKE) exec{0}-devclassic-{1} || echo \"exec{0}-devclassic-{1} failed\" >> \"[email protected]\"", make_escaped_suffix, make_escaped_name);
494+
writer.WriteLine ("\t$(Q) $(MAKE) build{0}-simunified-{1}", make_escaped_suffix, make_escaped_name);
495+
writer.WriteLine ("\t$(Q) $(MAKE) build{0}-devunified-{1}", make_escaped_suffix, make_escaped_name);
503496
writer.WriteLine ("\t$(Q) $(MAKE) install{0}-devunified-{1}", make_escaped_suffix, make_escaped_name);
504497
writer.WriteLine ("\t$(Q) $(MAKE) exec{0}-devunified-{1} || echo \"exec{0}-devunified-{1} failed\" >> \"[email protected]\"", make_escaped_suffix, make_escaped_name);
505498
writer.WriteLine ("\t$(Q) if test -e \"[email protected]\"; then cat \"[email protected]\"; rm \"[email protected]\"; exit 1; fi");
506499
writer.WriteLine ();
507500

508-
// compat targets for finger memory
509-
writer.WriteTarget ("run-devcompat-{1}", "run-ios-devclassic-{1}", make_escaped_suffix, make_escaped_name);
510-
writer.WriteLine ("\t$(Q) echo Run succeeded"); // This is important, otherwise we'll end up executing the catch-all run-% target
511-
writer.WriteLine ();
512-
513501
writer.WriteTarget ("run-devdual-{1}", "run-ios-devunified-{1}", make_escaped_suffix, make_escaped_name);
514502
writer.WriteLine ("\t$(Q) echo Run succeeded"); // This is important, otherwise we'll end up executing the catch-all run-% target
515503
writer.WriteLine ();
@@ -537,8 +525,6 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
537525
continue;
538526

539527
if (target is ClassicTarget) {
540-
writer.WriteLine ("\t$(Q) $(MAKE) \"run{0}-simclassic-{1}\" || echo \"run{0}-simclassic-{1} failed\" >> \"[email protected]\"", "-ios", target.Name);
541-
writer.WriteLine ("\t$(Q) $(MAKE) \"run{0}-devclassic-{1}\" || echo \"run{0}-devclassic-{1} failed\" >> \"[email protected]\"", "-ios", target.Name);
542528
} else if (target is UnifiedTarget) {
543529
writer.WriteLine ("\t$(Q) $(MAKE) \"run{0}-simunified-{1}\" || echo \"run{0}-simunified-{1} failed\" >> \"[email protected]\"", "-ios", target.Name);
544530
writer.WriteLine ("\t$(Q) $(MAKE) \"run{0}-devunified-{1}\" || echo \"run{0}-devunified-{1} failed\" >> \"[email protected]\"", "-ios", target.Name);
@@ -557,7 +543,6 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
557543
continue;
558544

559545
if (target is ClassicTarget) {
560-
writer.WriteLine ("\t$(Q) $(MAKE) \"run{0}-simcompat-{1}\" || echo \"run{0}-simcompat-{1} failed\" >> \"[email protected]\"", "-ios", target.Name);
561546
} else if (target is UnifiedTarget) {
562547
writer.WriteLine ("\t$(Q) $(MAKE) \"run{0}-simunified-{1}\" || echo \"run{0}-simunified-{1} failed\" >> \"[email protected]\"", "-ios", target.Name);
563548
} else {
@@ -574,7 +559,6 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
574559
continue;
575560

576561
if (target is ClassicTarget) {
577-
writer.WriteLine ("\t$(Q) $(MAKE) \"run{0}-devcompat-{1}\" || echo \"run{0}-devcompat-{1} failed\" >> \"[email protected]\"", "-ios", target.Name);
578562
} else if (target is UnifiedTarget) {
579563
writer.WriteLine ("\t$(Q) $(MAKE) \"run{0}-devunified-{1}\" || echo \"run{0}-devunified-{1} failed\" >> \"[email protected]\"", "-ios", target.Name);
580564
} else {
@@ -607,11 +591,11 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
607591
continue;
608592
var make_escaped_name = target.Name.Replace (" ", "\\ ");
609593

610-
writer.WriteTarget ("build-sim-{0}", "build-ios-simclassic-{0} build-ios-simunified-{0} build-tvos-sim-{0} build-watchos-sim-{0}", make_escaped_name);
594+
writer.WriteTarget ("build-sim-{0}", "build-ios-simunified-{0} build-tvos-sim-{0} build-watchos-sim-{0}", make_escaped_name);
611595
writer.WriteLine ("\t$(Q) echo Simulator builds succeeded"); // This is important, otherwise we'll end up executing the catch-all build-% target
612596
writer.WriteLine ();
613597

614-
writer.WriteTarget ("build-dev-{0}", "build-ios-devclassic-{0} build-ios-devunified-{0} build-tvos-dev-{0} build-watchos-dev-{0}", make_escaped_name);
598+
writer.WriteTarget ("build-dev-{0}", "build-ios-devunified-{0} build-tvos-dev-{0} build-watchos-dev-{0}", make_escaped_name);
615599
writer.WriteLine ("\t$(Q) echo Device builds succeeded"); // This is important, otherwise we'll end up executing the catch-all build-% target
616600
writer.WriteLine ();
617601

@@ -620,7 +604,6 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
620604
writer.WriteLine ();
621605

622606
writer.WriteTarget ("run-sim-{0}", "build-sim-{0}", make_escaped_name);
623-
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-simclassic-{0}\" || echo \"exec-sim-iosclassic-{0} failed\" >> \"[email protected]\"", target.Name);
624607
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-sim32-{0}\" || echo \"exec-ios-sim32-{0} failed\" >> \"[email protected]\"", target.Name);
625608
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-sim64-{0}\" || echo \"exec-ios-sim64-{0} failed\" >> \"[email protected]\"", target.Name);
626609
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-tvos-sim-{0}\" || echo \"exec-tvos-sim-{0} failed\" >> \"[email protected]\"", target.Name);
@@ -629,8 +612,6 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
629612
writer.WriteLine ();
630613

631614
writer.WriteTarget ("run-dev-{0}", "build-dev-{0}", make_escaped_name);
632-
writer.WriteLine ("\t$(Q) $(MAKE) \"install-ios-devclassic-{0}\" || echo \"install-ios-devclassic-{0} failed\" >> \"[email protected]\"", target.Name);
633-
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-devclassic-{0}\" || echo \"exec-ios-devclassic-{0} failed\" >> \"[email protected]\"", target.Name);
634615
writer.WriteLine ("\t$(Q) $(MAKE) \"install-ios-devunified-{0}\" || echo \"install-ios-devunified-{0} failed\" >> \"[email protected]\"", target.Name);
635616
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-devunified-{0}\" || echo \"exec-ios-devunified-{0} failed\" >> \"[email protected]\"", target.Name);
636617
writer.WriteLine ("\t$(Q) $(MAKE) \"install-tvos-dev-{0}\" || echo \"install-tvos-dev-{0} failed\" >> \"[email protected]\"", target.Name);
@@ -642,14 +623,11 @@ public static void CreateMakefile (Harness harness, IEnumerable<ClassicTarget> c
642623

643624
writer.WriteTarget ("run-{0}", "build-{0}", make_escaped_name);
644625
// sim
645-
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-simclassic-{0}\" || echo \"exec-sim-iosclassic-{0} failed\" >> \"[email protected]\"", target.Name);
646626
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-sim32-{0}\" || echo \"exec-ios-sim32-{0} failed\" >> \"[email protected]\"", target.Name);
647627
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-sim64-{0}\" || echo \"exec-ios-sim64-{0} failed\" >> \"[email protected]\"", target.Name);
648628
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-tvos-sim-{0}\" || echo \"exec-tvos-sim-{0} failed\" >> \"[email protected]\"", target.Name);
649629
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-watchos-sim-{0}\" || echo \"exec-watchos-sim-{0} failed\" >> \"[email protected]\"", target.Name);
650630
// dev
651-
writer.WriteLine ("\t$(Q) $(MAKE) \"install-ios-devclassic-{0}\" || echo \"install-ios-devclassic-{0} failed\" >> \"[email protected]\"", target.Name);
652-
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-devclassic-{0}\" || echo \"exec-ios-devclassic-{0} failed\" >> \"[email protected]\"", target.Name);
653631
writer.WriteLine ("\t$(Q) $(MAKE) \"install-ios-devunified-{0}\" || echo \"install-ios-devunified-{0} failed\" >> \"[email protected]\"", target.Name);
654632
writer.WriteLine ("\t$(Q) $(MAKE) \"exec-ios-devunified-{0}\" || echo \"exec-ios-devunified-{0} failed\" >> \"[email protected]\"", target.Name);
655633
writer.WriteLine ("\t$(Q) $(MAKE) \"install-tvos-dev-{0}\" || echo \"install-tvos-dev-{0} failed\" >> \"[email protected]\"", target.Name);

0 commit comments

Comments
 (0)