[gtk+] Visual C++ Builds: Fix "install" Projects

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+] Visual C++ Builds: Fix "install" Projects
Date: Thu, 5 Sep 2013 06:33:35 +0000 (UTC)
commit feb72ad45e04c5263d204683ba7dc5f9b41d2422
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Sep 5 14:33:22 2013 +0800

    Visual C++ Builds: Fix "install" Projects
    
    Due to the split up of the property sheets, the install projects did not
    have info on the Intermediate and Output Paths, which caused confusing
    messages from Visual Studio to show up upon completing build+"install" and
    closing Visual Studio on whether to reload the install project, at least on
    Visual Studio 2008.
    
    Also clean up the Visual Studio 2008 install project a bit.
    
    Include the property sheet which defines these properties to fix this.

 build/win32/vs10/install.vcxproj |    8 +++
 build/win32/vs9/install.vcproj   |   88 +++----------------------------------
 2 files changed, 16 insertions(+), 80 deletions(-)
---
diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj
index 8afbb83..e46e41a 100644
--- a/build/win32/vs10/install.vcxproj
+++ b/build/win32/vs10/install.vcxproj
@@ -91,41 +91,49 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="gtk-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <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-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.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-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.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-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.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-install-headers-data.props" />
     <Import Project="gtk-install-bin.props" />
+    <Import Project="gtk-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
index e7960c9..9a4e1a5 100644
--- a/build/win32/vs9/install.vcproj
+++ b/build/win32/vs9/install.vcproj
@@ -23,7 +23,7 @@
                        Name="Debug|Win32"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+                       
InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
@@ -31,21 +31,12 @@
                                Name="VCPreBuildEventTool"
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
                        />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+                       
InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
@@ -53,22 +44,13 @@
                                Name="VCPreBuildEventTool"
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
                        />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
                </Configuration>
                <Configuration
                        Name="Debug_Broadway|Win32"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+                       
InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
@@ -76,21 +58,12 @@
                                Name="VCPreBuildEventTool"
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
                        />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
                </Configuration>
                <Configuration
                        Name="Debug_Broadway|x64"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+                       
InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
@@ -98,22 +71,13 @@
                                Name="VCPreBuildEventTool"
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
                        />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+                       
InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        WholeProgramOptimization="1"
@@ -122,21 +86,12 @@
                                Name="VCPreBuildEventTool"
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
                        />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
                </Configuration>
                <Configuration
                        Name="Release|x64"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+                       
InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        WholeProgramOptimization="1"
@@ -145,22 +100,13 @@
                                Name="VCPreBuildEventTool"
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
                        />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
                </Configuration>
                <Configuration
                        Name="Release_Broadway|Win32"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        IntermediateDirectory="$(ConfigurationName)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+                       
InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        WholeProgramOptimization="1"
@@ -169,21 +115,12 @@
                                Name="VCPreBuildEventTool"
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
                        />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
                </Configuration>
                <Configuration
                        Name="Release_Broadway|x64"
                        OutputDirectory="$(GlibEtcInstallRoot)"
                        ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops"
+                       
InheritedPropertySheets=".\gtk-install-headers-data.vsprops;.\gtk-install-bin.vsprops;.\gtk-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        WholeProgramOptimization="1"
@@ -192,15 +129,6 @@
                                Name="VCPreBuildEventTool"
                                CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
                        />
-                       <Tool
-                               Name="VCCustomBuildTool"
-                       />
-                       <Tool
-                               Name="VCMIDLTool"
-                       />
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                       />
                </Configuration>
        </Configurations>
        <References>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]