Skip to content

Commit 30fd77b

Browse files
saambaratisaambarati
committed
build-jsc should invoke make instead of calling xcodebuild directly
https://bugs.webkit.org/show_bug.cgi?id=205960 Reviewed by Keith Miller. .: * Makefile.shared: Source/JavaScriptCore: The various jsc, and test* binaries can all be compiled in parallel. This patch makes that happen when building with make via the CLI that these are built in parallel. To make this work, in Xcode, I needed to mark these binaries as depending on JavaScriptCore.framework. * JavaScriptCore.xcodeproj/project.pbxproj: * Makefile: Canonical link: https://commits.webkit.org/219090@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254234 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent f4e5f1d commit 30fd77b

5 files changed

Lines changed: 156 additions & 2 deletions

File tree

‎ChangeLog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2020-01-08 Saam Barati <sbarati@apple.com>
2+
3+
build-jsc should invoke make instead of calling xcodebuild directly
4+
https://bugs.webkit.org/show_bug.cgi?id=205960
5+
6+
Reviewed by Keith Miller.
7+
8+
* Makefile.shared:
9+
110
2020-01-08 Mark Lam <mark.lam@apple.com>
211

312
Rename testing build configuration to release+assert, and add new testing build configuration.

‎Makefile.shared‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SCRIPTS_PATH ?= ../Tools/Scripts
22

33
SET_COLOR_DIAGNOSTICS_ARG = if [[ -t 1 ]]; then COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; fi
4-
XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
4+
XCODE_OPTIONS += `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_OPTIONS)` $${COLOR_DIAGNOSTICS_ARG} $(ARGS)
55

66
ifneq (,$(SDKROOT))
77
ifneq (,$(OVERRIDE_SDKROOT))

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
2020-01-08 Saam Barati <sbarati@apple.com>
2+
3+
build-jsc should invoke make instead of calling xcodebuild directly
4+
https://bugs.webkit.org/show_bug.cgi?id=205960
5+
6+
Reviewed by Keith Miller.
7+
8+
The various jsc, and test* binaries can all be compiled in parallel.
9+
This patch makes that happen when building with make via the CLI
10+
that these are built in parallel. To make this work, in Xcode, I needed
11+
to mark these binaries as depending on JavaScriptCore.framework.
12+
13+
* JavaScriptCore.xcodeproj/project.pbxproj:
14+
* Makefile:
15+
116
2020-01-08 Tuomas Karkkainen <tuomas.webkit@apple.com>
217

318
Add FuzzerAgents that narrow and widen number predictions

‎Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj‎

Lines changed: 130 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2091,6 +2091,76 @@
20912091
remoteGlobalIDString = 65FB3F6609D11E9100F49DEB;
20922092
remoteInfo = "Derived Sources";
20932093
};
2094+
525D13D023C6936600452D6F /* PBXContainerItemProxy */ = {
2095+
isa = PBXContainerItemProxy;
2096+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2097+
proxyType = 1;
2098+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2099+
remoteInfo = JavaScriptCore;
2100+
};
2101+
525D13D223C6936B00452D6F /* PBXContainerItemProxy */ = {
2102+
isa = PBXContainerItemProxy;
2103+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2104+
proxyType = 1;
2105+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2106+
remoteInfo = JavaScriptCore;
2107+
};
2108+
525D13D423C6937000452D6F /* PBXContainerItemProxy */ = {
2109+
isa = PBXContainerItemProxy;
2110+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2111+
proxyType = 1;
2112+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2113+
remoteInfo = JavaScriptCore;
2114+
};
2115+
525D13D623C6937600452D6F /* PBXContainerItemProxy */ = {
2116+
isa = PBXContainerItemProxy;
2117+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2118+
proxyType = 1;
2119+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2120+
remoteInfo = JavaScriptCore;
2121+
};
2122+
525D13D823C6937B00452D6F /* PBXContainerItemProxy */ = {
2123+
isa = PBXContainerItemProxy;
2124+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2125+
proxyType = 1;
2126+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2127+
remoteInfo = JavaScriptCore;
2128+
};
2129+
525D13DA23C6938400452D6F /* PBXContainerItemProxy */ = {
2130+
isa = PBXContainerItemProxy;
2131+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2132+
proxyType = 1;
2133+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2134+
remoteInfo = JavaScriptCore;
2135+
};
2136+
525D13DC23C6938900452D6F /* PBXContainerItemProxy */ = {
2137+
isa = PBXContainerItemProxy;
2138+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2139+
proxyType = 1;
2140+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2141+
remoteInfo = JavaScriptCore;
2142+
};
2143+
525D13DE23C6939100452D6F /* PBXContainerItemProxy */ = {
2144+
isa = PBXContainerItemProxy;
2145+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2146+
proxyType = 1;
2147+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2148+
remoteInfo = JavaScriptCore;
2149+
};
2150+
525D13E023C6939700452D6F /* PBXContainerItemProxy */ = {
2151+
isa = PBXContainerItemProxy;
2152+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2153+
proxyType = 1;
2154+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2155+
remoteInfo = JavaScriptCore;
2156+
};
2157+
525D13E223C6939B00452D6F /* PBXContainerItemProxy */ = {
2158+
isa = PBXContainerItemProxy;
2159+
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
2160+
proxyType = 1;
2161+
remoteGlobalIDString = 932F5B3E0822A1C700736975;
2162+
remoteInfo = JavaScriptCore;
2163+
};
20942164
52CD0F652242F5A3004A18A5 /* PBXContainerItemProxy */ = {
20952165
isa = PBXContainerItemProxy;
20962166
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
@@ -10397,6 +10467,7 @@
1039710467
buildRules = (
1039810468
);
1039910469
dependencies = (
10470+
525D13DD23C6938900452D6F /* PBXTargetDependency */,
1040010471
14CFB11323035F5800F0048C /* PBXTargetDependency */,
1040110472
);
1040210473
name = testair;
@@ -10414,6 +10485,7 @@
1041410485
buildRules = (
1041510486
);
1041610487
dependencies = (
10488+
525D13DB23C6938400452D6F /* PBXTargetDependency */,
1041710489
14CFB11123035F5300F0048C /* PBXTargetDependency */,
1041810490
);
1041910491
name = dynbench;
@@ -10431,6 +10503,7 @@
1043110503
buildRules = (
1043210504
);
1043310505
dependencies = (
10506+
525D13D923C6937B00452D6F /* PBXTargetDependency */,
1043410507
14CFB10F23035F4D00F0048C /* PBXTargetDependency */,
1043510508
);
1043610509
name = testb3;
@@ -10470,6 +10543,7 @@
1047010543
buildRules = (
1047110544
);
1047210545
dependencies = (
10546+
525D13D123C6936600452D6F /* PBXTargetDependency */,
1047310547
14CFB10023035EF300F0048C /* PBXTargetDependency */,
1047410548
);
1047510549
name = minidom;
@@ -10489,6 +10563,7 @@
1048910563
buildRules = (
1049010564
);
1049110565
dependencies = (
10566+
525D13D323C6936B00452D6F /* PBXTargetDependency */,
1049210567
14CFB10B23035F1A00F0048C /* PBXTargetDependency */,
1049310568
);
1049410569
name = testapi;
@@ -10526,6 +10601,7 @@
1052610601
buildRules = (
1052710602
);
1052810603
dependencies = (
10604+
525D13E323C6939B00452D6F /* PBXTargetDependency */,
1052910605
14CFB11923035F6900F0048C /* PBXTargetDependency */,
1053010606
);
1053110607
name = testdfg;
@@ -10543,6 +10619,7 @@
1054310619
buildRules = (
1054410620
);
1054510621
dependencies = (
10622+
525D13D723C6937600452D6F /* PBXTargetDependency */,
1054610623
14CFB10D23035F4600F0048C /* PBXTargetDependency */,
1054710624
);
1054810625
name = testRegExp;
@@ -10561,6 +10638,7 @@
1056110638
buildRules = (
1056210639
);
1056310640
dependencies = (
10641+
525D13E123C6939700452D6F /* PBXTargetDependency */,
1056410642
14CFB11723035F6300F0048C /* PBXTargetDependency */,
1056510643
);
1056610644
name = testmem;
@@ -10609,6 +10687,7 @@
1060910687
buildRules = (
1061010688
);
1061110689
dependencies = (
10690+
525D13D523C6937000452D6F /* PBXTargetDependency */,
1061210691
14D9D9DA218462B5009126C2 /* PBXTargetDependency */,
1061310692
);
1061410693
name = jsc;
@@ -10627,6 +10706,7 @@
1062710706
buildRules = (
1062810707
);
1062910708
dependencies = (
10709+
525D13DF23C6939100452D6F /* PBXTargetDependency */,
1063010710
14CFB11523035F5E00F0048C /* PBXTargetDependency */,
1063110711
);
1063210712
name = testmasm;
@@ -10640,7 +10720,6 @@
1064010720
0867D690FE84028FC02AAC07 /* Project object */ = {
1064110721
isa = PBXProject;
1064210722
attributes = {
10643-
BuildIndependentTargetsInParallel = YES;
1064410723
DefaultBuildSystemTypeForWorkspace = Original;
1064510724
LastSwiftUpdateCheck = 0700;
1064610725
LastUpgradeCheck = 1000;
@@ -11424,6 +11503,56 @@
1142411503
target = 65FB3F6609D11E9100F49DEB /* Derived Sources */;
1142511504
targetProxy = 14D9D9D9218462B5009126C2 /* PBXContainerItemProxy */;
1142611505
};
11506+
525D13D123C6936600452D6F /* PBXTargetDependency */ = {
11507+
isa = PBXTargetDependency;
11508+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11509+
targetProxy = 525D13D023C6936600452D6F /* PBXContainerItemProxy */;
11510+
};
11511+
525D13D323C6936B00452D6F /* PBXTargetDependency */ = {
11512+
isa = PBXTargetDependency;
11513+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11514+
targetProxy = 525D13D223C6936B00452D6F /* PBXContainerItemProxy */;
11515+
};
11516+
525D13D523C6937000452D6F /* PBXTargetDependency */ = {
11517+
isa = PBXTargetDependency;
11518+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11519+
targetProxy = 525D13D423C6937000452D6F /* PBXContainerItemProxy */;
11520+
};
11521+
525D13D723C6937600452D6F /* PBXTargetDependency */ = {
11522+
isa = PBXTargetDependency;
11523+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11524+
targetProxy = 525D13D623C6937600452D6F /* PBXContainerItemProxy */;
11525+
};
11526+
525D13D923C6937B00452D6F /* PBXTargetDependency */ = {
11527+
isa = PBXTargetDependency;
11528+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11529+
targetProxy = 525D13D823C6937B00452D6F /* PBXContainerItemProxy */;
11530+
};
11531+
525D13DB23C6938400452D6F /* PBXTargetDependency */ = {
11532+
isa = PBXTargetDependency;
11533+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11534+
targetProxy = 525D13DA23C6938400452D6F /* PBXContainerItemProxy */;
11535+
};
11536+
525D13DD23C6938900452D6F /* PBXTargetDependency */ = {
11537+
isa = PBXTargetDependency;
11538+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11539+
targetProxy = 525D13DC23C6938900452D6F /* PBXContainerItemProxy */;
11540+
};
11541+
525D13DF23C6939100452D6F /* PBXTargetDependency */ = {
11542+
isa = PBXTargetDependency;
11543+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11544+
targetProxy = 525D13DE23C6939100452D6F /* PBXContainerItemProxy */;
11545+
};
11546+
525D13E123C6939700452D6F /* PBXTargetDependency */ = {
11547+
isa = PBXTargetDependency;
11548+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11549+
targetProxy = 525D13E023C6939700452D6F /* PBXContainerItemProxy */;
11550+
};
11551+
525D13E323C6939B00452D6F /* PBXTargetDependency */ = {
11552+
isa = PBXTargetDependency;
11553+
target = 932F5B3E0822A1C700736975 /* JavaScriptCore */;
11554+
targetProxy = 525D13E223C6939B00452D6F /* PBXContainerItemProxy */;
11555+
};
1142711556
52CD0F662242F5A3004A18A5 /* PBXTargetDependency */ = {
1142811557
isa = PBXTargetDependency;
1142911558
target = 52CD0F592242F569004A18A5 /* testdfg */;

‎Source/JavaScriptCore/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
XCODE_OPTIONS += -parallelizeTargets
12
include ../Makefile.shared

0 commit comments

Comments
 (0)