Restructure package-specific preferences, add support for VR-only prefs

1 files changed, 12 insertions, 7 deletions

diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index aa8a80af7a2..3d6e191a731 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -169,19 +169,24 @@ def copy_windows_dependencies(binary_path, destination):
         shutil.copy(nspr4_path, destination)
 
 
-def change_prefs(resources_path, platform):
+def change_prefs(resources_path, platform, vr=False):
     print("Swapping prefs")
     prefs_path = path.join(resources_path, "prefs.json")
     package_prefs_path = path.join(resources_path, "package-prefs.json")
-    os_type = "os:{}".format(platform)
     with open(prefs_path) as prefs, open(package_prefs_path) as package_prefs:
         prefs = json.load(prefs)
+        pref_sets = []
         package_prefs = json.load(package_prefs)
-        for pref in package_prefs:
-            if os_type in pref:
-                prefs[pref.split(";")[1]] = package_prefs[pref]
-            if pref in prefs:
-                prefs[pref] = package_prefs[pref]
+        if "all" in package_prefs:
+            pref_sets += [package_prefs["all"]]
+        if vr and "vr" in package_prefs:
+            pref_sets += [package_prefs["vr"]]
+        if platform in package_prefs:
+            pref_sets += [package_prefs[platform]]
+        for pref_set in pref_sets:
+            for pref in pref_set:
+                if pref in prefs:
+                    prefs[pref] = pref_set[pref]
         with open(prefs_path, "w") as out:
             json.dump(prefs, out, sort_keys=True, indent=2)
     delete(package_prefs_path)