[gtk+/gtk-2-24] Visual Studio builds: Make .pc generation optional

[Chun-wei Fan <fanchunwei src gnome org>]

commit 4cd65c7c5be5435729e1bf1bdfe517ca3ffc507e
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Nov 15 18:29:42 2016 +0800

    Visual Studio builds: Make .pc generation optional
    
    Generate the .pc files when a Python installation can be found at the
    location specified by PythonPath (32-bit) or PythonPathX64 (64-bit), which
    is found in gtk-version-paths.[vsprops|props].

 build/win32/vs10/gtk-install.propsin  |   14 +++++++-------
 build/win32/vs9/gtk-install.vspropsin |   14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/build/win32/vs10/gtk-install.propsin b/build/win32/vs10/gtk-install.propsin
index 910218c..e992895 100644
--- a/build/win32/vs10/gtk-install.propsin
+++ b/build/win32/vs10/gtk-install.propsin
@@ -61,14 +61,14 @@ copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-2.0\gtkrc
 
 if exist $(CopyDir)\share\icons\hicolor $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index 
--force "$(CopyDir)\share\icons\hicolor"
 
-mkdir $(CopyDir)\lib\pkgconfig
-copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-2.0.pc
-copy "..\gtk+-2.0.pc" "$(CopyDir)\lib\pkgconfig"
-copy "..\gtk+-2.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-2.0.pc"
+if exist ..\gtk+-2.0.pc mkdir $(CopyDir)\lib\pkgconfig
+if exist ..\gdk-2.0.pc copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig
+if exist ..\gdk-2.0.pc copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-2.0.pc
+if exist ..\gtk+-2.0.pc copy "..\gtk+-2.0.pc" "$(CopyDir)\lib\pkgconfig"
+if exist ..\gtk+-2.0.pc copy "..\gtk+-2.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-2.0.pc"
 </GtkDoInstall>
-    <GenerateGtkPC>$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) 
--host=i686-pc-vs$(VSVer)</GenerateGtkPC>
-    <GenerateGtkPCX64>$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) 
--host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
+    <GenerateGtkPC>if exist $(PythonPath)\python.exe $(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) 
--version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
+    <GenerateGtkPCX64>if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python ..\gtkpc.py 
--prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
     
<GtkPCFiles>$(SolutionDir)\..\gdk-2.0.pc;$(SolutionDir)\..\gtk+-2.0.pc;$(SolutionDir)\..\gail.pc</GtkPCFiles>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/build/win32/vs9/gtk-install.vspropsin b/build/win32/vs9/gtk-install.vspropsin
index 8da8207..6544f2b 100644
--- a/build/win32/vs9/gtk-install.vspropsin
+++ b/build/win32/vs9/gtk-install.vspropsin
@@ -62,19 +62,19 @@ copy ..\..\..\gtk\gtkrc.default $(CopyDir)\share\themes\Raleigh\gtk-$(ApiVersion
 
 if exist $(CopyDir)\share\icons\hicolor $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index 
--force &quot;$(CopyDir)\share\icons\hicolor&quot;&#x0D;&#x0A;
 
-mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-2.0.pc&#x0D;&#x0A;
-copy &quot;..\gtk+-2.0.pc&quot; &quot;$(CopyDir)\lib\pkgconfig&quot;&#x0D;&#x0A;
-copy &quot;..\gtk+-2.0.pc&quot; &quot;$(CopyDir)\lib\pkgconfig\gtk+-win32-2.0.pc&quot;&#x0D;&#x0A;
+if exist ..\gtk+-2.0.pc mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
+if exist ..\gdk-2.0.pc copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
+if exist ..\gdk-2.0.pc copy ..\gdk-2.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-2.0.pc&#x0D;&#x0A;
+if exist ..\gtk+-2.0.pc copy &quot;..\gtk+-2.0.pc&quot; &quot;$(CopyDir)\lib\pkgconfig&quot;&#x0D;&#x0A;
+if exist ..\gtk+-2.0.pc copy &quot;..\gtk+-2.0.pc&quot; 
&quot;$(CopyDir)\lib\pkgconfig\gtk+-win32-2.0.pc&quot;&#x0D;&#x0A;
                      "
        />
        <UserMacro
                Name="GenerateGtkPC"
-               Value="$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) 
--host=i686-pc-vs$(VSVer)"
+               Value="if exist $(PythonPath)\python.exe $(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) 
--version=$(GtkVersion) --host=i686-pc-vs$(VSVer)"
        />
        <UserMacro
                Name="GenerateGtkPCX64"
-               Value="$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) 
--host=x86_64-pc-vs$(VSVer)"
+               Value="if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python ..\gtkpc.py 
--prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)"
        />
 </VisualStudioPropertySheet>