Merge subtree 'rules' into rules-cc

6 files changed, 33 insertions, 0 deletions

diff --git a/rules/CC/foreign/cmake/EXPRESSIONS b/rules/CC/foreign/cmake/EXPRESSIONS
index a36725b..e0ceab2 100644
--- a/rules/CC/foreign/cmake/EXPRESSIONS
+++ b/rules/CC/foreign/cmake/EXPRESSIONS
@@ -24,6 +24,8 @@
     , "BUILD_POSITION_INDEPENDENT"
     , "defaults-transition"
     , "expand_exec"
+    , "TIMEOUT_SCALE"
+    , "FOREIGN_EXECUTION_PROPERTIES"
     , "resolve_symlinks"
     ]
   , "imports":
@@ -474,6 +476,8 @@
       , "env": {"type": "var", "name": "ENV"}
       , "timeout scaling":
         {"type": "var", "name": "TIMEOUT_SCALE", "default": 10.0}
+      , "execution properties":
+        {"type": "var", "name": "FOREIGN_EXECUTION_PROPERTIES"}
       }
     }
   }
diff --git a/rules/CC/foreign/cmake/RULES b/rules/CC/foreign/cmake/RULES
index b7fd406..917b4af 100644
--- a/rules/CC/foreign/cmake/RULES
+++ b/rules/CC/foreign/cmake/RULES
@@ -35,6 +35,7 @@
     , "AR"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
+    , "FOREIGN_EXECUTION_PROPERTIES"
     ]
   , "implicit":
     { "defaults": [["CC", "defaults"]]
@@ -153,6 +154,9 @@
       [ "The scaling of the timeout for the invocation of the foreign build."
       , "Defaults to 10."
       ]
+    , "FOREIGN_EXECUTION_PROPERTIES":
+      [ "A map with extra remote-execution properties to be added to the foreign build action."
+      ]
     }
   , "imports":
     { "stage_field": ["", "stage_singleton_field"]
@@ -340,6 +344,7 @@
     , "AR"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
+    , "FOREIGN_EXECUTION_PROPERTIES"
     ]
   , "implicit":
     { "defaults": [["CC", "defaults"]]
@@ -498,6 +503,9 @@
       [ "The scaling of the timeout for the invocation of the foreign build."
       , "Defaults to 10."
       ]
+    , "FOREIGN_EXECUTION_PROPERTIES":
+      [ "A map with extra remote-execution properties to be added to the foreign build action."
+      ]
     }
   , "imports":
     { "stage_field": ["", "stage_singleton_field"]
diff --git a/rules/CC/foreign/make/EXPRESSIONS b/rules/CC/foreign/make/EXPRESSIONS
index 68aa728..57b0a94 100644
--- a/rules/CC/foreign/make/EXPRESSIONS
+++ b/rules/CC/foreign/make/EXPRESSIONS
@@ -437,6 +437,8 @@
       , "env": {"type": "var", "name": "ENV"}
       , "timeout scaling":
         {"type": "var", "name": "TIMEOUT_SCALE", "default": 10.0}
+      , "execution properties":
+        {"type": "var", "name": "FOREIGN_EXECUTION_PROPERTIES"}
       }
     }
   }
diff --git a/rules/CC/foreign/make/RULES b/rules/CC/foreign/make/RULES
index cf67998..771a058 100644
--- a/rules/CC/foreign/make/RULES
+++ b/rules/CC/foreign/make/RULES
@@ -38,6 +38,7 @@
     , "PREFIX"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
+    , "FOREIGN_EXECUTION_PROPERTIES"
     ]
   , "implicit":
     { "defaults": [["CC", "defaults"]]
@@ -169,6 +170,9 @@
       [ "The scaling of the timeout for the invocation of the foreign build."
       , "Defaults to 10."
       ]
+    , "FOREIGN_EXECUTION_PROPERTIES":
+      [ "A map with extra remote-execution properties to be added to the foreign build action."
+      ]
     }
   , "imports":
     { "stage_field": ["", "stage_singleton_field"]
@@ -360,6 +364,7 @@
     , "PREFIX"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
+    , "FOREIGN_EXECUTION_PROPERTIES"
     ]
   , "implicit":
     { "defaults": [["CC", "defaults"]]
@@ -528,6 +533,9 @@
       [ "The scaling of the timeout for the invocation of the foreign build."
       , "Defaults to 10."
       ]
+    , "FOREIGN_EXECUTION_PROPERTIES":
+      [ "A map with extra remote-execution properties to be added to the foreign build action."
+      ]
     }
   , "imports":
     { "stage_field": ["", "stage_singleton_field"]
diff --git a/rules/CC/foreign/shell/EXPRESSIONS b/rules/CC/foreign/shell/EXPRESSIONS
index a37d315..7ca2741 100644
--- a/rules/CC/foreign/shell/EXPRESSIONS
+++ b/rules/CC/foreign/shell/EXPRESSIONS
@@ -18,6 +18,7 @@
     , "PREFIX"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
+    , "FOREIGN_EXECUTION_PROPERTIES"
     , "resolve_symlinks"
     ]
   , "imports":
@@ -351,6 +352,8 @@
           , "env": {"type": "var", "name": "ENV"}
           , "timeout scaling":
             {"type": "var", "name": "TIMEOUT_SCALE", "default": 10.0}
+          , "execution properties":
+            {"type": "var", "name": "FOREIGN_EXECUTION_PROPERTIES"}
           }
         ]
       ]
diff --git a/rules/CC/foreign/shell/RULES b/rules/CC/foreign/shell/RULES
index 255a715..182e46a 100644
--- a/rules/CC/foreign/shell/RULES
+++ b/rules/CC/foreign/shell/RULES
@@ -25,6 +25,7 @@
     , "PREFIX"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
+    , "FOREIGN_EXECUTION_PROPERTIES"
     ]
   , "implicit":
     { "defaults": [["CC", "defaults"]]
@@ -113,6 +114,9 @@
       [ "The scaling of the timeout for the invocation of the foreign build."
       , "Defaults to 10."
       ]
+    , "FOREIGN_EXECUTION_PROPERTIES":
+      [ "A map with extra remote-execution properties to be added to the foreign build action."
+      ]
     }
   , "imports":
     { "artifacts": ["", "field_artifacts"]
@@ -254,6 +258,7 @@
     , "PREFIX"
     , "BUILD_POSITION_INDEPENDENT"
     , "TIMEOUT_SCALE"
+    , "FOREIGN_EXECUTION_PROPERTIES"
     ]
   , "implicit":
     { "defaults": [["CC", "defaults"]]
@@ -395,6 +400,9 @@
       [ "The scaling of the timeout for the invocation of the foreign build."
       , "Defaults to 10."
       ]
+    , "FOREIGN_EXECUTION_PROPERTIES":
+      [ "A map with extra remote-execution properties to be added to the foreign build action."
+      ]
     }
   , "imports":
     { "artifacts": ["", "field_artifacts"]