[gtksourceview/gnome-3-24] Visual Studio builds: Refactor gtksourceversion.h generation



commit 07e0b8fca175e4b211f8030d46353ff74b64a6bf
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Mar 6 16:53:28 2017 +0800

    Visual Studio builds: Refactor gtksourceversion.h generation
    
    Use a utility Python script to generate gtksourceversion.h, which is
    cleaner and does it in one shot.

 win32/Makefile.am                        |    1 +
 win32/gtksource_version_h.py             |   29 +++++++++++++++++++++++++++++
 win32/vs10/gtksourceview-gen-srcs.props  |    6 +-----
 win32/vs9/gtksourceview-gen-srcs.vsprops |    7 +------
 4 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 46dfb1e..0ed6123 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -26,6 +26,7 @@ endif
 
 EXTRA_DIST = \
        replace.py      \
+       gtksource_version_h.py  \
        detectenv-msvc.mak      \
        gtksourceview-introspection-msvc.mak    \
        introspection-msvc.mak  \
diff --git a/win32/gtksource_version_h.py b/win32/gtksource_version_h.py
new file mode 100644
index 0000000..e3bcce8
--- /dev/null
+++ b/win32/gtksource_version_h.py
@@ -0,0 +1,29 @@
+#!/usr/bin/python
+#
+# Simple utility script to generate gtksourceversion.h
+
+import os
+import sys
+import argparse
+
+from replace import replace_multi
+
+def gen_version_h(argv):
+    top_srcdir = os.path.dirname(__file__) + "\\.."
+    parser = argparse.ArgumentParser(description='Generate gtksourceversion.h')
+    parser.add_argument('--version', help='Version of the package',
+                        required=True)
+    args = parser.parse_args()
+    version_info = args.version.split('.')
+
+    version_h_replace_items = {'@GTK_SOURCE_MAJOR_VERSION@': version_info[0],
+                               '@GTK_SOURCE_MINOR_VERSION@': version_info[1],
+                               '@GTK_SOURCE_MICRO_VERSION@': version_info[2]}
+
+    # Generate gtksourceversion.h
+    replace_multi(top_srcdir + '/gtksourceview/gtksourceversion.h.in',
+                  top_srcdir + '/gtksourceview/gtksourceversion.h',
+                  version_h_replace_items)
+
+if __name__ == '__main__':
+    sys.exit(gen_version_h(sys.argv))
\ No newline at end of file
diff --git a/win32/vs10/gtksourceview-gen-srcs.props b/win32/vs10/gtksourceview-gen-srcs.props
index 44a0804..4f023b8 100644
--- a/win32/vs10/gtksourceview-gen-srcs.props
+++ b/win32/vs10/gtksourceview-gen-srcs.props
@@ -10,11 +10,7 @@ CALL gen-enums.bat $(GlibEtcInstallRoot)
 cd $(SolutionDir)
     </GenerateEnums>
     <GenerateRsrcSrc>$(GlibEtcInstallRoot)\bin\glib-compile-resources 
--target=..\..\gtksourceview\gtksourceview-resources.c --generate-source --sourcedir=..\..\gtksourceview 
..\..\gtksourceview\gtksourceview.gresource.xml</GenerateRsrcSrc>
-    <GenGtksourceVersionH>$(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\gtksourceview\gtksourceversion.h.in --output=..\..\gtksourceview\gtksourceversion.h.tmp1 
--var=GTK_SOURCE_MAJOR_VERSION --outstring=3
-$(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\gtksourceview\gtksourceversion.h.tmp1 --output=..\..\gtksourceview\gtksourceversion.h.tmp2 
--var=GTK_SOURCE_MINOR_VERSION --outstring=23
-$(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\gtksourceview\gtksourceversion.h.tmp2 --output=..\..\gtksourceview\gtksourceversion.h 
--var=GTK_SOURCE_MICRO_VERSION --outstring=91
-del ..\..\gtksourceview\gtksourceversion.h.tmp1 ..\..\gtksourceview\gtksourceversion.h.tmp2
-    </GenGtksourceVersionH>
+    <GenGtksourceVersionH>$(PythonPath)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)</GenGtksourceVersionH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceviewgensrcsprops</_PropertySheetDisplayName>
diff --git a/win32/vs9/gtksourceview-gen-srcs.vsprops b/win32/vs9/gtksourceview-gen-srcs.vsprops
index c089edf..5a498b3 100644
--- a/win32/vs9/gtksourceview-gen-srcs.vsprops
+++ b/win32/vs9/gtksourceview-gen-srcs.vsprops
@@ -25,11 +25,6 @@ $(GlibEtcInstallRoot)\bin\glib-compile-resources --target=..\..\gtksourceview\gt
        />
        <UserMacro
                Name="GenGtksourceVersionH"
-               Value="
-$(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\gtksourceview\gtksourceversion.h.in --output=..\..\gtksourceview\gtksourceversion.h.tmp1 
--var=GTK_SOURCE_MAJOR_VERSION --outstring=$(GtkSourceviewMajorVersion)&#x0D;&#x0A;
-$(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\gtksourceview\gtksourceversion.h.tmp1 --output=..\..\gtksourceview\gtksourceversion.h.tmp2 
--var=GTK_SOURCE_MINOR_VERSION --outstring=$(GtkSourceviewMinorVersion)&#x0D;&#x0A;
-$(PythonPath)\python.exe ..\replace.py --action=replace-var 
--input=..\..\gtksourceview\gtksourceversion.h.tmp2 --output=..\..\gtksourceview\gtksourceversion.h 
--var=GTK_SOURCE_MICRO_VERSION --outstring=$(GtkSourceviewMicroVersion)&#x0D;&#x0A;
-del ..\..\gtksourceview\gtksourceversion.h.tmp1 ..\..\gtksourceview\gtksourceversion.h.tmp2&#x0D;&#x0A;
-                     "
+               Value="$(PythonPath)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)"
        />
 </VisualStudioPropertySheet>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]