Featured content is also available via:

Visual Studio builds: Move @GLIB_VERSION@ usage

Desktop / GNOME / GLib - Chun-wei Fan [src.gnome.org] - 25 February 2016 04:37 UTC

... from glib-gen-srcs.[vsprops|props].in to glib-version-paths.[vsprops|props].in, and instead let autotools generate glib-version-paths.[vsprops|props] rather than glib-gen-srcs.[vsprops|props], as this will need to be referenced for other items as well, namely generating the .pc files which will become useful for introspection builds.

###

diff --git a/build/win32/vs10/.gitignore b/build/win32/vs10/.gitignore
index bfc6500..0bdbb50 100644
--- a/build/win32/vs10/.gitignore
+++ b/build/win32/vs10/.gitignore
@@ -8,5 +8,5 @@ glib-compile-resources.vcxproj
glib-compile-resources.vcxproj.filters
glib-compile-schemas.vcxproj
glib-compile-schemas.vcxproj.filters
-glib-gen-srcs.props
+glib-version-paths.props
glib-install.props
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index a1b5a5a..75b9483 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -9,7 +9,7 @@ GENERATED_ITEMS = \
glib-compile-schemas.vcxproj.filters \
glib-compile-resources.vcxproj \
glib-compile-resources.vcxproj.filters \
- glib-gen-srcs.props \
+ glib-version-paths.props \
glib-install.props

MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers
@@ -46,10 +46,10 @@ EXTRA_DIST = \
gdbus.vcxproj \
gdbus.vcxproj.filters \
glib-install.vcxproj \
- glib-build-defines.props \
+ glib-build-defines.props \
glib-install.propsin \
- glib-version-paths.props \
- glib-gen-srcs.props.in \
+ glib-version-paths.props.in \
+ glib-gen-srcs.props \
$(GENERATED_ITEMS)

glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)
diff --git a/build/win32/vs10/glib-gen-srcs.props b/build/win32/vs10/glib-gen-srcs.props
new file mode 100644
index 0000000..64a20ea
--- /dev/null
+++ b/build/win32/vs10/glib-gen-srcs.props
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+ copy ..\..\..\config.h.win32 ..\..\..\config.h
+ copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h
+ copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
+ copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h
+ if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)
+
+
+ <_PropertySheetDisplayName>glibgensrcsprops
+
+
+
+ $(GenConfigH)
+
+
+ $(GenGLibConfigH)
+
+
+ $(GenGModuleConfH)
+
+
+ $(GenGNetworkingH)
+
+
+ $(GenGLibMKEnums)
+
+
+
diff --git a/build/win32/vs10/glib-gen-srcs.props.in b/build/win32/vs10/glib-gen-srcs.props.in
deleted file mode 100644
index 5cc213f..0000000
--- a/build/win32/vs10/glib-gen-srcs.props.in
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
- copy ..\..\..\config.h.win32 ..\..\..\config.h
- copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h
- copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h
- copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h
- if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=@GLIB_VERSION@
-
-
- <_PropertySheetDisplayName>glibgensrcsprops
-
-
-
- $(GenConfigH)
-
-
- $(GenGLibConfigH)
-
-
- $(GenGModuleConfH)
-
-
- $(GenGNetworkingH)
-
-
- $(GenGLibMKEnums)
-
-
-
diff --git a/build/win32/vs10/glib-version-paths.props b/build/win32/vs10/glib-version-paths.props
deleted file mode 100644
index 4663a84..0000000
--- a/build/win32/vs10/glib-version-paths.props
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
- 10
- ..\..\..\..\vs$(VSVer)\$(Platform)
- $(GlibEtcInstallRoot)
- 2.0
- lib
- -$(ApiVersion)-0
-
- -2-vs$(VSVer)
- $(GlibSeparateVSDllPrefix)
- $(GlibSeparateVSDllSuffix)
- c:\python27
-
-
- <_PropertySheetDisplayName>glibversionpathsprops
-
-
-
- $(VSVer)
-
-
- $(GlibEtcInstallRoot)
-
-
- $(CopyDir)
-
-
- $(ApiVersion)
-
-
- $(GlibLibtoolCompatibleDllPrefix)
-
-
- $(GlibLibtoolCompatibleDllSuffix)
-
-
- $(GlibSeparateVSDllPrefix)
-
-
- $(GlibSeparateVSDllSuffix)
-
-
- $(GlibDllPrefix)
-
-
- $(GlibDllSuffix)
-
-
- $(PythonPath)
-
-
-
\ No newline at end of file
diff --git a/build/win32/vs10/glib-version-paths.props.in b/build/win32/vs10/glib-version-paths.props.in
new file mode 100644
index 0000000..6932252
--- /dev/null
+++ b/build/win32/vs10/glib-version-paths.props.in
@@ -0,0 +1,58 @@
+
+
+
+ 10
+ @GLIB_VERSION@
+ 2.0
+ ..\..\..\..\vs$(VSVer)\$(Platform)
+ $(GlibEtcInstallRoot)
+ lib
+ -$(ApiVersion)-0
+
+ -2-vs$(VSVer)
+ $(GlibSeparateVSDllPrefix)
+ $(GlibSeparateVSDllSuffix)
+ c:\python27
+
+
+ <_PropertySheetDisplayName>glibversionpathsprops
+
+
+
+ $(VSVer)
+
+
+ $(GlibVersion)
+
+
+ $(ApiVersion)
+
+
+ $(GlibEtcInstallRoot)
+
+
+ $(CopyDir)
+
+
+ $(GlibLibtoolCompatibleDllPrefix)
+
+
+ $(GlibLibtoolCompatibleDllSuffix)
+
+
+ $(GlibSeparateVSDllPrefix)
+
+
+ $(GlibSeparateVSDllSuffix)
+
+
+ $(GlibDllPrefix)
+
+
+ $(GlibDllSuffix)
+
+
+ $(PythonPath)
+
+
+
\ No newline at end of file
diff --git a/build/win32/vs9/.gitignore b/build/win32/vs9/.gitignore
index 08775ac..c23b304 100644
--- a/build/win32/vs9/.gitignore
+++ b/build/win32/vs9/.gitignore
@@ -3,5 +3,5 @@ gobject.vcproj
gio.vcproj
glib-compile-resources.vcproj
glib-compile-schemas.vcproj
-glib-gen-srcs.vsprops
+glib-version-paths.vsprops
glib-install.vsprops
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index dd97b7b..1cc2b21 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -4,7 +4,7 @@ GENERATED_ITEMS = \
gio.vcproj \
glib-compile-schemas.vcproj \
glib-compile-resources.vcproj \
- glib-gen-srcs.vsprops \
+ glib-version-paths.vsprops \
glib-install.vsprops

MSVC_HEADERS_LIST = glib.headers gobject.headers gio.headers
@@ -28,8 +28,8 @@ EXTRA_DIST = \
glib-compile-resources.vcprojin \
glib-install.vcproj \
glib-build-defines.vsprops \
- glib-version-paths.vsprops \
- glib-gen-srcs.vsprops.in \
+ glib-version-paths.vsprops.in \
+ glib-gen-srcs.vsprops \
glib-install.vspropsin \
$(GENERATED_ITEMS)

diff --git a/build/win32/vs9/glib-gen-srcs.vsprops b/build/win32/vs9/glib-gen-srcs.vsprops
new file mode 100644
index 0000000..a4cf9f8
--- /dev/null
+++ b/build/win32/vs9/glib-gen-srcs.vsprops
@@ -0,0 +1,28 @@
+
++ ProjectType="Visual C++"
+ Version="8.00"
+ Name="glibgensrcsprops"
+ InheritedPropertySheets=".\glib-build-defines.vsprops"
+ >
+ + Name="GenConfigH"
+ Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
+ />
+ + Name="GenGLibConfigH"
+ Value="copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h"
+ />
+ + Name="GenGModuleConfH"
+ Value="copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h"
+ />
+ + Name="GenGNetworkingH"
+ Value="copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h"
+ />
+ + Name="GenGLibMKEnums"
+ Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=$(GlibVersion)"
+ />
+
diff --git a/build/win32/vs9/glib-gen-srcs.vsprops.in b/build/win32/vs9/glib-gen-srcs.vsprops.in
deleted file mode 100644
index c317aa8..0000000
--- a/build/win32/vs9/glib-gen-srcs.vsprops.in
+++ /dev/null
@@ -1,28 +0,0 @@
-
-- ProjectType="Visual C++"
- Version="8.00"
- Name="glibgensrcsprops"
- InheritedPropertySheets=".\glib-build-defines.vsprops"
- >
- - Name="GenConfigH"
- Value="copy ..\..\..\config.h.win32 ..\..\..\config.h"
- />
- - Name="GenGLibConfigH"
- Value="copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h"
- />
- - Name="GenGModuleConfH"
- Value="copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h"
- />
- - Name="GenGNetworkingH"
- Value="copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h"
- />
- - Name="GenGLibMKEnums"
- Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\gobject\glib-mkenums.in --output=..\..\..\gobject\glib-mkenums --var=GLIB_VERSION --outstring=@GLIB_VERSION@"
- />
-
diff --git a/build/win32/vs9/glib-version-paths.vsprops b/build/win32/vs9/glib-version-paths.vsprops
deleted file mode 100644
index 33b276c..0000000
--- a/build/win32/vs9/glib-version-paths.vsprops
+++ /dev/null
@@ -1,53 +0,0 @@
-
-- ProjectType="Visual C++"
- Version="8.00"
- Name="glibversionpathsprops"
- >
- - Name="VSVer"
- Value="9"
- />
- - Name="GlibEtcInstallRoot"
- Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
- />
- - Name="CopyDir"
- Value="$(GlibEtcInstallRoot)"
- />
- - Name="ApiVersion"
- Value="2.0"
- />
- - Name="GlibLibtoolCompatibleDllPrefix"
- Value="lib"
- />
- - Name="GlibLibtoolCompatibleDllSuffix"
- Value="-$(ApiVersion)-0"
- />
- - Name="GlibSeparateVSDllPrefix"
- Value=""
- />
- - Name="GlibSeparateVSDllSuffix"
- Value="-2-vs$(VSVer)"
- />
-
- - Name="GlibDllPrefix"
- Value="$(GlibSeparateVSDllPrefix)"
- />
- - Name="GlibDllSuffix"
- Value="$(GlibSeparateVSDllSuffix)"
- />
- - Name="PythonPath"
- Value="c:\python27"
- />
-
diff --git a/build/win32/vs9/glib-version-paths.vsprops.in b/build/win32/vs9/glib-version-paths.vsprops.in
new file mode 100644
index 0000000..f69da65
--- /dev/null
+++ b/build/win32/vs9/glib-version-paths.vsprops.in
@@ -0,0 +1,57 @@
+
++ ProjectType="Visual C++"
+ Version="8.00"
+ Name="glibversionpathsprops"
+ >
+ + Name="VSVer"
+ Value="9"
+ />
+ + Name="GlibVersion"
+ Value="@GLIB_VERSION@"
+ />
+ + Name="ApiVersion"
+ Value="2.0"
+ />
+ + Name="GlibEtcInstallRoot"
+ Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+ />
+ + Name="CopyDir"
+ Value="$(GlibEtcInstallRoot)"
+ />
+ + Name="GlibLibtoolCompatibleDllPrefix"
+ Value="lib"
+ />
+ + Name="GlibLibtoolCompatibleDllSuffix"
+ Value="-$(ApiVersion)-0"
+ />
+ + Name="GlibSeparateVSDllPrefix"
+ Value=""
+ />
+ + Name="GlibSeparateVSDllSuffix"
+ Value="-2-vs$(VSVer)"
+ />
+
+ + Name="GlibDllPrefix"
+ Value="$(GlibSeparateVSDllPrefix)"
+ />
+ + Name="GlibDllSuffix"
+ Value="$(GlibSeparateVSDllSuffix)"
+ />
+ + Name="PythonPath"
+ Value="c:\python27"
+ />
+
diff --git a/configure.ac b/configure.ac
index 39e707e..603f621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3386,9 +3386,9 @@ build/Makefile
build/win32/Makefile
build/win32/dirent/Makefile
build/win32/vs9/Makefile
-build/win32/vs9/glib-gen-srcs.vsprops
+build/win32/vs9/glib-version-paths.vsprops
build/win32/vs10/Makefile
-build/win32/vs10/glib-gen-srcs.props
+build/win32/vs10/glib-version-paths.props
build/win32/vs11/Makefile
build/win32/vs12/Makefile
build/win32/vs14/Makefile

99b30f3 Visual Studio builds: Move @GLIB_VERSION@ usage
build/win32/vs10/.gitignore | 2 +-
build/win32/vs10/Makefile.am | 8 ++--
build/win32/vs10/glib-gen-srcs.props | 33 ++++++++++++++
build/win32/vs10/glib-gen-srcs.props.in | 33 --------------
build/win32/vs10/glib-version-paths.props | 54 -----------------------
build/win32/vs10/glib-version-paths.props.in | 58 +++++++++++++++++++++++++
build/win32/vs9/.gitignore | 2 +-
build/win32/vs9/Makefile.am | 6 +--
build/win32/vs9/glib-gen-srcs.vsprops | 28 ++++++++++++
build/win32/vs9/glib-gen-srcs.vsprops.in | 28 ------------
build/win32/vs9/glib-version-paths.vsprops | 53 ----------------------
build/win32/vs9/glib-version-paths.vsprops.in | 57 ++++++++++++++++++++++++
configure.ac | 4 +-
13 files changed, 187 insertions(+), 179 deletions(-)

Upstream: git.gnome.org