[gtksourceview] Visual Studio builds: Refactor gtksourceversion.h generation
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Visual Studio builds: Refactor gtksourceversion.h generation
- Date: Wed, 8 Mar 2017 10:50:17 +0000 (UTC)
commit 9710f603dbe9d6bd33907a1754d2c9f3b763be25
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/gtksourceview4-gen-srcs.props | 6 +-----
win32/vs9/gtksourceview4-gen-srcs.vsprops | 7 +------
4 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 93cf7a9..2d9abb2 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 \
gtksourceview4-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/gtksourceview4-gen-srcs.props b/win32/vs10/gtksourceview4-gen-srcs.props
index 96ea818..1cb557e 100644
--- a/win32/vs10/gtksourceview4-gen-srcs.props
+++ b/win32/vs10/gtksourceview4-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=$(GtkSourceviewMajorVersion)
-$(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)
-$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\gtksourceview\gtksourceversion.h.tmp2 --output=..\..\gtksourceview\gtksourceversion.h
--var=GTK_SOURCE_MICRO_VERSION --outstring=$(GtkSourceviewMicroVersion)
-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>gtksourceview4gensrcsprops</_PropertySheetDisplayName>
diff --git a/win32/vs9/gtksourceview4-gen-srcs.vsprops b/win32/vs9/gtksourceview4-gen-srcs.vsprops
index 07072df..32aac28 100644
--- a/win32/vs9/gtksourceview4-gen-srcs.vsprops
+++ b/win32/vs9/gtksourceview4-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)

-$(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)

-$(PythonPath)\python.exe ..\replace.py --action=replace-var
--input=..\..\gtksourceview\gtksourceversion.h.tmp2 --output=..\..\gtksourceview\gtksourceversion.h
--var=GTK_SOURCE_MICRO_VERSION --outstring=$(GtkSourceviewMicroVersion)

-del ..\..\gtksourceview\gtksourceversion.h.tmp1 ..\..\gtksourceview\gtksourceversion.h.tmp2

- "
+ 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]