diff --git a/FWCore/Catalog/BuildFile.xml b/FWCore/Catalog/BuildFile.xml
index cf2a668a86f3e..7cf5c6fa06de7 100644
--- a/FWCore/Catalog/BuildFile.xml
+++ b/FWCore/Catalog/BuildFile.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/FWCore/Catalog/test/BuildFile.xml b/FWCore/Catalog/test/BuildFile.xml
index a586b9534faa6..484a7cb422667 100644
--- a/FWCore/Catalog/test/BuildFile.xml
+++ b/FWCore/Catalog/test/BuildFile.xml
@@ -1,5 +1,5 @@
-
-
-
-
+
+
+
+
diff --git a/FWCore/Common/BuildFile.xml b/FWCore/Common/BuildFile.xml
index 8659352c64783..78f2d10bf1cc3 100644
--- a/FWCore/Common/BuildFile.xml
+++ b/FWCore/Common/BuildFile.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/FWCore/Concurrency/BuildFile.xml b/FWCore/Concurrency/BuildFile.xml
index b713feadf6bb2..7cb8fc15208d0 100644
--- a/FWCore/Concurrency/BuildFile.xml
+++ b/FWCore/Concurrency/BuildFile.xml
@@ -1,4 +1,4 @@
-
+
-
+
diff --git a/FWCore/Concurrency/test/BuildFile.xml b/FWCore/Concurrency/test/BuildFile.xml
index b0c37dd1e29cc..f067e4fd683a1 100644
--- a/FWCore/Concurrency/test/BuildFile.xml
+++ b/FWCore/Concurrency/test/BuildFile.xml
@@ -1,17 +1,20 @@
-
-
-
+
+
+
+
-
+
+
-
+
-
-
-
+
+
+
+
diff --git a/FWCore/FWLite/BuildFile.xml b/FWCore/FWLite/BuildFile.xml
index 0fdb99bdc4697..461f124c9d1a0 100644
--- a/FWCore/FWLite/BuildFile.xml
+++ b/FWCore/FWLite/BuildFile.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/FWCore/FWLite/bin/BuildFile.xml b/FWCore/FWLite/bin/BuildFile.xml
index 885413bba101c..60df216a5efcf 100644
--- a/FWCore/FWLite/bin/BuildFile.xml
+++ b/FWCore/FWLite/bin/BuildFile.xml
@@ -1,13 +1,13 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/FWCore/FWLite/test/BuildFile.xml b/FWCore/FWLite/test/BuildFile.xml
index f24f21f65780c..88c080a955dc0 100644
--- a/FWCore/FWLite/test/BuildFile.xml
+++ b/FWCore/FWLite/test/BuildFile.xml
@@ -1,11 +1,12 @@
-
+
-
-
-
+
+
+
-
-
-
+
+
+
+
diff --git a/FWCore/Framework/BuildFile.xml b/FWCore/Framework/BuildFile.xml
index 7693ab188e1b5..e3d2db1663de0 100644
--- a/FWCore/Framework/BuildFile.xml
+++ b/FWCore/Framework/BuildFile.xml
@@ -1,17 +1,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/FWCore/Framework/bin/BuildFile.xml b/FWCore/Framework/bin/BuildFile.xml
index f4550bcb0cd17..a76c1832b30dc 100644
--- a/FWCore/Framework/bin/BuildFile.xml
+++ b/FWCore/Framework/bin/BuildFile.xml
@@ -1,88 +1,93 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/FWCore/Framework/test/BuildFile.xml b/FWCore/Framework/test/BuildFile.xml
index 6b989b9d429e7..cabb8cf4bfdaf 100644
--- a/FWCore/Framework/test/BuildFile.xml
+++ b/FWCore/Framework/test/BuildFile.xml
@@ -1,332 +1,391 @@
-
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
-
+
+
+
+
-
-
-
+
+
+
+
+
-
+
+
diff --git a/FWCore/Integration/BuildFile.xml b/FWCore/Integration/BuildFile.xml
index da9d4b35a2234..0ae9ad9bd2380 100644
--- a/FWCore/Integration/BuildFile.xml
+++ b/FWCore/Integration/BuildFile.xml
@@ -1,5 +1,5 @@
-
-
+
+
-
+
diff --git a/FWCore/Integration/bin/BuildFile.xml b/FWCore/Integration/bin/BuildFile.xml
index a57936ed50e6f..c35da7efc0712 100644
--- a/FWCore/Integration/bin/BuildFile.xml
+++ b/FWCore/Integration/bin/BuildFile.xml
@@ -1,15 +1,15 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/FWCore/Integration/test/BuildFile.xml b/FWCore/Integration/test/BuildFile.xml
index 1bb975459966d..726c4c63bb3f7 100644
--- a/FWCore/Integration/test/BuildFile.xml
+++ b/FWCore/Integration/test/BuildFile.xml
@@ -1,359 +1,431 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FWCore/MessageLogger/BuildFile.xml b/FWCore/MessageLogger/BuildFile.xml
index 2db3c2bc0daeb..791d9d487d11d 100644
--- a/FWCore/MessageLogger/BuildFile.xml
+++ b/FWCore/MessageLogger/BuildFile.xml
@@ -1,8 +1,8 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/FWCore/MessageService/BuildFile.xml b/FWCore/MessageService/BuildFile.xml
index 1cee76bd35c2d..7948013f64a0b 100644
--- a/FWCore/MessageService/BuildFile.xml
+++ b/FWCore/MessageService/BuildFile.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/FWCore/MessageService/bin/BuildFile.xml b/FWCore/MessageService/bin/BuildFile.xml
index e3a0ab9afa57d..b103b188d9548 100644
--- a/FWCore/MessageService/bin/BuildFile.xml
+++ b/FWCore/MessageService/bin/BuildFile.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/FWCore/MessageService/plugins/BuildFile.xml b/FWCore/MessageService/plugins/BuildFile.xml
index a5a0d7a4ddf60..098d7cf5372f8 100644
--- a/FWCore/MessageService/plugins/BuildFile.xml
+++ b/FWCore/MessageService/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-
-
-
+
+
+
diff --git a/FWCore/MessageService/test/BuildFile.xml b/FWCore/MessageService/test/BuildFile.xml
index 7a8d3aea68791..8f51701a188f4 100644
--- a/FWCore/MessageService/test/BuildFile.xml
+++ b/FWCore/MessageService/test/BuildFile.xml
@@ -1,218 +1,264 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
-
+
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/FWCore/Modules/BuildFile.xml b/FWCore/Modules/BuildFile.xml
index 0471a7dab8715..341123e945d44 100644
--- a/FWCore/Modules/BuildFile.xml
+++ b/FWCore/Modules/BuildFile.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/FWCore/Modules/test/BuildFile.xml b/FWCore/Modules/test/BuildFile.xml
index 08239b792afdd..6e3bb9d8d4f2e 100644
--- a/FWCore/Modules/test/BuildFile.xml
+++ b/FWCore/Modules/test/BuildFile.xml
@@ -1,11 +1,13 @@
-
-
-
+
+
+
+
+
diff --git a/FWCore/ParameterSet/BuildFile.xml b/FWCore/ParameterSet/BuildFile.xml
index df4b72673c907..160e1f45f11c5 100644
--- a/FWCore/ParameterSet/BuildFile.xml
+++ b/FWCore/ParameterSet/BuildFile.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/FWCore/ParameterSet/bin/BuildFile.xml b/FWCore/ParameterSet/bin/BuildFile.xml
index 3ef090a7b0851..29c2aada5ce61 100644
--- a/FWCore/ParameterSet/bin/BuildFile.xml
+++ b/FWCore/ParameterSet/bin/BuildFile.xml
@@ -1,15 +1,16 @@
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
diff --git a/FWCore/ParameterSet/test/BuildFile.xml b/FWCore/ParameterSet/test/BuildFile.xml
index 43bc476da524c..b57f2be9ae082 100644
--- a/FWCore/ParameterSet/test/BuildFile.xml
+++ b/FWCore/ParameterSet/test/BuildFile.xml
@@ -1,20 +1,22 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
-
-
+
+
-
diff --git a/FWCore/ParameterSetReader/BuildFile.xml b/FWCore/ParameterSetReader/BuildFile.xml
index 936e14dddbf5d..965c615c3c426 100644
--- a/FWCore/ParameterSetReader/BuildFile.xml
+++ b/FWCore/ParameterSetReader/BuildFile.xml
@@ -1,6 +1,6 @@
-
-
+
+
-
-
+
+
diff --git a/FWCore/ParameterSetReader/bin/BuildFile.xml b/FWCore/ParameterSetReader/bin/BuildFile.xml
index 18d343f77427c..e0b7fa093679b 100644
--- a/FWCore/ParameterSetReader/bin/BuildFile.xml
+++ b/FWCore/ParameterSetReader/bin/BuildFile.xml
@@ -1,7 +1,8 @@
-
-
-
-
+
+
+
+
-
+
+
diff --git a/FWCore/PluginManager/BuildFile.xml b/FWCore/PluginManager/BuildFile.xml
index b3443b7725ed5..3ee2710593a1e 100644
--- a/FWCore/PluginManager/BuildFile.xml
+++ b/FWCore/PluginManager/BuildFile.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/FWCore/PluginManager/bin/BuildFile.xml b/FWCore/PluginManager/bin/BuildFile.xml
index 280eceb020198..cc14151056953 100644
--- a/FWCore/PluginManager/bin/BuildFile.xml
+++ b/FWCore/PluginManager/bin/BuildFile.xml
@@ -1,13 +1,14 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
diff --git a/FWCore/PluginManager/test/BuildFile.xml b/FWCore/PluginManager/test/BuildFile.xml
index 7777a90578821..cc05ee788b7f8 100644
--- a/FWCore/PluginManager/test/BuildFile.xml
+++ b/FWCore/PluginManager/test/BuildFile.xml
@@ -1,29 +1,34 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+
-
-
-
-
+
+
+
+
+
diff --git a/FWCore/PrescaleService/BuildFile.xml b/FWCore/PrescaleService/BuildFile.xml
index 11af1e0ddae8b..cbfcf241d4c98 100644
--- a/FWCore/PrescaleService/BuildFile.xml
+++ b/FWCore/PrescaleService/BuildFile.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/FWCore/PrescaleService/plugins/BuildFile.xml b/FWCore/PrescaleService/plugins/BuildFile.xml
index 5cefa38073619..46a1e08bfa1f3 100644
--- a/FWCore/PrescaleService/plugins/BuildFile.xml
+++ b/FWCore/PrescaleService/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
-
-
-
-
+
+
+
+
diff --git a/FWCore/PyDevParameterSet/BuildFile.xml b/FWCore/PyDevParameterSet/BuildFile.xml
index d5c452937bc5a..3caee8aedb0c6 100644
--- a/FWCore/PyDevParameterSet/BuildFile.xml
+++ b/FWCore/PyDevParameterSet/BuildFile.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/FWCore/PyDevParameterSet/test/BuildFile.xml b/FWCore/PyDevParameterSet/test/BuildFile.xml
index 2f4a372c93308..6d2248d4e6fce 100644
--- a/FWCore/PyDevParameterSet/test/BuildFile.xml
+++ b/FWCore/PyDevParameterSet/test/BuildFile.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/FWCore/PythonFramework/BuildFile.xml b/FWCore/PythonFramework/BuildFile.xml
index 2d4322a7f6edd..363852df4932c 100644
--- a/FWCore/PythonFramework/BuildFile.xml
+++ b/FWCore/PythonFramework/BuildFile.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/FWCore/PythonFramework/test/BuildFile.xml b/FWCore/PythonFramework/test/BuildFile.xml
index 522ceec1ebf7f..289c8e7fc3715 100644
--- a/FWCore/PythonFramework/test/BuildFile.xml
+++ b/FWCore/PythonFramework/test/BuildFile.xml
@@ -1,12 +1,12 @@
-
+
-
-
-
-
+
+
+
+
+
-
+
-
diff --git a/FWCore/PythonParameterSet/BuildFile.xml b/FWCore/PythonParameterSet/BuildFile.xml
index 883d5efcb1b41..34d6a8ae8859a 100644
--- a/FWCore/PythonParameterSet/BuildFile.xml
+++ b/FWCore/PythonParameterSet/BuildFile.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/FWCore/PythonParameterSet/test/BuildFile.xml b/FWCore/PythonParameterSet/test/BuildFile.xml
index 6f434ec3733ec..6831316786cd0 100644
--- a/FWCore/PythonParameterSet/test/BuildFile.xml
+++ b/FWCore/PythonParameterSet/test/BuildFile.xml
@@ -1,7 +1,7 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/FWCore/ROOTTests/test/BuildFile.xml b/FWCore/ROOTTests/test/BuildFile.xml
index c88de7345120b..d33150309e609 100644
--- a/FWCore/ROOTTests/test/BuildFile.xml
+++ b/FWCore/ROOTTests/test/BuildFile.xml
@@ -1,16 +1,20 @@
-
+
+
+
+
+
diff --git a/FWCore/Reflection/BuildFile.xml b/FWCore/Reflection/BuildFile.xml
index 4d6be1d8810ff..e2c435874d085 100644
--- a/FWCore/Reflection/BuildFile.xml
+++ b/FWCore/Reflection/BuildFile.xml
@@ -1,5 +1,5 @@
-
-
+
+
-
+
diff --git a/FWCore/SOA/test/BuildFile.xml b/FWCore/SOA/test/BuildFile.xml
index 513fb2849f962..3028534c6975a 100644
--- a/FWCore/SOA/test/BuildFile.xml
+++ b/FWCore/SOA/test/BuildFile.xml
@@ -1,4 +1,3 @@
-
-
+
+
-
diff --git a/FWCore/ServiceRegistry/BuildFile.xml b/FWCore/ServiceRegistry/BuildFile.xml
index 26e3a9a2b5cb2..79ef410843e56 100644
--- a/FWCore/ServiceRegistry/BuildFile.xml
+++ b/FWCore/ServiceRegistry/BuildFile.xml
@@ -1,7 +1,7 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/FWCore/ServiceRegistry/test/BuildFile.xml b/FWCore/ServiceRegistry/test/BuildFile.xml
index bd9fa1abb2420..e7fe5cc64c148 100644
--- a/FWCore/ServiceRegistry/test/BuildFile.xml
+++ b/FWCore/ServiceRegistry/test/BuildFile.xml
@@ -1,21 +1,24 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
diff --git a/FWCore/Services/BuildFile.xml b/FWCore/Services/BuildFile.xml
index 94d483339c02e..79e9410ca706d 100644
--- a/FWCore/Services/BuildFile.xml
+++ b/FWCore/Services/BuildFile.xml
@@ -1,19 +1,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/FWCore/Services/bin/BuildFile.xml b/FWCore/Services/bin/BuildFile.xml
index ee6e06f7f5463..b8fa544c6188c 100644
--- a/FWCore/Services/bin/BuildFile.xml
+++ b/FWCore/Services/bin/BuildFile.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/FWCore/Services/plugins/BuildFile.xml b/FWCore/Services/plugins/BuildFile.xml
index 50a9f5201ae58..86a8c66107c5a 100644
--- a/FWCore/Services/plugins/BuildFile.xml
+++ b/FWCore/Services/plugins/BuildFile.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/FWCore/Services/test/BuildFile.xml b/FWCore/Services/test/BuildFile.xml
index 50c687398ea54..a480312301c36 100644
--- a/FWCore/Services/test/BuildFile.xml
+++ b/FWCore/Services/test/BuildFile.xml
@@ -1,19 +1,22 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
-
+
+
diff --git a/FWCore/SharedMemory/BuildFile.xml b/FWCore/SharedMemory/BuildFile.xml
index e925201bc2203..b81e2600bec9f 100644
--- a/FWCore/SharedMemory/BuildFile.xml
+++ b/FWCore/SharedMemory/BuildFile.xml
@@ -1,5 +1,5 @@
-
-
+
+
-
+
diff --git a/FWCore/SharedMemory/test/BuildFile.xml b/FWCore/SharedMemory/test/BuildFile.xml
index dc3dac5b2a3a6..540498c546473 100644
--- a/FWCore/SharedMemory/test/BuildFile.xml
+++ b/FWCore/SharedMemory/test/BuildFile.xml
@@ -1,8 +1,9 @@
-
-
+
+
+
@@ -12,6 +13,7 @@
+
-
+
diff --git a/FWCore/Skeletons/scripts/mkTemplates/DQMEDAnalyzer/BuildFile.xml b/FWCore/Skeletons/scripts/mkTemplates/DQMEDAnalyzer/BuildFile.xml
index 61638cb0545e6..64b9c7f0aa594 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/DQMEDAnalyzer/BuildFile.xml
+++ b/FWCore/Skeletons/scripts/mkTemplates/DQMEDAnalyzer/BuildFile.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/FWCore/Skeletons/scripts/mkTemplates/DataPkg/BuildFile.xml b/FWCore/Skeletons/scripts/mkTemplates/DataPkg/BuildFile.xml
index 8a94022902ae6..7c537d9ebb995 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/DataPkg/BuildFile.xml
+++ b/FWCore/Skeletons/scripts/mkTemplates/DataPkg/BuildFile.xml
@@ -1,5 +1,4 @@
-
diff --git a/FWCore/Skeletons/scripts/mkTemplates/EDLooper/BuildFile.xml b/FWCore/Skeletons/scripts/mkTemplates/EDLooper/BuildFile.xml
index e18030de98b84..0d1418b95a8f0 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/EDLooper/BuildFile.xml
+++ b/FWCore/Skeletons/scripts/mkTemplates/EDLooper/BuildFile.xml
@@ -3,5 +3,5 @@
-
+
diff --git a/FWCore/Skeletons/scripts/mkTemplates/ESProducer/BuildFile.xml b/FWCore/Skeletons/scripts/mkTemplates/ESProducer/BuildFile.xml
index e18030de98b84..0d1418b95a8f0 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/ESProducer/BuildFile.xml
+++ b/FWCore/Skeletons/scripts/mkTemplates/ESProducer/BuildFile.xml
@@ -3,5 +3,5 @@
-
+
diff --git a/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/BuildFile.xml b/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/BuildFile.xml
index b2db41ba6c485..b26b9f96a085f 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/BuildFile.xml
+++ b/FWCore/Skeletons/scripts/mkTemplates/EventHypothesis/BuildFile.xml
@@ -1,7 +1,5 @@
-
-
diff --git a/FWCore/Skeletons/scripts/mkTemplates/TSelector/BuildFile.xml b/FWCore/Skeletons/scripts/mkTemplates/TSelector/BuildFile.xml
index ecc0e964bd5fa..cd25e00d6aea1 100644
--- a/FWCore/Skeletons/scripts/mkTemplates/TSelector/BuildFile.xml
+++ b/FWCore/Skeletons/scripts/mkTemplates/TSelector/BuildFile.xml
@@ -1,4 +1,4 @@
-
+
diff --git a/FWCore/Sources/BuildFile.xml b/FWCore/Sources/BuildFile.xml
index 6f0ca84e0b136..9e273e656da0e 100644
--- a/FWCore/Sources/BuildFile.xml
+++ b/FWCore/Sources/BuildFile.xml
@@ -1,12 +1,12 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
diff --git a/FWCore/TFWLiteSelector/BuildFile.xml b/FWCore/TFWLiteSelector/BuildFile.xml
index 49744f59f6192..4d44f61a0987a 100644
--- a/FWCore/TFWLiteSelector/BuildFile.xml
+++ b/FWCore/TFWLiteSelector/BuildFile.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
diff --git a/FWCore/TFWLiteSelector/test/BuildFile.xml b/FWCore/TFWLiteSelector/test/BuildFile.xml
index 3e51a36b5064f..57ac9fcd04362 100644
--- a/FWCore/TFWLiteSelector/test/BuildFile.xml
+++ b/FWCore/TFWLiteSelector/test/BuildFile.xml
@@ -1,6 +1,6 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/FWCore/TFWLiteSelectorTest/BuildFile.xml b/FWCore/TFWLiteSelectorTest/BuildFile.xml
index c52525c0e8050..88df63caa9b2f 100644
--- a/FWCore/TFWLiteSelectorTest/BuildFile.xml
+++ b/FWCore/TFWLiteSelectorTest/BuildFile.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
-
+
diff --git a/FWCore/TestProcessor/BuildFile.xml b/FWCore/TestProcessor/BuildFile.xml
index 7e9fbf8e3ba7b..1dac13262ab6d 100644
--- a/FWCore/TestProcessor/BuildFile.xml
+++ b/FWCore/TestProcessor/BuildFile.xml
@@ -1,6 +1,6 @@
-
-
-
+
+
+
-
+
diff --git a/FWCore/TestProcessor/test/BuildFile.xml b/FWCore/TestProcessor/test/BuildFile.xml
index 5d8725e97c070..77242bca184f1 100644
--- a/FWCore/TestProcessor/test/BuildFile.xml
+++ b/FWCore/TestProcessor/test/BuildFile.xml
@@ -1,8 +1,8 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/FWCore/Utilities/BuildFile.xml b/FWCore/Utilities/BuildFile.xml
index 0d5ce7eff463c..d06090875bdb4 100644
--- a/FWCore/Utilities/BuildFile.xml
+++ b/FWCore/Utilities/BuildFile.xml
@@ -1,9 +1,9 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/FWCore/Utilities/bin/BuildFile.xml b/FWCore/Utilities/bin/BuildFile.xml
index 717bb7a6ce409..5888d3b563843 100644
--- a/FWCore/Utilities/bin/BuildFile.xml
+++ b/FWCore/Utilities/bin/BuildFile.xml
@@ -1,6 +1,7 @@
-
-
+
+
-
-
+
+
+
diff --git a/FWCore/Utilities/test/BuildFile.xml b/FWCore/Utilities/test/BuildFile.xml
index b455fd0903a6f..d1af19399ed8e 100644
--- a/FWCore/Utilities/test/BuildFile.xml
+++ b/FWCore/Utilities/test/BuildFile.xml
@@ -1,50 +1,62 @@
-
-
-
+
+
+
-
+
+
-
-
+
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
+
+
-
-
+
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
-
+
+
-
+
-
-
+
+
-
+
diff --git a/FWCore/Version/BuildFile.xml b/FWCore/Version/BuildFile.xml
index 558bb531b7989..a1fdbaede7c39 100644
--- a/FWCore/Version/BuildFile.xml
+++ b/FWCore/Version/BuildFile.xml
@@ -1,3 +1,3 @@
-
+