[gtk/msvcproj-nmake-install: 10/22] Visual Studio Projects: Use NMake Makefile to copy build results




commit 455686a57fea60301d7341d9686bd3a10515d5bf
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon May 16 17:45:52 2022 +0800

    Visual Studio Projects: Use NMake Makefile to copy build results
    
    ... and so stop using gtk3-install.[vsprops|props], and remove that
    property sheet from the dist and dist the NMake Makefile for the
    purpose.
    
    Also remove win32/vs10/gtk3-install.vcxproj.filters as well, as it is
    no longer needed.
    
    We will remove the gtk3-install.[vsprops|[props][.in] in a subsequent
    commit.

 win32/Makefile.am                       |   1 +
 win32/vs10/Makefile.am                  |   3 -
 win32/vs10/gtk3-build-defines.props     |   6 ++
 win32/vs10/gtk3-install.vcxproj         | 130 +++++---------------------------
 win32/vs10/gtk3-install.vcxproj.filters |  13 ----
 win32/vs11/Makefile.am                  |   2 -
 win32/vs12/Makefile.am                  |   2 -
 win32/vs14/Makefile.am                  |   2 -
 win32/vs15/Makefile.am                  |   2 -
 win32/vs16/Makefile.am                  |   2 -
 win32/vs17/Makefile.am                  |   2 -
 win32/vs9/Makefile.am                   |   2 -
 win32/vs9/gtk3-build-defines.vsprops    |   4 +
 win32/vs9/gtk3-install.vcproj           |  79 ++++++++-----------
 14 files changed, 63 insertions(+), 187 deletions(-)
---
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 0e70d0d665..4e30405243 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -46,6 +46,7 @@ EXTRA_DIST += \
        generate-msvc.mak       \
        gtk-introspection-msvc.mak      \
        introspection-msvc.mak          \
+       install-msvc.mak                \
        replace.py                      \
        pc_base.py                      \
        gtkpc.py                        \
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
index ef627102d4..30df5f1d74 100644
--- a/win32/vs10/Makefile.am
+++ b/win32/vs10/Makefile.am
@@ -19,7 +19,6 @@ GENERATED_ITEMS = \
        gtk3-icon-browser.vcxproj.filters       \
        gailutil-3.vcxproj                      \
        gailutil-3.vcxproj.filters              \
-       gtk3-install.props                      \
        gtk3-version-paths.props
 
 MSVC10_HEADERS_LISTS = \
@@ -60,12 +59,10 @@ EXTRA_DIST += \
        gailutil-3.vcxprojin                    \
        gailutil-3.vcxproj.filtersin            \
        gtk3-install.vcxproj                    \
-       gtk3-install.vcxproj.filters            \
        gtk3-introspect.vcxproj                 \
        gtk3-build-defines.props                \
        gtk3-copy-gdk-broadway.props            \
        gtk3-ignore-broadway.props              \
-       gtk3-install.propsin                    \
        gtk3-version-paths.props.in             \
        $(GENERATED_ITEMS)
 
diff --git a/win32/vs10/gtk3-build-defines.props b/win32/vs10/gtk3-build-defines.props
index c8c511b9bd..0198734e79 100644
--- a/win32/vs10/gtk3-build-defines.props
+++ b/win32/vs10/gtk3-build-defines.props
@@ -32,6 +32,9 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
     <GenerateRequiredSourcesBase>cd ..
 set VCInstallDir=$(VCInstallDir)
 nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSourcesBase>
+    <InstallBuildsBase>cd ..
+set VCInstallDir=$(VCInstallDir)
+nmake -f install-msvc.mak PREFIX=$(GlibEtcInstallRoot)</InstallBuildsBase>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3builddefinesprops</_PropertySheetDisplayName>
@@ -117,5 +120,8 @@ nmake -f generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)</GenerateRequiredSources
     <BuildMacro Include="GenerateRequiredSourcesBase">
       <Value>$(GenerateRequiredSourcesBase)</Value>
     </BuildMacro>
+    <BuildMacro Include="InstallBuildsBase">
+      <Value>$(InstallBuildsBase)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/vs10/gtk3-install.vcxproj b/win32/vs10/gtk3-install.vcxproj
index 290efb11a7..f2a6dcb6ab 100644
--- a/win32/vs10/gtk3-install.vcxproj
+++ b/win32/vs10/gtk3-install.vcxproj
@@ -41,46 +41,46 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
+    <ConfigurationType>Makefile</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <PlatformToolset>v100</PlatformToolset>
   </PropertyGroup>
@@ -89,133 +89,43 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" 
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-install.props" />
+    <Import Project="gtk3-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="gtk3-install.props" />
+    <Import Project="gtk3-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="gtk3-install.props" />
+    <Import Project="gtk3-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="gtk3-install.props" />
+    <Import Project="gtk3-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="gtk3-install.props" />
+    <Import Project="gtk3-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="gtk3-install.props" />
+    <Import Project="gtk3-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="gtk3-install.props" />
+    <Import Project="gtk3-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="gtk3-install.props" />
+    <Import Project="gtk3-build-defines.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" />
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" />
-    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" />
-    <OutDir 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" />
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug_Broadway'">$(InstallBuildsBase) CFG=Debug 
BROADWAY=1 $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release_Broadway'">$(InstallBuildsBase) 
CFG=Release BROADWAY=1 $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Debug'">$(InstallBuildsBase) 
CFG=$(Configuration) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine Condition="'$(Configuration)' == 'Release'">$(InstallBuildsBase) 
CFG=$(Configuration) $(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)</NMakeBuildCommandLine>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles)</AdditionalInputs>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkPCFiles)</AdditionalInputs>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Installing Build Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles)</AdditionalInputs>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkPCFiles)</AdditionalInputs>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles)</AdditionalInputs>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkPCFiles)</AdditionalInputs>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles)</AdditionalInputs>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Installing Build 
Results...</Message>
-      <AdditionalInputs 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkPCFiles)</AdditionalInputs>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">blah;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gtkpc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">Generating .pc 
files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GenerateGtkPC) 
--broadway</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">Generating .pc 
files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GenerateGtkPCX64) 
--broadway</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">Generating .pc 
files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GenerateGtkPC) 
--broadway</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">Generating .pc 
files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GenerateGtkPCX64) 
--broadway</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-3.vcxproj">
       <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
index becafd26c1..813badfbb2 100644
--- a/win32/vs11/Makefile.am
+++ b/win32/vs11/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST += \
        gailutil-3.vcxproj      \
        gailutil-3.vcxproj.filters      \
        gtk3-install.vcxproj    \
-       gtk3-install.vcxproj.filters    \
        gtk3-introspect.vcxproj         \
        broadwayd.vcxproj       \
        broadwayd.vcxproj.filters       \
@@ -36,7 +35,6 @@ EXTRA_DIST += \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
        gtk3-ignore-broadway.props      \
-       gtk3-install.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
index 1dd4ba7674..f9c7f5d814 100644
--- a/win32/vs12/Makefile.am
+++ b/win32/vs12/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST += \
        gailutil-3.vcxproj      \
        gailutil-3.vcxproj.filters      \
        gtk3-install.vcxproj    \
-       gtk3-install.vcxproj.filters    \
        gtk3-introspect.vcxproj         \
        broadwayd.vcxproj       \
        broadwayd.vcxproj.filters       \
@@ -36,7 +35,6 @@ EXTRA_DIST += \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
        gtk3-ignore-broadway.props      \
-       gtk3-install.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
index 318c87b7a9..458684cb8e 100644
--- a/win32/vs14/Makefile.am
+++ b/win32/vs14/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST += \
        gailutil-3.vcxproj      \
        gailutil-3.vcxproj.filters      \
        gtk3-install.vcxproj    \
-       gtk3-install.vcxproj.filters    \
        gtk3-introspect.vcxproj         \
        broadwayd.vcxproj       \
        broadwayd.vcxproj.filters       \
@@ -36,7 +35,6 @@ EXTRA_DIST += \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
        gtk3-ignore-broadway.props      \
-       gtk3-install.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
index 619128e42c..88cdad3e28 100644
--- a/win32/vs15/Makefile.am
+++ b/win32/vs15/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST_COPIED =   \
        gailutil-3.vcxproj      \
        gailutil-3.vcxproj.filters      \
        gtk3-install.vcxproj    \
-       gtk3-install.vcxproj.filters    \
        gtk3-introspect.vcxproj         \
        broadwayd.vcxproj       \
        broadwayd.vcxproj.filters       \
@@ -36,7 +35,6 @@ EXTRA_DIST_COPIED =   \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
        gtk3-ignore-broadway.props      \
-       gtk3-install.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST_COPIED)
diff --git a/win32/vs16/Makefile.am b/win32/vs16/Makefile.am
index 64ca7a6c8c..0445eda9ec 100644
--- a/win32/vs16/Makefile.am
+++ b/win32/vs16/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST += \
        gailutil-3.vcxproj      \
        gailutil-3.vcxproj.filters      \
        gtk3-install.vcxproj    \
-       gtk3-install.vcxproj.filters    \
        gtk3-introspect.vcxproj         \
        broadwayd.vcxproj       \
        broadwayd.vcxproj.filters       \
@@ -36,7 +35,6 @@ EXTRA_DIST += \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
        gtk3-ignore-broadway.props      \
-       gtk3-install.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am
index 35d581e313..b2cb3a12e5 100644
--- a/win32/vs17/Makefile.am
+++ b/win32/vs17/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST += \
        gailutil-3.vcxproj      \
        gailutil-3.vcxproj.filters      \
        gtk3-install.vcxproj    \
-       gtk3-install.vcxproj.filters    \
        gtk3-introspect.vcxproj         \
        broadwayd.vcxproj       \
        broadwayd.vcxproj.filters       \
@@ -36,7 +35,6 @@ EXTRA_DIST += \
        gtk3-build-defines.props        \
        gtk3-copy-gdk-broadway.props    \
        gtk3-ignore-broadway.props      \
-       gtk3-install.props      \
        gtk3-version-paths.props
 
 DISTCLEANFILES = $(EXTRA_DIST)
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
index eded327a89..4b6120ae37 100644
--- a/win32/vs9/Makefile.am
+++ b/win32/vs9/Makefile.am
@@ -17,7 +17,6 @@ GENERATED_ITEMS = \
        gtk3-demo-application.vcproj    \
        gtk3-icon-browser.vcproj        \
        gailutil-3.vcproj               \
-       gtk3-install.vsprops            \
        gtk3-version-paths.vsprops
 
 EXTRA_DIST += \
@@ -42,7 +41,6 @@ EXTRA_DIST += \
        gtk3-build-defines.vsprops      \
        gtk3-copy-gdk-broadway.vsprops  \
        gtk3-ignore-broadway.vsprops    \
-       gtk3-install.vspropsin          \
        gtk3-version-paths.vsprops.in   \
        $(GENERATED_ITEMS)
 
diff --git a/win32/vs9/gtk3-build-defines.vsprops b/win32/vs9/gtk3-build-defines.vsprops
index 449a3cba1f..561a5952b1 100644
--- a/win32/vs9/gtk3-build-defines.vsprops
+++ b/win32/vs9/gtk3-build-defines.vsprops
@@ -99,4 +99,8 @@
                Name="GenerateRequiredSourcesBase"
                Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f 
generate-msvc.mak PREFIX=$(GlibEtcInstallRoot)"
        />
+       <UserMacro
+               Name="InstallBuildsBase"
+               Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f install-msvc.mak 
PREFIX=$(GlibEtcInstallRoot)"
+       />
 </VisualStudioPropertySheet>
diff --git a/win32/vs9/gtk3-install.vcproj b/win32/vs9/gtk3-install.vcproj
index 01f7bbc83d..764397e502 100644
--- a/win32/vs9/gtk3-install.vcproj
+++ b/win32/vs9/gtk3-install.vcproj
@@ -21,113 +21,98 @@
        <Configurations>
                <Configuration
                        Name="Debug|Win32"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk3-install.vsprops"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\gtk3-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+                               Name="VCNMakeTool"
+                               BuildCommandLine="$(InstallBuildsBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)"
                        />
                </Configuration>
                <Configuration
                        Name="Debug|x64"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk3-install.vsprops"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\gtk3-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+                               Name="VCNMakeTool"
+                               BuildCommandLine="$(InstallBuildsBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)"
                        />
                </Configuration>
                <Configuration
                        Name="Debug_Broadway|Win32"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk3-install.vsprops"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\gtk3-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+                               Name="VCNMakeTool"
+                               BuildCommandLine="$(InstallBuildsBase) CFG=Debug $(IntrospectPythonParam) 
GTK_VERSION=$(GtkVersion) BROADWAY=1"
                        />
                </Configuration>
                <Configuration
                        Name="Debug_Broadway|x64"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk3-install.vsprops"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\gtk3-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
                        >
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+                               Name="VCNMakeTool"
+                               BuildCommandLine="$(InstallBuildsBase) CFG=Debug $(IntrospectPythonParam) 
GTK_VERSION=$(GtkVersion) BROADWAY=1"
                        />
                </Configuration>
                <Configuration
                        Name="Release|Win32"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk3-install.vsprops"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\gtk3-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
-                       WholeProgramOptimization="1"
                        >
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+                               Name="VCNMakeTool"
+                               BuildCommandLine="$(InstallBuildsBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)"
                        />
                </Configuration>
                <Configuration
                        Name="Release|x64"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk3-install.vsprops"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\gtk3-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
-                       WholeProgramOptimization="1"
                        >
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
+                               Name="VCNMakeTool"
+                               BuildCommandLine="$(InstallBuildsBase) CFG=$(ConfigurationName) 
$(IntrospectPythonParam) GTK_VERSION=$(GtkVersion)"
                        />
                </Configuration>
                <Configuration
                        Name="Release_Broadway|Win32"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       IntermediateDirectory="$(ConfigurationName)"
-                       ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk3-install.vsprops"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\gtk3-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
-                       WholeProgramOptimization="1"
                        >
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+                               Name="VCNMakeTool"
+                               BuildCommandLine="$(InstallBuildsBase) CFG=Release $(IntrospectPythonParam) 
GTK_VERSION=$(GtkVersion) BROADWAY=1"
                        />
                </Configuration>
                <Configuration
                        Name="Release_Broadway|x64"
-                       OutputDirectory="$(GlibEtcInstallRoot)"
-                       ConfigurationType="10"
-                       InheritedPropertySheets=".\gtk3-install.vsprops"
+                       ConfigurationType="0"
+                       InheritedPropertySheets=".\gtk3-build-defines.vsprops"
                        CharacterSet="2"
                        DeleteExtensionsOnClean=""
-                       WholeProgramOptimization="1"
                        >
                        <Tool
-                               Name="VCPostBuildEventTool"
-                               
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
+                               Name="VCNMakeTool"
+                               BuildCommandLine="$(InstallBuildsBase) CFG=Release $(IntrospectPythonParam) 
GTK_VERSION=$(GtkVersion) BROADWAY=1"
                        />
                </Configuration>
        </Configurations>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]