[clutter/msvc-support] Update VS property sheets

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

commit c022102f8c672ec6f12d174ddba871ec614a9e4c
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Sep 6 14:35:24 2011 +0800

    Update VS property sheets
    
    -"Install" the cookbook example code for people to refer to and try out
    -When the test data files are "installed", install them to a location that
     better suits the "normal way" how software is installed on autotools
     builds.

 build/win32/vs10/clutter.props  |   20 +++++++++++++++-----
 build/win32/vs9/clutter.vsprops |   16 +++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/build/win32/vs10/clutter.props b/build/win32/vs10/clutter.props
index 1c55ae1..cdf994f 100644
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@ -11,7 +11,7 @@
     <ReleaseLibBuildDefines>$(LibBuildDefines);G_DISABLE_ASSERT;G_DISABLE_CHECKS;G_DISABLE_CAST_CHECKS</ReleaseLibBuildDefines>
     <ClutterBuildDefines>$(BaseBuildDef);G_LOG_DOMAIN="Clutter";CLUTTER_PREFIX="../";CLUTTER_LIBDIR="../lib";CLUTTER_DATADIR="../share";CLUTTER_LOCALEDIR="../share/locale"</ClutterBuildDefines>
     <CallyTestDefs>$(BaseWinBuildDef);PREFIXDIR="/some/dummy/dir"</CallyTestDefs>
-    <TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../tests/data"</TestProgDef>
+    <TestProgDef>$(BaseBuildDef);TESTS_DATADIR="../share/clutter-$(ClutterApiVersion)/data"</TestProgDef>
     <PreBuildCmd>
 if exist ..\..\..\config.h goto DONE_CONFIG_H
 
@@ -85,7 +85,7 @@ mkdir $(CopyDir)
 
 mkdir $(CopyDir)\bin
 
-mkdir $(CopyDir)\tests\data
+mkdir $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
 
 copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.dll $(CopyDir)\bin
 
@@ -94,11 +94,11 @@ copy $(SolutionDir)$(Configuration)\$(Platform)\bin\*.exe $(CopyDir)\bin
 
 copy ..\*.bat $(CopyDir)\bin
 
-copy ..\..\..\tests\data\*.png $(CopyDir)\tests\data
+copy ..\..\..\tests\data\*.png $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
 
-copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\tests\data
+copy ..\..\..\tests\data\clutter-1.0.suppressions $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
 
-copy ..\..\..\tests\data\*.json $(CopyDir)\tests\data
+copy ..\..\..\tests\data\*.json $(CopyDir)\share\clutter-$(ClutterApiVersion)\data
 
 
 mkdir $(CopyDir)\lib
@@ -313,6 +313,16 @@ copy ..\..\..\clutter\cally\cally-texture.h $(CopyDir)\include\clutter-$(Clutter
 copy ..\..\..\clutter\cally\cally-util.h $(CopyDir)\include\clutter-$(ClutterApiVersion)\cally
 
 
+mkdir $(CopyDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples
+
+copy ..\..\..\doc\cookbook\examples\*.c $(CopyDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples
+
+copy ..\..\..\doc\cookbook\examples\*.h $(CopyDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples
+
+copy ..\..\..\doc\cookbook\examples\*.json $(CopyDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples
+
+copy ..\..\..\doc\cookbook\examples\*.png $(CopyDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples
+
 </ClutterDoInstall>
     <GenerateClutterDef>
          echo EXPORTS &gt; ..\..\..\clutter\clutter.def
diff --git a/build/win32/vs9/clutter.vsprops b/build/win32/vs9/clutter.vsprops
index 0897bb1..e19edcf 100644
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@ -56,7 +56,7 @@
 	/>
 	<UserMacro
 		Name="TestProgDef"
-		Value="$(BaseBuildDef);TESTS_DATADIR=\&quot;../tests/data\&quot;"
+		Value="$(BaseBuildDef);TESTS_DATADIR=\&quot;../share/clutter-$(ClutterApiVersion)/data\&quot;"
 	/>
 	<UserMacro
 		Name="PreBuildCmd"
@@ -104,14 +104,14 @@ cd ..\build\win32\vs9&#x0D;&#x0A;
 		Value="
 mkdir $(OutDir)&#x0D;&#x0A;
 mkdir $(OutDir)\bin&#x0D;&#x0A;
-mkdir $(OutDir)\tests\data&#x0D;&#x0A;
+mkdir $(OutDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
 
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
 copy ..\*.bat $(OutDir)\bin&#x0D;&#x0A;
-copy ..\..\..\tests\data\*.png $(OutDir)\tests\data&#x0D;&#x0A;
-copy ..\..\..\tests\data\clutter-1.0.suppressions $(OutDir)\tests\data&#x0D;&#x0A;
-copy ..\..\..\tests\data\*.json $(OutDir)\tests\data&#x0D;&#x0A;
+copy ..\..\..\tests\data\*.png $(OutDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
+copy ..\..\..\tests\data\clutter-1.0.suppressions $(OutDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
+copy ..\..\..\tests\data\*.json $(OutDir)\share\clutter-$(ClutterApiVersion)\data&#x0D;&#x0A;
 
 mkdir $(OutDir)\lib&#x0D;&#x0A;
 copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\*-$(ClutterApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
@@ -221,6 +221,12 @@ copy ..\..\..\clutter\cally\cally-text.h $(OutDir)\include\clutter-$(ClutterApiV
 copy ..\..\..\clutter\cally\cally-texture.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
 copy ..\..\..\clutter\cally\cally-util.h $(OutDir)\include\clutter-$(ClutterApiVersion)\cally&#x0D;&#x0A;
 
+mkdir $(OutDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples&#x0D;&#x0A;
+copy ..\..\..\doc\cookbook\examples\*.c $(OutDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples&#x0D;&#x0A;
+copy ..\..\..\doc\cookbook\examples\*.h $(OutDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples&#x0D;&#x0A;
+copy ..\..\..\doc\cookbook\examples\*.json $(OutDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples&#x0D;&#x0A;
+copy ..\..\..\doc\cookbook\examples\*.png $(OutDir)\share\clutter-$(ClutterApiVersion)\cookbook\examples&#x0D;&#x0A;
+
 "
 	/>
 	<UserMacro