[gtk+/gtk-3-20] Visual Studio builds: Refine "installation" process

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+/gtk-3-20] Visual Studio builds: Refine "installation" process
Date: Tue, 10 May 2016 05:34:53 +0000 (UTC)
commit 1994f3748140e54805d56d5e8ebc09129bbe1e1b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue May 10 13:18:23 2016 +0800

    Visual Studio builds: Refine "installation" process
    
    Split out the part where we generate/update the caches for the GSchemas
    and the icons, so that it is easier to ensure that things continue to
    function correctly when we have GlibEtcInstallRoot != CopyDir.

 build/win32/vs10/gtk3-install.propsin  |   28 ++++++++++------------------
 build/win32/vs10/gtk3-install.vcxproj  |   32 ++++++++++++++++----------------
 build/win32/vs9/gtk3-install.vcproj    |   16 ++++++++--------
 build/win32/vs9/gtk3-install.vspropsin |   20 ++++++++++++--------
 4 files changed, 46 insertions(+), 50 deletions(-)
---
diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk3-install.propsin
index feb5724..7fd0a42 100644
--- a/build/win32/vs10/gtk3-install.propsin
+++ b/build/win32/vs10/gtk3-install.propsin
@@ -5,9 +5,6 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    
<InstalledDlls>$(BinDir)\$(GtkDllPrefix)gdk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gtk(GtkDllSuffix).dll;$(BinDir)\$(GtkDllPrefix)gailutil(GtkDllSuffix).dll</InstalledDlls>
-    
<InstalledBins>$(BinDir)\gtk3-demo.exe;$(BinDir)\gtk3-demo-application.exe;$(BinDir)\gtk3-icon-browser.exe;$(BinDir)\gtk-encode-symbolic-svg.exe</InstalledBins>
-    <InstalledBroadwayBins>$(BinDir)\broadwayd.exe</InstalledBroadwayBins>
     <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
 mkdir $(CopyDir)\lib
@@ -126,18 +123,19 @@ copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-
-echo "Compiling gsettings XML Files..."
-$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
-
-echo "Generating icon cache......"
-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
     </GtkDoInstall>
     <GtkDoInstallBroadwayHeaders>
 copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
 #include "gdk3-broadway.vs10.headers"
     </GtkDoInstallBroadwayHeaders>
+    <GtkPostInstall>
+echo "Compiling gsettings XML Files..."
+$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
+
+echo "Generating icon cache......"
+$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
+    </GtkPostInstall>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtk3installsprops</_PropertySheetDisplayName>
@@ -146,15 +144,6 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
     <BuildMacro Include="BinDir">
       <Value>$(BinDir)</Value>
     </BuildMacro>
-    <BuildMacro Include="InstalledDlls">
-      <Value>$(InstalledDlls)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledBins">
-      <Value>$(InstalledBins)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledBroadwayBins">
-      <Value>$(InstalledBroadwayBins)</Value>
-    </BuildMacro>
     <BuildMacro Include="GtkDoInstallBin">
       <Value>$(GtkDoInstallBin)</Value>
     </BuildMacro>
@@ -164,5 +153,8 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
     <BuildMacro Include="GtkDoInstallBroadwayHeaders">
       <Value>$(GtkDoInstallBroadwayHeaders)</Value>
     </BuildMacro>
+    <BuildMacro Include="GtkPostInstall">
+      <Value>$(GtkPostInstall)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gtk3-install.vcxproj b/build/win32/vs10/gtk3-install.vcxproj
index f87ad9b..346337d 100644
--- a/build/win32/vs10/gtk3-install.vcxproj
+++ b/build/win32/vs10/gtk3-install.vcxproj
@@ -157,29 +157,29 @@
   <ItemGroup>
     <CustomBuild Include="..\..\..\config.h.win32">
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing Build 
Results...</Message>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <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>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <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>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <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>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <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>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <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>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <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>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkDoInstallBin)$(GtkDoInstall)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(InstalledDlls);$(InstalledBins);%(Outputs)</Outputs>
+      <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>
-      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)</Command>
-      <Outputs 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(InstalledDlls);$(InstalledBins);$(InstalledBroadwayBins);%(Outputs)</Outputs>
+      <Command 
Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'">blah;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs9/gtk3-install.vcproj b/build/win32/vs9/gtk3-install.vcproj
index 5b841cf..c6d898d 100644
--- a/build/win32/vs9/gtk3-install.vcproj
+++ b/build/win32/vs9/gtk3-install.vcproj
@@ -29,7 +29,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
+                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -42,7 +42,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
+                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -56,7 +56,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
+                               
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -69,7 +69,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
+                               
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -84,7 +84,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
+                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -98,7 +98,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)"
+                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -113,7 +113,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
+                               
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
                        />
                </Configuration>
                <Configuration
@@ -127,7 +127,7 @@
                        >
                        <Tool
                                Name="VCPreBuildEventTool"
-                               CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)"
+                               
CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
                        />
                </Configuration>
        </Configurations>
diff --git a/build/win32/vs9/gtk3-install.vspropsin b/build/win32/vs9/gtk3-install.vspropsin
index d3e46c0..9a58be1 100644
--- a/build/win32/vs9/gtk3-install.vspropsin
+++ b/build/win32/vs9/gtk3-install.vspropsin
@@ -128,20 +128,24 @@ copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-
+                     "
+       />
+       <UserMacro
+               Name="GtkPostInstall"
+               Value="
 echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
 $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 
 echo &quot;Generating icon cache...&quot;&#x0D;&#x0A;
 $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force 
&quot;$(CopyDir)\share\icons\hicolor&quot;
-"
- />
- <UserMacro
-  Name="GtkDoInstallBroadwayHeaders"
-  Value="
+                     "
+       />
+       <UserMacro
+               Name="GtkDoInstallBroadwayHeaders"
+               Value="
 copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
 #include "gdk3-broadway.headers"
-        "
- />
+                     "
+       />
 </VisualStudioPropertySheet>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]