isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-25 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename conform/interactive tests VS projects

Browse Source 
Add a -clutter suffix for their project names to avoid clashes with the
COGL test executables
This commit is contained in:
Chun-wei Fan 2011-10-20 16:35:38 +08:00
parent 3d74552684
commit a36ab5787b
13 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/win32/vs10/Makefile.am
View File

@ -18,14 +18,14 @@ EXTRA_DIST = \
install.vcxproj \ install.vcxproj \
test-cogl-perf.vcxproj \ test-cogl-perf.vcxproj \
test-cogl-perf.vcxproj.filters \ test-cogl-perf.vcxproj.filters \
test-conformance.vcxproj \ test-conformance-clutter.vcxproj \
test-conformance.vcxprojin \ test-conformance-clutter.vcxprojin \
test-conformance.vcxproj.filters \ test-conformance-clutter.vcxproj.filters \
test-conformance.vcxproj.filtersin \ test-conformance-clutter.vcxproj.filtersin \
test-interactive.vcxproj \ test-interactive-clutter.vcxproj \
test-interactive.vcxprojin \ test-interactive-clutter.vcxprojin \
test-interactive.vcxproj.filters \ test-interactive-clutter.vcxproj.filters \
test-interactive.vcxproj.filtersin \ test-interactive-clutter.vcxproj.filtersin \
test-picking.vcxproj \ test-picking.vcxproj \
test-picking.vcxproj.filters \ test-picking.vcxproj.filters \
test-random-text.vcxproj \ test-random-text.vcxproj \

4
build/win32/vs10/clutter.sln
View File

@ -23,9 +23,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-atkevents-example", "
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "cally-clone-example.vcxproj", "{E77D40D0-19D4-4865-BE20-B6DA05BA234D}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "cally-clone-example.vcxproj", "{E77D40D0-19D4-4865-BE20-B6DA05BA234D}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance", "test-conformance.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcxproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive", "test-interactive.vcxproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcxproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{35B2A4AC-7235-4FC7-995D-469D59195041}"
EndProject EndProject

4
build/win32/vs10/install.vcxproj
View File

@ -118,11 +118,11 @@
<Project>{0da94d83-b64e-40ac-8074-96c2416bbbe8}</Project> <Project>{0da94d83-b64e-40ac-8074-96c2416bbbe8}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="test-conformance.vcxproj"> <ProjectReference Include="test-conformance-clutter.vcxproj">
<Project>{0f08f253-de1a-40cb-a890-93ae3ca23ade}</Project> <Project>{0f08f253-de1a-40cb-a890-93ae3ca23ade}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="test-interactive.vcxproj"> <ProjectReference Include="test-interactive-clutter.vcxproj">
<Project>{75f9e5af-040c-448e-96be-c282efffe2d9}</Project> <Project>{75f9e5af-040c-448e-96be-c282efffe2d9}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>

0
build/win32/vs10/test-conformance.vcxproj.filtersin → build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
View File

2
build/win32/vs10/test-conformance.vcxprojin → build/win32/vs10/test-conformance-clutter.vcxprojin
View File

@ -20,7 +20,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}</ProjectGuid> <ProjectGuid>{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}</ProjectGuid>
<RootNamespace>testconformance</RootNamespace> <RootNamespace>testconformanceclutter</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

0
build/win32/vs10/test-interactive.vcxproj.filtersin → build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
View File

2
build/win32/vs10/test-interactive.vcxprojin → build/win32/vs10/test-interactive-clutter.vcxprojin
View File

@ -20,7 +20,7 @@
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<ProjectGuid>{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}</ProjectGuid> <ProjectGuid>{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}</ProjectGuid>
<RootNamespace>testinteractive</RootNamespace> <RootNamespace>testinteractiveclutter</RootNamespace>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

8
build/win32/vs9/Makefile.am
View File

@ -10,10 +10,10 @@ EXTRA_DIST = \
clutter.vsprops \ clutter.vsprops \
install.vcproj \ install.vcproj \
test-cogl-perf.vcproj \ test-cogl-perf.vcproj \
test-conformance.vcproj \ test-conformance-clutter.vcproj \
test-conformance.vcprojin \ test-conformance-clutter.vcprojin \
test-interactive.vcproj \ test-interactive-clutter.vcproj \
test-interactive.vcprojin \ test-interactive-clutter.vcprojin \
test-picking.vcproj \ test-picking.vcproj \
test-random-text.vcproj \ test-random-text.vcproj \
test-text-perf.vcproj \ test-text-perf.vcproj \

4
build/win32/vs9/clutter.sln
View File

@ -53,12 +53,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cally-clone-example", "call
{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance", "test-conformance.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-conformance-clutter", "test-conformance-clutter.vcproj", "{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive", "test-interactive.vcproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-interactive-clutter", "test-interactive-clutter.vcproj", "{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8} {EA036190-0950-4640-84F9-D459A33B33A8} = {EA036190-0950-4640-84F9-D459A33B33A8}
EndProjectSection EndProjectSection

4
build/win32/vs9/test-conformance.vcprojin → build/win32/vs9/test-conformance-clutter.vcprojin
View File

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="test-conformance" Name="test-conformance-clutter"
ProjectGUID="{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}" ProjectGUID="{0F08F253-DE1A-40CB-A890-93AE3CA23ADE}"
RootNamespace="testconformance" RootNamespace="testconformanceclutter"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >

4
build/win32/vs9/test-interactive.vcprojin → build/win32/vs9/test-interactive-clutter.vcprojin
View File

@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="test-interactive" Name="test-interactive-clutter"
ProjectGUID="{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}" ProjectGUID="{75F9E5AF-040C-448E-96BE-C282EFFFE2D9}"
RootNamespace="testinteractive" RootNamespace="testinteractiveclutter"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >

20
tests/conform/Makefile.am
View File

@ -290,42 +290,42 @@ HTML_REPORTS = \
EXTRA_DIST = ADDING_NEW_TESTS test-launcher.sh.in run-tests.sh EXTRA_DIST = ADDING_NEW_TESTS test-launcher.sh.in run-tests.sh
DISTCLEANFILES = test-launcher.sh .gitignore DISTCLEANFILES = test-launcher.sh .gitignore
dist-hook: ../../build/win32/vs9/test-conformance.vcproj ../../build/win32/vs10/test-conformance.vcxproj ../../build/win32/vs10/test-conformance.vcxproj.filters dist-hook: ../../build/win32/vs9/test-conformance-clutter.vcproj ../../build/win32/vs10/test-conformance-clutter.vcxproj ../../build/win32/vs10/test-conformance-clutter.vcxproj.filters
../../build/win32/vs9/test-conformance.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance.vcprojin ../../build/win32/vs9/test-conformance-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin
for F in $(test_conformance_SOURCES); do \ for F in $(test_conformance_SOURCES); do \
case $$F in \ case $$F in \
*.c) echo ' <File RelativePath="..\..\..\tests\conform\'$$F'" />' \ *.c) echo ' <File RelativePath="..\..\..\tests\conform\'$$F'" />' \
;; \ ;; \
esac; \ esac; \
done >testconformance.sourcefiles done >testconformance.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance.vcprojin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin >$@
rm testconformance.sourcefiles rm testconformance.sourcefiles
../../build/win32/vs10/test-conformance.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance.vcxprojin ../../build/win32/vs10/test-conformance-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin
for F in $(test_conformance_SOURCES); do \ for F in $(test_conformance_SOURCES); do \
case $$F in \ case $$F in \
*.c) echo ' <ClCompile Include="..\..\..\tests\conform\'$$F'" />' \ *.c) echo ' <ClCompile Include="..\..\..\tests\conform\'$$F'" />' \
;; \ ;; \
esac; \ esac; \
done >testconformance.vs10.sourcefiles done >testconformance.vs10.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance.vcxprojin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin >$@
rm testconformance.vs10.sourcefiles rm testconformance.vs10.sourcefiles
../../build/win32/vs10/test-conformance.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-conformance.vcxproj.filtersin ../../build/win32/vs10/test-conformance-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin
for F in $(test_conformance_SOURCES); do \ for F in $(test_conformance_SOURCES); do \
case $$F in \ case $$F in \
*.c) echo ' <ClCompile Include="..\..\..\tests\conform\'$$F'"><Filter>Sources</Filter></ClCompile>' \ *.c) echo ' <ClCompile Include="..\..\..\tests\conform\'$$F'"><Filter>Sources</Filter></ClCompile>' \
;; \ ;; \
esac; \ esac; \
done >testconformance.vs10.sourcefiles.filters done >testconformance.vs10.sourcefiles.filters
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance.vcxproj.filtersin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin >$@
rm testconformance.vs10.sourcefiles.filters rm testconformance.vs10.sourcefiles.filters
# Let the VS9/VS10 Project files be cleared out before they are re-expanded... # Let the VS9/VS10 Project files be cleared out before they are re-expanded...
DISTCLEANFILES += ../../build/win32/vs9/test-conformance.vcproj \ DISTCLEANFILES += ../../build/win32/vs9/test-conformance-clutter.vcproj \
../../build/win32/vs10/test-conformance.vcxproj \ ../../build/win32/vs10/test-conformance-clutter.vcxproj \
../../build/win32/vs10/test-conformance.vcxproj.filters ../../build/win32/vs10/test-conformance-clutter.vcxproj.filters
# we override the clean-generic target to clean up the wrappers so # we override the clean-generic target to clean up the wrappers so
# we cannot use CLEANFILES # we cannot use CLEANFILES

20
tests/interactive/Makefile.am
View File

@ -166,9 +166,9 @@ DISTCLEANFILES = wrapper.sh .gitignore test-unit-names.h
BUILT_SOURCES = wrappers test-unit-names.h 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 dist-hook: ../../build/win32/vs9/test-interactive-clutter.vcproj ../../build/win32/vs10/test-interactive-clutter.vcxproj ../../build/win32/vs10/test-interactive-clutter.vcxproj.filters
../../build/win32/vs9/test-interactive.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive.vcprojin ../../build/win32/vs9/test-interactive-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin
for F in $(test_interactive_SOURCES); do \ for F in $(test_interactive_SOURCES); do \
case $$F in \ case $$F in \
test-pixmap.c|test-devices.c) ;; \ test-pixmap.c|test-devices.c) ;; \
@ -176,10 +176,10 @@ dist-hook: ../../build/win32/vs9/test-interactive.vcproj ../../build/win32/vs10/
;; \ ;; \
esac; \ esac; \
done >testinteractive.sourcefiles done >testinteractive.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive.vcprojin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin >$@
rm testinteractive.sourcefiles rm testinteractive.sourcefiles
../../build/win32/vs10/test-interactive.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive.vcxprojin ../../build/win32/vs10/test-interactive-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin
for F in $(test_interactive_SOURCES); do \ for F in $(test_interactive_SOURCES); do \
case $$F in \ case $$F in \
test-pixmap.c|test-devices.c) ;; \ test-pixmap.c|test-devices.c) ;; \
@ -187,10 +187,10 @@ dist-hook: ../../build/win32/vs9/test-interactive.vcproj ../../build/win32/vs10/
;; \ ;; \
esac; \ esac; \
done >testinteractive.vs10.sourcefiles done >testinteractive.vs10.sourcefiles
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive.vcxprojin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin >$@
rm testinteractive.vs10.sourcefiles rm testinteractive.vs10.sourcefiles
../../build/win32/vs10/test-interactive.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive.vcxproj.filtersin ../../build/win32/vs10/test-interactive-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
for F in $(test_interactive_SOURCES); do \ for F in $(test_interactive_SOURCES); do \
case $$F in \ case $$F in \
test-pixmap.c|test-devices.c) ;; \ test-pixmap.c|test-devices.c) ;; \
@ -198,12 +198,12 @@ dist-hook: ../../build/win32/vs9/test-interactive.vcproj ../../build/win32/vs10/
;; \ ;; \
esac; \ esac; \
done >testinteractive.vs10.sourcefiles.filters done >testinteractive.vs10.sourcefiles.filters
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive.vcxproj.filtersin >$@ $(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin >$@
rm testinteractive.vs10.sourcefiles.filters rm testinteractive.vs10.sourcefiles.filters
# Let the VS9/VS10 Project files be cleared out before they are re-expanded... # Let the VS9/VS10 Project files be cleared out before they are re-expanded...
DISTCLEANFILES += ../../build/win32/vs9/test-interactive.vcproj \ DISTCLEANFILES += ../../build/win32/vs9/test-interactive-clutter.vcproj \
../../build/win32/vs10/test-interactive.vcxproj \ ../../build/win32/vs10/test-interactive-clutter.vcxproj \
../../build/win32/vs10/test-interactive.vcxproj.filters ../../build/win32/vs10/test-interactive-clutter.vcxproj.filters
clean-local: clean-wrappers clean-local: clean-wrappers