luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Visual Studio builds: Move @GLIB_VERSION@ usage

Browse Source 
... 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.
This commit is contained in:
Chun-wei Fan 2016-02-25 18:37:01 +08:00
parent 73192b84f8
commit 99b30f389e
9 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/win32/vs10/.gitignore vendored
View File

@ -8,5 +8,5 @@ glib-compile-resources.vcxproj
glib-compile-resources.vcxproj.filters glib-compile-resources.vcxproj.filters
glib-compile-schemas.vcxproj glib-compile-schemas.vcxproj
glib-compile-schemas.vcxproj.filters glib-compile-schemas.vcxproj.filters
glib-gen-srcs.props glib-version-paths.props
glib-install.props glib-install.props

6
build/win32/vs10/Makefile.am
View File

@ -9,7 +9,7 @@ GENERATED_ITEMS = \
glib-compile-schemas.vcxproj.filters \ glib-compile-schemas.vcxproj.filters \
glib-compile-resources.vcxproj \ glib-compile-resources.vcxproj \
glib-compile-resources.vcxproj.filters \ glib-compile-resources.vcxproj.filters \
glib-gen-srcs.props \ glib-version-paths.props \
glib-install.props glib-install.props
MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers MSVC10_HEADERS_LIST = glib.vs10.headers gobject.vs10.headers gio.vs10.headers
@ -48,8 +48,8 @@ EXTRA_DIST = \
glib-install.vcxproj \ glib-install.vcxproj \
glib-build-defines.props \ glib-build-defines.props \
glib-install.propsin \ glib-install.propsin \
glib-version-paths.props \ glib-version-paths.props.in \
glib-gen-srcs.props.in \ glib-gen-srcs.props \
$(GENERATED_ITEMS) $(GENERATED_ITEMS)
glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST) glib-install.props: $(top_srcdir)/build/win32/vs10/glib-install.propsin $(MSVC10_HEADERS_LIST)

2
build/win32/vs10/glib-gen-srcs.props.in → build/win32/vs10/glib-gen-srcs.props
View File

@ -8,7 +8,7 @@
<GenGLibConfigH>copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h</GenGLibConfigH> <GenGLibConfigH>copy ..\..\..\glib\glibconfig.h.win32 ..\..\..\glib\glibconfig.h</GenGLibConfigH>
<GenGModuleConfH>copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h</GenGModuleConfH> <GenGModuleConfH>copy ..\..\..\gmodule\gmoduleconf.h.win32 ..\..\..\gmodule\gmoduleconf.h</GenGModuleConfH>
<GenGNetworkingH>copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h</GenGNetworkingH> <GenGNetworkingH>copy ..\..\..\gio\gnetworking.h.win32 ..\..\..\gio\gnetworking.h</GenGNetworkingH>
<GenGLibMKEnums>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@</GenGLibMKEnums> <GenGLibMKEnums>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)</GenGLibMKEnums>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName> <_PropertySheetDisplayName>glibgensrcsprops</_PropertySheetDisplayName>

12
build/win32/vs10/glib-version-paths.props → build/win32/vs10/glib-version-paths.props.in
View File

@ -2,9 +2,10 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros"> <PropertyGroup Label="UserMacros">
<VSVer>10</VSVer> <VSVer>10</VSVer>
<GlibVersion>@GLIB_VERSION@</GlibVersion>
<ApiVersion>2.0</ApiVersion>
<GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot> <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
<CopyDir>$(GlibEtcInstallRoot)</CopyDir> <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
<ApiVersion>2.0</ApiVersion>
<GlibLibtoolCompatibleDllPrefix>lib</GlibLibtoolCompatibleDllPrefix> <GlibLibtoolCompatibleDllPrefix>lib</GlibLibtoolCompatibleDllPrefix>
<GlibLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GlibLibtoolCompatibleDllSuffix> <GlibLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GlibLibtoolCompatibleDllSuffix>
<GlibSeparateVSDllPrefix /> <GlibSeparateVSDllPrefix />
@ -20,15 +21,18 @@
<BuildMacro Include="VSVer"> <BuildMacro Include="VSVer">
<Value>$(VSVer)</Value> <Value>$(VSVer)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="GlibVersion">
<Value>$(GlibVersion)</Value>
</BuildMacro>
<BuildMacro Include="ApiVersion">
<Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="GlibEtcInstallRoot"> <BuildMacro Include="GlibEtcInstallRoot">
<Value>$(GlibEtcInstallRoot)</Value> <Value>$(GlibEtcInstallRoot)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="CopyDir"> <BuildMacro Include="CopyDir">
<Value>$(CopyDir)</Value> <Value>$(CopyDir)</Value>
</BuildMacro> </BuildMacro>
<BuildMacro Include="ApiVersion">
<Value>$(ApiVersion)</Value>
</BuildMacro>
<BuildMacro Include="GlibLibtoolCompatibleDllPrefix"> <BuildMacro Include="GlibLibtoolCompatibleDllPrefix">
<Value>$(GlibLibtoolCompatibleDllPrefix)</Value> <Value>$(GlibLibtoolCompatibleDllPrefix)</Value>
</BuildMacro> </BuildMacro>

2
build/win32/vs9/.gitignore vendored
View File

@ -3,5 +3,5 @@ gobject.vcproj
gio.vcproj gio.vcproj
glib-compile-resources.vcproj glib-compile-resources.vcproj
glib-compile-schemas.vcproj glib-compile-schemas.vcproj
glib-gen-srcs.vsprops glib-version-paths.vsprops
glib-install.vsprops glib-install.vsprops

6
build/win32/vs9/Makefile.am
View File

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

2
build/win32/vs9/glib-gen-srcs.vsprops.in → build/win32/vs9/glib-gen-srcs.vsprops
View File

@ -23,6 +23,6 @@
/> />
<UserMacro <UserMacro
Name="GenGLibMKEnums" 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@" 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)"
/> />
</VisualStudioPropertySheet> </VisualStudioPropertySheet>

12
build/win32/vs9/glib-version-paths.vsprops → build/win32/vs9/glib-version-paths.vsprops.in
View File

@ -8,6 +8,14 @@
Name="VSVer" Name="VSVer"
Value="9" Value="9"
/> />
<UserMacro
Name="GlibVersion"
Value="@GLIB_VERSION@"
/>
<UserMacro
Name="ApiVersion"
Value="2.0"
/>
<UserMacro <UserMacro
Name="GlibEtcInstallRoot" Name="GlibEtcInstallRoot"
Value="..\..\..\..\vs$(VSVer)\$(PlatformName)" Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
@ -16,10 +24,6 @@
Name="CopyDir" Name="CopyDir"
Value="$(GlibEtcInstallRoot)" Value="$(GlibEtcInstallRoot)"
/> />
<UserMacro
Name="ApiVersion"
Value="2.0"
/>
<UserMacro <UserMacro
Name="GlibLibtoolCompatibleDllPrefix" Name="GlibLibtoolCompatibleDllPrefix"
Value="lib" Value="lib"

4
configure.ac
View File

@ -3386,9 +3386,9 @@ build/Makefile
build/win32/Makefile build/win32/Makefile
build/win32/dirent/Makefile build/win32/dirent/Makefile
build/win32/vs9/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/Makefile
build/win32/vs10/glib-gen-srcs.props build/win32/vs10/glib-version-paths.props
build/win32/vs11/Makefile build/win32/vs11/Makefile
build/win32/vs12/Makefile build/win32/vs12/Makefile
build/win32/vs14/Makefile build/win32/vs14/Makefile