GNOME.org
 

[libsoup] Visual Studio builds: Record version numbers in property sheets

commit 72c37dc5abfd9dcae9764111c275632f35e109af
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Mar 9 16:14:04 2017 +0800

    Visual Studio builds: Record version numbers in property sheets
    
    Record the package version numbers in the property sheets in their own
    fields so that they can be more easily reused.
    
    We actually have them already in the parts of the command lines to
    generate soup-version.h, but we want to move one step forward to refactor
    how soup-version.h is generated on Visual Studio builds, as well as
    generate the .pc files for the package.

 configure.ac                                       |    4 ++--
 ...{soup-gen-srcs.props.in => soup-gen-srcs.props} |    6 +++---
 ...ion-paths.props => soup-version-paths.props.in} |   12 ++++++++++++
 ...p-gen-srcs.vsprops.in => soup-gen-srcs.vsprops} |    6 +++---
 ...paths.vsprops => soup-version-paths.vsprops.in} |   12 ++++++++++++
 5 files changed, 32 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0269e08..95e0254 100644
--- a/configure.ac
+++ b/configure.ac
@@ -432,9 +432,9 @@ AC_CONFIG_FILES([
        config.h.win32
        win32/Makefile
        win32/vs9/Makefile
-       win32/vs9/soup-gen-srcs.vsprops
+       win32/vs9/soup-version-paths.vsprops
        win32/vs10/Makefile
-       win32/vs10/soup-gen-srcs.props
+       win32/vs10/soup-version-paths.props
        win32/vs11/Makefile
        win32/vs12/Makefile
        win32/vs14/Makefile
diff --git a/win32/vs10/soup-gen-srcs.props.in b/win32/vs10/soup-gen-srcs.props
similarity index 87%
rename from win32/vs10/soup-gen-srcs.props.in
rename to win32/vs10/soup-gen-srcs.props
index 9361ad4..4bd5dc1 100644
--- a/win32/vs10/soup-gen-srcs.props.in
+++ b/win32/vs10/soup-gen-srcs.props
@@ -6,9 +6,9 @@
   <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=@SOUP_MAJOR_VERSION@
-$(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=@SOUP_MINOR_VERSION@
-$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp2 
--output=..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=@SOUP_MICRO_VERSION@
+$(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>
     <GenTldDataInc>$(PythonPath)\python.exe ..\..\libsoup\tld-parser.py ..\..\data\effective_tld_names.dat 
..\..\libsoup\tld_data.inc</GenTldDataInc>
diff --git a/win32/vs10/soup-version-paths.props b/win32/vs10/soup-version-paths.props.in
similarity index 81%
rename from win32/vs10/soup-version-paths.props
rename to win32/vs10/soup-version-paths.props.in
index 7f4ef5b..7b259ce 100644
--- a/win32/vs10/soup-version-paths.props
+++ b/win32/vs10/soup-version-paths.props.in
@@ -6,6 +6,9 @@
     <VSVer>10</VSVer>
     <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+    <SoupMajorVersion>@SOUP_MAJOR_VERSION@</SoupMajorVersion>
+    <SoupMinorVersion>@SOUP_MINOR_VERSION@</SoupMinorVersion>
+    <SoupMicroVersion>@SOUP_MICRO_VERSION@</SoupMicroVersion>
     <ApiVersion>2.4</ApiVersion>
     <SoupLibtoolCompatibleDllPrefix>lib</SoupLibtoolCompatibleDllPrefix>
     <SoupLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</SoupLibtoolCompatibleDllSuffix>
@@ -29,6 +32,15 @@
     <BuildMacro Include="CopyDir">
       <Value>$(CopyDir)</Value>
     </BuildMacro>
+    <BuildMacro Include="SoupMajorVersion">
+      <Value>$(SoupMajorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SoupMinorVersion">
+      <Value>$(SoupMinorVersion)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SoupMicroVersion">
+      <Value>$(SoupMicroVersion)</Value>
+    </BuildMacro>
     <BuildMacro Include="ApiVersion">
       <Value>$(ApiVersion)</Value>
     </BuildMacro>
diff --git a/win32/vs9/soup-gen-srcs.vsprops.in b/win32/vs9/soup-gen-srcs.vsprops
similarity index 79%
rename from win32/vs9/soup-gen-srcs.vsprops.in
rename to win32/vs9/soup-gen-srcs.vsprops
index 87518b6..c947b5f 100644
--- a/win32/vs9/soup-gen-srcs.vsprops.in
+++ b/win32/vs9/soup-gen-srcs.vsprops
@@ -12,9 +12,9 @@
        <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=@SOUP_MAJOR_VERSION@&#x0D;&#x0A;
-$(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=@SOUP_MINOR_VERSION@&#x0D;&#x0A;
-$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\libsoup\soup-version.h.tmp2 
--output=..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=@SOUP_MICRO_VERSION@&#x0D;&#x0A;
+$(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)&#x0D;&#x0A;
+$(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)&#x0D;&#x0A;
+$(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)&#x0D;&#x0A;
 del ..\..\libsoup\soup-version.h.tmp1 ..\..\libsoup\soup-version.h.tmp2&#x0D;&#x0A;
                      "
        />
diff --git a/win32/vs9/soup-version-paths.vsprops b/win32/vs9/soup-version-paths.vsprops.in
similarity index 82%
rename from win32/vs9/soup-version-paths.vsprops
rename to win32/vs9/soup-version-paths.vsprops.in
index 8f845a6..cde608e 100644
--- a/win32/vs9/soup-version-paths.vsprops
+++ b/win32/vs9/soup-version-paths.vsprops.in
@@ -17,6 +17,18 @@
                Value="$(GlibEtcInstallRoot)"
        />
        <UserMacro
+               Name="SoupMajorVersion"
+               Value="@SOUP_MAJOR_VERSION@"
+       />
+       <UserMacro
+               Name="SoupMinorVersion"
+               Value="@SOUP_MINOR_VERSION@"
+       />
+       <UserMacro
+               Name="SoupMicroVersion"
+               Value="@SOUP_MICRO_VERSION@"
+       />
+       <UserMacro
                Name="ApiVersion"
                Value="2.4"
        />
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]