[gtk+] MSVC Builds: Fix Build of Introspection Files
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] MSVC Builds: Fix Build of Introspection Files
- Date: Wed, 28 Aug 2013 06:27:11 +0000 (UTC)
commit b264d27c4fb5f4937ea070ba122a344acc605b14
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Aug 28 14:27:02 2013 +0800
MSVC Builds: Fix Build of Introspection Files
We need to copy the GDK .lib/.dll from Release_Broadway\<Platform>\bin
or Debug_Broadway\<Platform>\bin to Release\<Platform>\bin or
Debug\<Platform>\bin respectively during the build of Broadway flavors of
GDK, as the MSVC introspection builds expects the GDK .lib/.dll to be
in Release\<Platform>\bin or Debug\<Platform>\bin.
Use a new property sheet to do so for Broadway builds of GDK-during the
builds of Win32-only GDK, the broadway builds of the GDK .lib/.dll would
be cleared out prior to the build of the Win32-only GDK.
build/win32/vs10/Makefile.am | 3 +-
build/win32/vs10/gdk.vcxprojin | 4 ++
build/win32/vs10/gtk-copy-gdk-broadway.props | 44 +++++++++++++++++++++++++
build/win32/vs9/Makefile.am | 3 +-
build/win32/vs9/gdk.vcprojin | 6 ++--
build/win32/vs9/gtk-copy-gdk-broadway.vsprops | 30 +++++++++++++++++
6 files changed, 85 insertions(+), 5 deletions(-)
---
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index 4743b8e..44b2883 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -36,6 +36,7 @@ EXTRA_DIST += \
gtk-install-headers-data.props \
gtk-version-paths.props \
gtkprebuild-broadway.props \
- gtkprebuild.props
+ gtkprebuild.props \
+ gtk-copy-gdk-broadway.props
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/gdk.vcxprojin b/build/win32/vs10/gdk.vcxprojin
index 62f48c3..d8d0727 100644
--- a/build/win32/vs10/gdk.vcxprojin
+++ b/build/win32/vs10/gdk.vcxprojin
@@ -110,18 +110,22 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk-build-defines.props" />
+ <Import Project="gtk-copy-gdk-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk-build-defines.props" />
+ <Import Project="gtk-copy-gdk-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk-build-defines.props" />
+ <Import Project="gtk-copy-gdk-broadway.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="gtk-build-defines.props" />
+ <Import Project="gtk-copy-gdk-broadway.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
diff --git a/build/win32/vs10/gtk-copy-gdk-broadway.props b/build/win32/vs10/gtk-copy-gdk-broadway.props
new file mode 100644
index 0000000..76fc97d
--- /dev/null
+++ b/build/win32/vs10/gtk-copy-gdk-broadway.props
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <_PropertySheetDisplayName>gtkcopygdkbroadwayprops</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <PostBuildEvent>
+ <Command>
+if "$(Configuration)" == "Release" goto END
+
+if "$(Configuration)" == "Debug" goto END
+
+if "$(Configuration)" == "Release_Broadway" goto DoRelease
+
+if "$(Configuration)" == "Debug_Broadway" goto DoDebug
+
+
+:DoRelease
+
+mkdir .\Release\$(Platform)\bin
+
+copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(Platform)\bin\
+
+copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Release\$(Platform)\bin\
+
+goto END
+
+
+:DoDebug
+
+mkdir .\Debug\$(Platform)\bin
+
+copy /b $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Debug\$(Platform)\bin\
+
+copy /b $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib .\Debug\$(Platform)\bin\
+
+goto END
+
+
+:END
+ </Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index 71bf0e5..f56ec64 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -24,6 +24,7 @@ EXTRA_DIST += \
gtk-install-headers-data.vsprops \
gtk-version-paths.vsprops \
gtkprebuild.vsprops \
- gtkprebuild-broadway.vsprops
+ gtkprebuild-broadway.vsprops \
+ gtk-copy-gdk-broadway.vsprops
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/gdk.vcprojin b/build/win32/vs9/gdk.vcprojin
index 26c675f..aafa97a 100644
--- a/build/win32/vs9/gdk.vcprojin
+++ b/build/win32/vs9/gdk.vcprojin
@@ -53,7 +53,7 @@
</Configuration>
<Configuration
Name="Debug_Broadway|Win32"
- InheritedPropertySheets=".\gtk-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtk-copy-gdk-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
@@ -117,7 +117,7 @@
</Configuration>
<Configuration
Name="Release_Broadway|Win32"
- InheritedPropertySheets=".\gtk-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtk-copy-gdk-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
@@ -181,7 +181,7 @@
</Configuration>
<Configuration
Name="Debug_Broadway|x64"
- InheritedPropertySheets=".\gtk-build-defines.vsprops"
+ InheritedPropertySheets=".\gtk-build-defines.vsprops;.\gtk-copy-gdk-broadway.vsprops"
ConfigurationType="2"
CharacterSet="2"
>
diff --git a/build/win32/vs9/gtk-copy-gdk-broadway.vsprops b/build/win32/vs9/gtk-copy-gdk-broadway.vsprops
new file mode 100644
index 0000000..d0dab58
--- /dev/null
+++ b/build/win32/vs9/gtk-copy-gdk-broadway.vsprops
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="gtkcopygdkbroadwayprops"
+ >
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="
+if "$(ConfigurationName)" == "Release" goto END

+if "$(ConfigurationName)" == "Debug" goto END

+if "$(ConfigurationName)" == "Release_Broadway" goto DoRelease

+if "$(ConfigurationName)" == "Debug_Broadway" goto DoDebug

+
+:DoRelease

+mkdir .\Release\$(PlatformName)\bin

+copy /b $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
.\Release\$(PlatformName)\bin\

+copy /b $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib
.\Release\$(PlatformName)\bin\

+goto END

+
+:DoDebug

+mkdir .\Debug\$(PlatformName)\bin

+copy /b $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
.\Debug\$(PlatformName)\bin\

+copy /b $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib
.\Debug\$(PlatformName)\bin\

+goto END

+
+:END

+"
+ />
+</VisualStudioPropertySheet>
\ No newline at end of file
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
