build: Clean up the VS build rules
Some minor cleanups of the Visual Studio rules in the interactive and conformance test suites.
This commit is contained in:
parent
b62216955f
commit
73e7404652
1
.gitignore
vendored
1
.gitignore
vendored
@ -20,6 +20,7 @@ stamp-marshal
|
||||
/clutter/clutter-enum-types.[ch]
|
||||
/clutter/clutter-marshal.[ch]
|
||||
/clutter/clutter-version.h
|
||||
/clutter/clutter-version.h.win32
|
||||
/clutter/gcov-report.txt
|
||||
/clutter/clutter-json.h
|
||||
/clutter/cex100/clutter-cex100.h
|
||||
|
1
build/win32/.gitignore
vendored
Normal file
1
build/win32/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
*.bat
|
@ -128,13 +128,12 @@ stamp-test-conformance: Makefile $(srcdir)/test-conform-main.c
|
||||
echo " GEN $$unit"; \
|
||||
( echo "#!/bin/sh" ; echo "$(abs_builddir)/test-launcher.sh '$$i' \"\$$@\"" ) > $$unit$(SHEXT) ; \
|
||||
( echo "#!/bin/sh" ; echo "exec $(abs_builddir)/test-conformance$(EXEEXT) -p $$i \"\$$@\"" ) > wrappers/$$unit$(SHEXT) ; \
|
||||
( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) > $$unit-clutter.bat ; \
|
||||
( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) >> test-conformance.bat ; \
|
||||
( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) > $(top_builddir)/build/win32/$$unit-clutter.bat ; \
|
||||
( echo "test-conformance-clutter$(EXEEXT) -p $$i" ) >> $(top_builddir)/build/win32/test-conformance.bat ; \
|
||||
chmod +x $$unit$(SHEXT); \
|
||||
chmod +x wrappers/$$unit$(SHEXT); \
|
||||
echo "/$$unit$(SHEXT)" >> .gitignore; \
|
||||
done \
|
||||
&& cp *.bat $(top_srcdir)/build/win32/ \
|
||||
&& echo timestamp > $(@F)
|
||||
|
||||
clean-wrappers:
|
||||
@ -290,42 +289,42 @@ HTML_REPORTS = \
|
||||
EXTRA_DIST = ADDING_NEW_TESTS test-launcher.sh.in run-tests.sh
|
||||
DISTCLEANFILES = test-launcher.sh .gitignore
|
||||
|
||||
dist-hook: ../../build/win32/vs9/test-conformance-clutter.vcproj ../../build/win32/vs10/test-conformance-clutter.vcxproj ../../build/win32/vs10/test-conformance-clutter.vcxproj.filters
|
||||
dist-hook: $(top_builddir)/build/win32/vs9/test-conformance-clutter.vcproj $(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj $(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj.filters
|
||||
|
||||
../../build/win32/vs9/test-conformance-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin
|
||||
for F in $(test_conformance_SOURCES); do \
|
||||
$(top_builddir)/build/win32/vs9/test-conformance-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin
|
||||
@for F in $(test_conformance_SOURCES); do \
|
||||
case $$F in \
|
||||
*.c) echo ' <File RelativePath="..\..\..\tests\conform\'$$F'" />' \
|
||||
;; \
|
||||
esac; \
|
||||
done >testconformance.sourcefiles
|
||||
done > testconformance.sourcefiles
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-conformance-clutter.vcprojin >$@
|
||||
rm testconformance.sourcefiles
|
||||
|
||||
../../build/win32/vs10/test-conformance-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin
|
||||
for F in $(test_conformance_SOURCES); do \
|
||||
rm -f testconformance.sourcefiles
|
||||
|
||||
$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin
|
||||
@for F in $(test_conformance_SOURCES); do \
|
||||
case $$F in \
|
||||
*.c) echo ' <ClCompile Include="..\..\..\tests\conform\'$$F'" />' \
|
||||
;; \
|
||||
esac; \
|
||||
done >testconformance.vs10.sourcefiles
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxprojin >$@
|
||||
rm testconformance.vs10.sourcefiles
|
||||
rm -f testconformance.vs10.sourcefiles
|
||||
|
||||
../../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 \
|
||||
$(top_builddir)/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 \
|
||||
case $$F in \
|
||||
*.c) echo ' <ClCompile Include="..\..\..\tests\conform\'$$F'"><Filter>Sources</Filter></ClCompile>' \
|
||||
;; \
|
||||
esac; \
|
||||
done >testconformance.vs10.sourcefiles.filters
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-conformance-clutter.vcxproj.filtersin >$@
|
||||
rm testconformance.vs10.sourcefiles.filters
|
||||
rm -f testconformance.vs10.sourcefiles.filters
|
||||
|
||||
# Let the VS9/VS10 Project files be cleared out before they are re-expanded...
|
||||
DISTCLEANFILES += ../../build/win32/vs9/test-conformance-clutter.vcproj \
|
||||
../../build/win32/vs10/test-conformance-clutter.vcxproj \
|
||||
../../build/win32/vs10/test-conformance-clutter.vcxproj.filters
|
||||
DISTCLEANFILES += $(top_builddir)/build/win32/vs9/test-conformance-clutter.vcproj \
|
||||
$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj \
|
||||
$(top_builddir)/build/win32/vs10/test-conformance-clutter.vcxproj.filters
|
||||
|
||||
# we override the clean-generic target to clean up the wrappers so
|
||||
# we cannot use CLEANFILES
|
||||
|
@ -71,7 +71,7 @@ SHEXT = $(EXEEXT)
|
||||
endif
|
||||
|
||||
# For convenience, this provides a way to easily run individual unit tests:
|
||||
wrappers: stamp-test-interactive ../../build/win32/test-interactive-clutter.bat
|
||||
wrappers: stamp-test-interactive $(top_builddir)/build/win32/test-interactive-clutter.bat
|
||||
@true
|
||||
stamp-test-interactive: Makefile
|
||||
@wrapper=$(abs_builddir)/wrapper.sh ; \
|
||||
@ -94,8 +94,8 @@ stamp-test-interactive: Makefile
|
||||
done \
|
||||
&& echo timestamp > $(@F)
|
||||
|
||||
../../build/win32/test-interactive-clutter.bat: Makefile test-interactive$(EXEEXT)
|
||||
echo " GEN test-interactive-clutter.bat" ; \
|
||||
$(top_builddir)/build/win32/test-interactive-clutter.bat: Makefile test-interactive$(EXEEXT)
|
||||
@echo " GEN test-interactive-clutter.bat" ; \
|
||||
for i in $(UNIT_TESTS); \
|
||||
do \
|
||||
case $$i in \
|
||||
@ -106,10 +106,10 @@ stamp-test-interactive: Makefile
|
||||
( echo "test-interactive-clutter $$test_bin" ) > $$test_bin-clutter.bat ; \
|
||||
( echo "test-interactive-clutter $$test_bin" ) >> test-interactive-clutter.bat ; \
|
||||
done \
|
||||
&& cp *.bat $(top_srcdir)/build/win32/
|
||||
&& mv -f *.bat $(top_srcdir)/build/win32/
|
||||
|
||||
../../build/win32/test-unit-names.h: test-unit-names.h
|
||||
cp test-unit-names.h $(top_srcdir)/build/win32
|
||||
$(top_builddir)/build/win32/test-unit-names.h: test-unit-names.h
|
||||
@echo " CP "; cp test-unit-names.h $(top_srcdir)/build/win32
|
||||
|
||||
test-unit-names.h: stamp-test-unit-names
|
||||
@true
|
||||
@ -142,9 +142,7 @@ clean-wrappers:
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/clutter \
|
||||
-I$(top_srcdir)/clutter/cogl \
|
||||
-I$(top_builddir)/clutter \
|
||||
-I$(top_builddir)/clutter/cogl
|
||||
-I$(top_builddir)/clutter
|
||||
|
||||
common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_API_VERSION@.la
|
||||
|
||||
@ -167,7 +165,7 @@ BUILT_SOURCES = test-unit-names.h wrappers
|
||||
|
||||
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-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin
|
||||
$(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj: $(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin
|
||||
for F in $(test_interactive_SOURCES); do \
|
||||
case $$F in \
|
||||
test-pixmap.c|test-devices.c) ;; \
|
||||
@ -178,7 +176,7 @@ dist-hook: ../../build/win32/vs9/test-interactive-clutter.vcproj ../../build/win
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs9/test-interactive-clutter.vcprojin >$@
|
||||
rm testinteractive.sourcefiles
|
||||
|
||||
../../build/win32/vs10/test-interactive-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin
|
||||
for F in $(test_interactive_SOURCES); do \
|
||||
case $$F in \
|
||||
test-pixmap.c|test-devices.c) ;; \
|
||||
@ -189,7 +187,7 @@ dist-hook: ../../build/win32/vs9/test-interactive-clutter.vcproj ../../build/win
|
||||
$(CPP) -P - <$(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxprojin >$@
|
||||
rm testinteractive.vs10.sourcefiles
|
||||
|
||||
../../build/win32/vs10/test-interactive-clutter.vcxproj.filters: $(top_srcdir)/build/win32/vs10/test-interactive-clutter.vcxproj.filtersin
|
||||
$(top_builddir)/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 \
|
||||
case $$F in \
|
||||
test-pixmap.c|test-devices.c) ;; \
|
||||
@ -201,8 +199,8 @@ dist-hook: ../../build/win32/vs9/test-interactive-clutter.vcproj ../../build/win
|
||||
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-clutter.vcproj \
|
||||
../../build/win32/vs10/test-interactive-clutter.vcxproj \
|
||||
../../build/win32/vs10/test-interactive-clutter.vcxproj.filters
|
||||
DISTCLEANFILES += $(top_builddir)/build/win32/vs9/test-interactive-clutter.vcproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj \
|
||||
$(top_builddir)/build/win32/vs10/test-interactive-clutter.vcxproj.filters
|
||||
|
||||
clean-local: clean-wrappers
|
||||
|
Loading…
Reference in New Issue
Block a user