Update Visual Studio property sheets

Add commands to be used for building introspection files.

diff --git a/build/win32/vs10/pango.propsin b/build/win32/vs10/pango.propsin
index b91ce84..750663a 100644 (file)
--- a/build/win32/vs10/pango.propsin
+++ b/build/win32/vs10/pango.propsin
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
+    <VSVer>10</VSVer>
+    <GlibEtcInstallRoot>..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+    <GlibEtcInstallRootFromBuildWin32>..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRootFromBuildWin32>
+    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <PangoApiVersion>1.0</PangoApiVersion>
     <PangoBinaryVersion>1.8.0</PangoBinaryVersion>
     <PangoDummyPrefix>/dummy</PangoDummyPrefix>
     <PangoDefines>G_LOG_DOMAIN="Pango";PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR="$(PangoDummyPrefix)/etc";LIBDIR="$(PangoDummyPrefix)/lib"</PangoDefines>
     <NoFCDef>PANGO_VISUALC_NO_FC</NoFCDef>
-       <GlibEtcInstallRoot>..\..\..\..\vs10\$(Platform)</GlibEtcInstallRoot>
-       <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
     <PangoDoInstall>
 echo on
 
@@ -59,12 +61,27 @@ copy ..\..\..\pango\pango-ot.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
 copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
 
 </PangoInstallFCHeaders>
+<DoGenGir>
+set VSVER=$(VSVer)
+
+set CONF=$(Configuration)
+
+set PLAT=$(Platform)
+
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)
+
+cd ..
+
+call gengir_pango.bat
+
+cd vs$(VSVer)
+</DoGenGir>
     <PangoLibtoolCompatibleDllPrefix>lib</PangoLibtoolCompatibleDllPrefix>
     <PangoLibtoolCompatibleDllSuffix>-$(PangoApiVersion)-0</PangoLibtoolCompatibleDllSuffix>
-    <PangoSeparateVS10DllPrefix />
-    <PangoSeparateVS10DllSuffix>-1-vs10</PangoSeparateVS10DllSuffix>
-    <PangoDllPrefix>$(PangoSeparateVS10DllPrefix)</PangoDllPrefix>
-    <PangoDllSuffix>$(PangoSeparateVS10DllSuffix)</PangoDllSuffix>
+    <PangoSeparateVSDllPrefix />
+    <PangoSeparateVSDllSuffix>-1-vs$(VSVer)</PangoSeparateVSDllSuffix>
+    <PangoDllPrefix>$(PangoSeparateVSDllPrefix)</PangoDllPrefix>
+    <PangoDllSuffix>$(PangoSeparateVSDllSuffix)</PangoDllSuffix>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>pangoprops</_PropertySheetDisplayName>
@@ -150,17 +167,20 @@ copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WI
     <BuildMacro Include="PangoInstallFCHeaders">
       <Value>$(PangoInstallFCHeaders)</Value>
     </BuildMacro>
+    <BuildMacro Include="DoGenGir">
+      <Value>$(DoGenGir)</Value>
+    </BuildMacro>
     <BuildMacro Include="PangoLibtoolCompatibleDllPrefix">
       <Value>$(PangoLibtoolCompatibleDllPrefix)</Value>
     </BuildMacro>
     <BuildMacro Include="PangoLibtoolCompatibleDllSuffix">
       <Value>$(PangoLibtoolCompatibleDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="PangoSeparateVS10DllPrefix">
-      <Value>$(PangoSeparateVS10DllPrefix)</Value>
+    <BuildMacro Include="PangoSeparateVSDllPrefix">
+      <Value>$(PangoSeparateVSDllPrefix)</Value>
     </BuildMacro>
-    <BuildMacro Include="PangoSeparateVS10DllSuffix">
-      <Value>$(PangoSeparateVS10DllSuffix)</Value>
+    <BuildMacro Include="PangoSeparateVSDllSuffix">
+      <Value>$(PangoSeparateVSDllSuffix)</Value>
     </BuildMacro>
     <BuildMacro Include="PangoDllPrefix">
       <Value>$(PangoDllPrefix)</Value>

diff --git a/build/win32/vs9/pango.vspropsin b/build/win32/vs9/pango.vspropsin
index 6a6e204..6987345 100644 (file)
--- a/build/win32/vs9/pango.vspropsin
+++ b/build/win32/vs9/pango.vspropsin
@@ -46,8 +46,16 @@ copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\DONE_MODULE_DEFS_WI
 "
        />
        <UserMacro
+               Name="VSVer"
+               Value="9"
+       />
+       <UserMacro
                Name="GlibEtcInstallRoot"
-               Value="..\..\..\..\vs9\$(PlatformName)"
+               Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
+       />
+       <UserMacro
+               Name="GlibEtcInstallRootFromBuildWin32"
+               Value="..\..\..\vs$(VSVer)\$(PlatformName)"
        />
        <UserMacro
                Name="CopyDir"
@@ -110,6 +118,19 @@ copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
 "
        />
        <UserMacro
+               Name="DoGenGir"
+               Value="
+set VSVER=$(VSVer)&#x0D;&#x0A;
+set CONF=$(ConfigurationName)&#x0D;&#x0A;
+set PLAT=$(PlatformName)&#x0D;&#x0A;
+set BASEDIR=$(GlibEtcInstallRootFromBuildWin32)&#x0D;&#x0A;
+
+cd ..&#x0D;&#x0A;
+call gengir_pango.bat&#x0D;&#x0A;
+cd vs$(VSVer)&#x0D;&#x0A;
+                         "
+       />
+       <UserMacro
                Name="PangoLibtoolCompatibleDllPrefix"
                Value="lib"
        />
@@ -118,21 +139,21 @@ copy ..\..\..\pango\pangoft2.h $(CopyDir)\include\pango-$(PangoApiVersion)\pango
                Value="-$(PangoApiVersion)-0"
        />
        <UserMacro
-               Name="PangoSeparateVS9DllPrefix"
+               Name="PangoSeparateVSDllPrefix"
                Value=""
        />
        <UserMacro
-               Name="PangoSeparateVS9DllSuffix"
-               Value="-1-vs9"
+               Name="PangoSeparateVSDllSuffix"
+               Value="-1-vs$(VSVer)"
        />
        <!-- Change these two to PangoLibtoolCompatibleDllPrefix and
        PangoLibtoolCompatibleDllSuffix if that is what you want -->
        <UserMacro
                Name="PangoDllPrefix"
-               Value="$(PangoSeparateVS9DllPrefix)"
+               Value="$(PangoSeparateVSDllPrefix)"
        />
        <UserMacro
                Name="PangoDllSuffix"
-               Value="$(PangoSeparateVS9DllSuffix)"
+               Value="$(PangoSeparateVSDllSuffix)"
        />
 </VisualStudioPropertySheet>