Title: [244135] trunk/Source/WTF
- Revision
- 244135
- Author
- [email protected]
- Date
- 2019-04-10 10:53:21 -0700 (Wed, 10 Apr 2019)
Log Message
Do not generate empty unified sources when unified builds are disabled
https://bugs.webkit.org/show_bug.cgi?id=196767
Reviewed by Konstantin Tokarev.
If unified builds are disabled, the ruby script to generate them
is still used to list the sources that need to be
compiled. Currently, the script always generates bundled unified
sources, even if it's being used just to list all the sources. So
when the unified builds are disabled and no files are going to be
bundled, the script generates one empty file per bundle manager
(that is, one C++ and one ObjectiveC), that gets added to the
sources to be compiled.
* Scripts/generate-unified-source-bundles.rb: Only go through the
bundle managers file generation when not running in
PrintAllSources mode, to avoid generating empty bundle files.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (244134 => 244135)
--- trunk/Source/WTF/ChangeLog 2019-04-10 17:46:44 UTC (rev 244134)
+++ trunk/Source/WTF/ChangeLog 2019-04-10 17:53:21 UTC (rev 244135)
@@ -1,3 +1,23 @@
+2019-04-10 Claudio Saavedra <[email protected]>
+
+ Do not generate empty unified sources when unified builds are disabled
+ https://bugs.webkit.org/show_bug.cgi?id=196767
+
+ Reviewed by Konstantin Tokarev.
+
+ If unified builds are disabled, the ruby script to generate them
+ is still used to list the sources that need to be
+ compiled. Currently, the script always generates bundled unified
+ sources, even if it's being used just to list all the sources. So
+ when the unified builds are disabled and no files are going to be
+ bundled, the script generates one empty file per bundle manager
+ (that is, one C++ and one ObjectiveC), that gets added to the
+ sources to be compiled.
+
+ * Scripts/generate-unified-source-bundles.rb: Only go through the
+ bundle managers file generation when not running in
+ PrintAllSources mode, to avoid generating empty bundle files.
+
2019-04-10 Enrique Ocaña González <[email protected]>
[WPE] Avoid async IO starving timers
Modified: trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb (244134 => 244135)
--- trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb 2019-04-10 17:46:44 UTC (rev 244134)
+++ trunk/Source/WTF/Scripts/generate-unified-source-bundles.rb 2019-04-10 17:53:21 UTC (rev 244135)
@@ -343,22 +343,24 @@
end
}
-$bundleManagers.each_value {
- | manager |
- manager.flush
+if $mode != :PrintAllSources
+ $bundleManagers.each_value {
+ | manager |
+ manager.flush
- maxCount = manager.maxCount
- next if !maxCount
+ maxCount = manager.maxCount
+ next if !maxCount
- manager.flushToMax
+ manager.flushToMax
- unless manager.extraFiles.empty?
- extension = manager.extension
- bundleCount = manager.bundleCount
- filesToAdd = manager.extraFiles.join(", ")
- raise "number of bundles for #{extension} sources, #{bundleCount}, exceeded limit, #{maxCount}. Please add #{filesToAdd} to Xcode then update UnifiedSource#{extension.capitalize}FileCount"
- end
-}
+ unless manager.extraFiles.empty?
+ extension = manager.extension
+ bundleCount = manager.bundleCount
+ filesToAdd = manager.extraFiles.join(", ")
+ raise "number of bundles for #{extension} sources, #{bundleCount}, exceeded limit, #{maxCount}. Please add #{filesToAdd} to Xcode then update UnifiedSource#{extension.capitalize}FileCount"
+ end
+ }
+end
if $mode == :GenerateXCFilelists
IO::write($inputXCFilelistPath, $inputSources.sort.join("\n") + "\n") if $inputXCFilelistPath
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
