[clutter/msvc-support-master: 12/12] Merge branch 'master' into msvc-support-master

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

commit f0dfd8ab07809ae54667e5dcea581f429d476d2f
Merge: 9e822d9 7d51555
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Sep 29 16:33:02 2011 +0800

    Merge branch 'master' into msvc-support-master
    
    Conflicts:
    	tests/interactive/Makefile.am

 clutter/clutter-debug.h                            |    3 +-
 clutter/clutter-deform-effect.c                    |   20 ++
 clutter/clutter-main.c                             |    3 +-
 clutter/clutter-texture.c                          |  278 +++++++++-----------
 configure.ac                                       |    2 +-
 po/te.po                                           |   83 +++---
 tests/interactive/Makefile.am                      |   27 ++-
 tests/interactive/test-animation.c                 |    6 +
 tests/interactive/test-cairo-clock.c               |    6 +
 tests/interactive/test-constraints.c               |    6 +
 tests/interactive/test-drop.c                      |    6 +
 tests/interactive/test-easing.c                    |    6 +
 tests/interactive/test-main.c                      |  210 +++++++++++++--
 tests/interactive/test-table-layout.c              |    6 +
 tests/interactive/test-text-field.c                |   11 +
 tests/interactive/test-texture-async.c             |   69 +++---
 .../{test-textures.c => test-texture-slicing.c}    |    6 +
 17 files changed, 486 insertions(+), 262 deletions(-)
---
diff --cc tests/interactive/Makefile.am
index 65ab1e8,eb4bde6..175fcb7
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@@ -72,9 -72,9 +72,9 @@@ SHEXT = $(EXEEXT
  endif
  
  # For convenience, this provides a way to easily run individual unit tests:
 -wrappers: stamp-test-interactive
 +wrappers: stamp-test-interactive ../../build/win32/test-interactive.bat
  	@true
- stamp-test-interactive: Makefile test-interactive$(EXEEXT)
+ stamp-test-interactive: Makefile
  	@wrapper=$(abs_builddir)/wrapper.sh ; \
  	chmod +x $$wrapper && \
  	( echo "/stamp-test-interactive" ; \
@@@ -93,20 -95,21 +95,35 @@@
  	done \
  	&& echo timestamp > $(@F)
  
 +../../build/win32/test-interactive.bat: Makefile test-interactive$(EXEEXT)
 +	echo "  GEN    test-interactive.bat" ; \
 +	for i in $(UNIT_TESTS); \
 +	do \
 +		case $$i in \
 +		test-pixmap.c|test-devices.c) ;; \
 +		*.c)	test_bin=$${i%*.c} \
 +			;; \
 +		esac; \
 +		( echo "test-interactive $$test_bin" ) > $$test_bin.bat ; \
 +		( echo "test-interactive $$test_bin" ) >> test-interactive.bat ; \
 +	done \
 +	&& cp *.bat $(top_srcdir)/build/win32/
 +
+ test-unit-names.h: stamp-test-unit-names
+ 	@true
+ 
+ stamp-test-unit-names: Makefile
+ 	@( echo "/* ** This file is autogenerated. Do not edit. ** */" ; \
+ 	  echo "" ; \
+ 	  echo "const char *test_unit_names[] = {" ) > test-unit-names.h ; \
+ 	for i in $(UNIT_TESTS); \
+ 	do \
+ 		test_bin=$${i%*.c} ; \
+ 		echo "  \"$$test_bin\"," >> test-unit-names.h ; \
+ 	done \
+ 	&& echo "};" >> test-unit-names.h \
+ 	&& echo timestamp > $(@F)
+ 
  clean-wrappers:
  	@for i in $(UNIT_TESTS); \
  	do \
@@@ -142,48 -143,8 +159,48 @@@ test_interactive_LDFLAGS = -export-dyna
  test_interactive_LDADD = $(CLUTTER_LIBS) $(common_ldadd) -lm
  
  EXTRA_DIST = wrapper.sh.in
- DISTCLEANFILES = wrapper.sh .gitignore
+ DISTCLEANFILES = wrapper.sh .gitignore test-unit-names.h
  
- BUILT_SOURCES = wrappers
+ BUILT_SOURCES = wrappers test-unit-names.h
  
 +dist-hook: ../../build/win32/vs9/test-interactive.vcproj ../../build/win32/vs10/test-interactive.vcxproj ../../build/win32/vs10/test-interactive.vcxproj.filters
 +
 +../../build/win32/vs9/test-interactive.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive.vcprojin
 +	for F in $(test_interactive_SOURCES); do \
 +		case $$F in \
 +		test-pixmap.c|test-devices.c) ;; \
 +		*.c)	echo '   <File RelativePath="..\..\..\tests\interactive\'$$F'" />' \
 +			;; \
 +		esac; \
 +	done >testinteractive.sourcefiles
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive.vcprojin >$@
 +	rm testinteractive.sourcefiles
 +	
 +../../build/win32/vs10/test-interactive.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive.vcxprojin
 +	for F in $(test_interactive_SOURCES); do \
 +		case $$F in \
 +		test-pixmap.c|test-devices.c) ;; \
 +		*.c)	echo '    <ClCompile Include="..\..\..\tests\interactive\'$$F'" />' \
 +			;; \
 +		esac; \
 +	done >testinteractive.vs10.sourcefiles
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive.vcxprojin >$@
 +	rm testinteractive.vs10.sourcefiles
 +	
 +../../build/win32/vs10/test-interactive.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive.vcxproj.filtersin
 +	for F in $(test_interactive_SOURCES); do \
 +		case $$F in \
 +		test-pixmap.c|test-devices.c) ;; \
 +		*.c)	echo '    <ClCompile Include="..\..\..\tests\interactive\'$$F'"><Filter>Sources</Filter></ClCompile>' \
 +			;; \
 +		esac; \
 +	done >testinteractive.vs10.sourcefiles.filters
 +	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive.vcxproj.filtersin >$@
 +	rm testinteractive.vs10.sourcefiles.filters
 +
 +# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
 +DISTCLEANFILES += ../../build/win32/vs9/test-interactive.vcproj	\
 +		  ../../build/win32/vs10/test-interactive.vcxproj	\
 +		  ../../build/win32/vs10/test-interactive.vcxproj.filters
 +
  clean-local: clean-wrappers