MSVC builds: Enhance and simplify build-related scripts

This updates the replace.py script to support replacing multiple items in
a file from GLib's build/win32, which allows us to simplify the script
that is used to create cairo-1.0.gir for Visual Studio builds.

1 files changed, 5 insertions, 10 deletions

diff --git a/build/win32/gen-win32-cairo-gir.py b/build/win32/gen-win32-cairo-gir.py
index 464d9849..09a5a506 100644
--- a/build/win32/gen-win32-cairo-gir.py
+++ b/build/win32/gen-win32-cairo-gir.py
@@ -29,16 +29,11 @@ def main(argv):
     preset_gir_path = os.path.join(srcroot, 'gir')
 
     # Set up variables in cairo-1.0.gir.in to produce cairo-1.0.gir
-    replace.replace(os.path.join(preset_gir_path, 'cairo-1.0.gir.in'),
-                    'cairo-1.0.gir.tmp',
-                    '%CAIRO_GIR_PACKAGE%',
-                    'cairo-gobject')
-
-    replace.replace('cairo-1.0.gir.tmp',
-                    'cairo-1.0.gir',
-                    '%CAIRO_SHARED_LIBRARY%',
-                    args.dllname)
-    os.unlink('cairo-1.0.gir.tmp')
+    cairo_replace_items = {'%CAIRO_GIR_PACKAGE%': 'cairo-gobject',
+                           '%CAIRO_SHARED_LIBRARY%': args.dllname}
+    replace.replace_multi(os.path.join(preset_gir_path, 'cairo-1.0.gir.in'),
+                          'cairo-1.0.gir',
+                          cairo_replace_items)
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv))