diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-03-09 16:36:13 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2017-03-09 16:36:13 +0800 |
| commit | e7b0e744e2dd60585452c510563800012fae7828 (patch) | |
| tree | 91a53903401b7c26fe829c6e51d7b7ead6bbff72 | |
| parent | 71fcfce84e43afcf4f3fdd76cba154668bc67131 (diff) | |
| download | libsoup-e7b0e744e2dd60585452c510563800012fae7828.tar.gz | |
Visual Studio builds: Refactor soup-version.h generation
Use a simple utility script to generate soup-version.h in one shot
instead of 3 separate shots.
| -rw-r--r-- | win32/Makefile.am | 1 | ||||
| -rw-r--r-- | win32/soup_version_h.py | 29 | ||||
| -rw-r--r-- | win32/vs10/soup-gen-srcs.props | 7 | ||||
| -rw-r--r-- | win32/vs9/soup-gen-srcs.vsprops | 7 |
4 files changed, 32 insertions, 12 deletions
diff --git a/win32/Makefile.am b/win32/Makefile.am index 00986d2a..f13ab339 100644 --- a/win32/Makefile.am +++ b/win32/Makefile.am @@ -26,6 +26,7 @@ endif EXTRA_DIST = \ replace.py \ + soup_version_h.py \ detectenv-msvc.mak \ introspection-msvc.mak \ soup-introspection-msvc.mak \ diff --git a/win32/soup_version_h.py b/win32/soup_version_h.py new file mode 100644 index 00000000..909db230 --- /dev/null +++ b/win32/soup_version_h.py @@ -0,0 +1,29 @@ +#!/usr/bin/python +# +# Simple utility script to generate soup-version.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 soup-version.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 = {'@SOUP_MAJOR_VERSION@': version_info[0], + '@SOUP_MINOR_VERSION@': version_info[1], + '@SOUP_MICRO_VERSION@': version_info[2]} + + # Generate soup-version.h + replace_multi(top_srcdir + '/libsoup/soup-version.h.in', + top_srcdir + '/libsoup/soup-version.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/soup-gen-srcs.props b/win32/vs10/soup-gen-srcs.props index 4bd5dc17..760825c8 100644 --- a/win32/vs10/soup-gen-srcs.props +++ b/win32/vs10/soup-gen-srcs.props @@ -5,12 +5,7 @@ </ImportGroup> <PropertyGroup Label="UserMacros"> <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH> - <GenSoupVersionH> -$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.in --output=..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=$(SoupMajorVersion) -$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp1 --output=..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=$(SoupMinorVersion) -$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp2 --output=..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=$(SoupMicroVersion) -del ..\..\libsoup\soup-version.h.tmp1 ..\..\libsoup\soup-version.h.tmp2 - </GenSoupVersionH> + <GenSoupVersionH>$(PythonPath)\python.exe ..\soup_version_h.py --version=$(SoupMajorVersion).$(SoupMinorVersion).$(SoupMicroVersion)</GenSoupVersionH> <GenTldDataInc>$(PythonPath)\python.exe ..\..\libsoup\tld-parser.py ..\..\data\effective_tld_names.dat ..\..\libsoup\tld_data.inc</GenTldDataInc> </PropertyGroup> <PropertyGroup> diff --git a/win32/vs9/soup-gen-srcs.vsprops b/win32/vs9/soup-gen-srcs.vsprops index c947b5f4..d897efa8 100644 --- a/win32/vs9/soup-gen-srcs.vsprops +++ b/win32/vs9/soup-gen-srcs.vsprops @@ -11,12 +11,7 @@ /> <UserMacro Name="GenSoupVersionH" - Value=" -$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.in --output=..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=$(SoupMajorVersion)
 -$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp1 --output=..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=$(SoupMinorVersion)
 -$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp2 --output=..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=$(SoupMicroVersion)
 -del ..\..\libsoup\soup-version.h.tmp1 ..\..\libsoup\soup-version.h.tmp2
 - " + Value="$(PythonPath)\python.exe ..\soup_version_h.py --version=$(SoupMajorVersion).$(SoupMinorVersion).$(SoupMicroVersion)" /> <UserMacro Name="GenTldDataInc" |