From 72c37dc5abfd9dcae9764111c275632f35e109af Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Thu, 9 Mar 2017 16:14:04 +0800
Subject: 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 +-
 win32/vs10/soup-gen-srcs.props          | 31 +++++++++++++++
 win32/vs10/soup-gen-srcs.props.in       | 31 ---------------
 win32/vs10/soup-version-paths.props     | 57 ---------------------------
 win32/vs10/soup-version-paths.props.in  | 69 +++++++++++++++++++++++++++++++++
 win32/vs9/soup-gen-srcs.vsprops         | 25 ++++++++++++
 win32/vs9/soup-gen-srcs.vsprops.in      | 25 ------------
 win32/vs9/soup-version-paths.vsprops    | 53 -------------------------
 win32/vs9/soup-version-paths.vsprops.in | 65 +++++++++++++++++++++++++++++++
 9 files changed, 192 insertions(+), 168 deletions(-)
 create mode 100644 win32/vs10/soup-gen-srcs.props
 delete mode 100644 win32/vs10/soup-gen-srcs.props.in
 delete mode 100644 win32/vs10/soup-version-paths.props
 create mode 100644 win32/vs10/soup-version-paths.props.in
 create mode 100644 win32/vs9/soup-gen-srcs.vsprops
 delete mode 100644 win32/vs9/soup-gen-srcs.vsprops.in
 delete mode 100644 win32/vs9/soup-version-paths.vsprops
 create mode 100644 win32/vs9/soup-version-paths.vsprops.in

diff --git a/configure.ac b/configure.ac
index 0269e086..95e02544 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 b/win32/vs10/soup-gen-srcs.props
new file mode 100644
index 00000000..4bd5dc17
--- /dev/null
+++ b/win32/vs10/soup-gen-srcs.props
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+    <Import Project="soup-build-defines.props" />
+  </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>
+    <GenTldDataInc>$(PythonPath)\python.exe ..\..\libsoup\tld-parser.py ..\..\data\effective_tld_names.dat ..\..\libsoup\tld_data.inc</GenTldDataInc>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>soupgensrcsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="CopyConfigH">
+      <Value>$(CopyConfigH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenSoupVersionH">
+      <Value>$(GenSoupVersionH)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GenTldDataInc">
+      <Value>$(GenTldDataInc)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/win32/vs10/soup-gen-srcs.props.in b/win32/vs10/soup-gen-srcs.props.in
deleted file mode 100644
index 9361ad4b..00000000
--- a/win32/vs10/soup-gen-srcs.props.in
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="soup-build-defines.props" />
-  </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=@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@
-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>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>soupgensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="CopyConfigH">
-      <Value>$(CopyConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenSoupVersionH">
-      <Value>$(GenSoupVersionH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenTldDataInc">
-      <Value>$(GenTldDataInc)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/soup-version-paths.props b/win32/vs10/soup-version-paths.props
deleted file mode 100644
index 7f4ef5b0..00000000
--- a/win32/vs10/soup-version-paths.props
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <VSVer>10</VSVer>
-    <GlibEtcInstallRoot>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <ApiVersion>2.4</ApiVersion>
-    <SoupLibtoolCompatibleDllPrefix>lib</SoupLibtoolCompatibleDllPrefix>
-    <SoupLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</SoupLibtoolCompatibleDllSuffix>
-    <SoupSeparateVSDllPrefix />
-    <SoupSeparateVSDllSuffix>-$(ApiVersion)-vs$(VSVer)</SoupSeparateVSDllSuffix>
-    <SoupDllPrefix>$(SoupSeparateVSDllPrefix)</SoupDllPrefix>
-    <SoupDllSuffix>$(SoupSeparateVSDllSuffix)</SoupDllSuffix>
-    <PythonPath>c:\python34</PythonPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>soupversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SoupLibtoolCompatibleDllPrefix">
-      <Value>$(SoupLibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SoupLibtoolCompatibleDllSuffix">
-      <Value>$(SoupLibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SoupSeparateVSDllPrefix">
-      <Value>$(SoupSeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SoupSeparateVSDllSuffix">
-      <Value>$(SoupSeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SoupDllPrefix">
-      <Value>$(SoupDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="SoupDllSuffix">
-      <Value>$(SoupDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonPath">
-      <Value>$(PythonPath)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/soup-version-paths.props.in b/win32/vs10/soup-version-paths.props.in
new file mode 100644
index 00000000..7b259cec
--- /dev/null
+++ b/win32/vs10/soup-version-paths.props.in
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ImportGroup Label="PropertySheets">
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+    <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>
+    <SoupSeparateVSDllPrefix />
+    <SoupSeparateVSDllSuffix>-$(ApiVersion)-vs$(VSVer)</SoupSeparateVSDllSuffix>
+    <SoupDllPrefix>$(SoupSeparateVSDllPrefix)</SoupDllPrefix>
+    <SoupDllSuffix>$(SoupSeparateVSDllSuffix)</SoupDllSuffix>
+    <PythonPath>c:\python34</PythonPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <_PropertySheetDisplayName>soupversionpathsprops</_PropertySheetDisplayName>
+  </PropertyGroup>
+  <ItemDefinitionGroup />
+  <ItemGroup>
+    <BuildMacro Include="VSVer">
+      <Value>$(VSVer)</Value>
+    </BuildMacro>
+    <BuildMacro Include="GlibEtcInstallRoot">
+      <Value>$(GlibEtcInstallRoot)</Value>
+    </BuildMacro>
+    <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>
+    <BuildMacro Include="SoupLibtoolCompatibleDllPrefix">
+      <Value>$(SoupLibtoolCompatibleDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SoupLibtoolCompatibleDllSuffix">
+      <Value>$(SoupLibtoolCompatibleDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SoupSeparateVSDllPrefix">
+      <Value>$(SoupSeparateVSDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SoupSeparateVSDllSuffix">
+      <Value>$(SoupSeparateVSDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SoupDllPrefix">
+      <Value>$(SoupDllPrefix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="SoupDllSuffix">
+      <Value>$(SoupDllSuffix)</Value>
+    </BuildMacro>
+    <BuildMacro Include="PythonPath">
+      <Value>$(PythonPath)</Value>
+    </BuildMacro>
+  </ItemGroup>
+</Project>
diff --git a/win32/vs9/soup-gen-srcs.vsprops b/win32/vs9/soup-gen-srcs.vsprops
new file mode 100644
index 00000000..c947b5f4
--- /dev/null
+++ b/win32/vs9/soup-gen-srcs.vsprops
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="soupgensrcsprops"
+	InheritedPropertySheets=".\soup-build-defines.vsprops"
+	>
+	<UserMacro
+		Name="CopyConfigH"
+		Value="copy ..\..\config.h.win32 ..\..\config.h"
+	/>
+	<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)&#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;
+		      "
+	/>
+	<UserMacro
+		Name="GenTldDataInc"
+		Value="$(PythonPath)\python.exe ..\..\libsoup\tld-parser.py ..\..\data\effective_tld_names.dat ..\..\libsoup\tld_data.inc"
+	/>
+</VisualStudioPropertySheet>
diff --git a/win32/vs9/soup-gen-srcs.vsprops.in b/win32/vs9/soup-gen-srcs.vsprops.in
deleted file mode 100644
index 87518b6d..00000000
--- a/win32/vs9/soup-gen-srcs.vsprops.in
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="soupgensrcsprops"
-	InheritedPropertySheets=".\soup-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="CopyConfigH"
-		Value="copy ..\..\config.h.win32 ..\..\config.h"
-	/>
-	<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;
-del ..\..\libsoup\soup-version.h.tmp1 ..\..\libsoup\soup-version.h.tmp2&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GenTldDataInc"
-		Value="$(PythonPath)\python.exe ..\..\libsoup\tld-parser.py ..\..\data\effective_tld_names.dat ..\..\libsoup\tld_data.inc"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/soup-version-paths.vsprops b/win32/vs9/soup-version-paths.vsprops
deleted file mode 100644
index 8f845a62..00000000
--- a/win32/vs9/soup-version-paths.vsprops
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="soupversionpathsprops"
-	>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="ApiVersion"
-		Value="2.4"
-	/>
-	<UserMacro
-		Name="SoupLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="SoupLibtoolCompatibleDllSuffix"
-		Value="-$(ApiVersion)-0"
-	/>
-	<UserMacro
-		Name="SoupSeparateVSDllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="SoupSeparateVSDllSuffix"
-		Value="-$(ApiVersion)-vs$(VSVer)"
-	/>
-	<!-- Change these two to SoupLibtoolCompatibleDllPrefix and
-	SoupLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="SoupDllPrefix"
-		Value="$(SoupSeparateVSDllPrefix)"
-	/>
-	<UserMacro
-		Name="SoupDllSuffix"
-		Value="$(SoupSeparateVSDllSuffix)"
-	/>
-	<UserMacro
-		Name="PythonPath"
-		Value="c:\python27"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/soup-version-paths.vsprops.in b/win32/vs9/soup-version-paths.vsprops.in
new file mode 100644
index 00000000..cde608ee
--- /dev/null
+++ b/win32/vs9/soup-version-paths.vsprops.in
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="soupversionpathsprops"
+	>
+	<UserMacro
+		Name="VSVer"
+		Value="9"
+	/>
+	<UserMacro
+		Name="GlibEtcInstallRoot"
+		Value="..\..\..\vs$(VSVer)\$(PlatformName)"
+	/>
+	<UserMacro
+		Name="CopyDir"
+		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"
+	/>
+	<UserMacro
+		Name="SoupLibtoolCompatibleDllPrefix"
+		Value="lib"
+	/>
+	<UserMacro
+		Name="SoupLibtoolCompatibleDllSuffix"
+		Value="-$(ApiVersion)-0"
+	/>
+	<UserMacro
+		Name="SoupSeparateVSDllPrefix"
+		Value=""
+	/>
+	<UserMacro
+		Name="SoupSeparateVSDllSuffix"
+		Value="-$(ApiVersion)-vs$(VSVer)"
+	/>
+	<!-- Change these two to SoupLibtoolCompatibleDllPrefix and
+	SoupLibtoolCompatibleDllSuffix if that is what you want -->
+	<UserMacro
+		Name="SoupDllPrefix"
+		Value="$(SoupSeparateVSDllPrefix)"
+	/>
+	<UserMacro
+		Name="SoupDllSuffix"
+		Value="$(SoupSeparateVSDllSuffix)"
+	/>
+	<UserMacro
+		Name="PythonPath"
+		Value="c:\python27"
+	/>
+</VisualStudioPropertySheet>
-- 
cgit v1.2.1