From: <je...@us...> - 2008-07-19 23:29:12
|
Revision: 10685 http://swig.svn.sourceforge.net/swig/?rev=10685&view=rev Author: jezabek Date: 2008-07-19 23:28:39 +0000 (Sat, 19 Jul 2008) Log Message: ----------- Generate headers from IDL before compiling tests. Modified Paths: -------------- branches/gsoc2008-jezabek/Examples/test-suite/com/Makefile.in branches/gsoc2008-jezabek/configure.in Modified: branches/gsoc2008-jezabek/Examples/test-suite/com/Makefile.in =================================================================== --- branches/gsoc2008-jezabek/Examples/test-suite/com/Makefile.in 2008-07-19 22:46:15 UTC (rev 10684) +++ branches/gsoc2008-jezabek/Examples/test-suite/com/Makefile.in 2008-07-19 23:28:39 UTC (rev 10685) @@ -7,6 +7,8 @@ COM_CYGPATH_W = @COM_CYGPATH_W@ COM_EXEC_SUFFIX = @COM_EXEC_SUFFIX@ COM_RUNTOOL = @COM_RUNTOOL@ +COM_IDL = @COM_IDL@ +COM_IDL_HEADER_SWITCHES = @COM_IDL_HEADER_SWITCHES@ srcdir = @srcdir@ top_srcdir = @top_srcdir@/.. top_builddir = @top_builddir@/.. @@ -22,6 +24,7 @@ %.cpptest: $(setup) +(cd $* && $(swig_and_compile_cpp)) + +$(generate_headers) +(cd $* && $(register_component)) +$(run_testcase) +(cd $* && $(unregister_component)) @@ -29,6 +32,7 @@ %.ctest: $(setup) +(cd $* && $(swig_and_compile_c)) + +$(generate_headers) +(cd $* && $(register_component)) +$(run_testcase) +(cd $* && $(unregister_component)) @@ -36,6 +40,7 @@ %.multicpptest: $(setup) +(cd $* && $(swig_and_compile_multi_cpp)) + +$(generate_headers) +(cd $* && $(register_component)) +$(run_testcase) +(cd $* && $(unregister_component)) @@ -58,6 +63,10 @@ unregister_component = \ regsvr32 /u $*.dll$(COM_EXEC_SUFFIX); +# Generates headers from the IDL file +generate_headers = \ + $(COM_IDL) $(COM_IDL_HEADER_SWITCHES) $*.h $*/$*.idl; + # Compiles COM files then runs the testcase. A testcase is only run if # a file is found which has _runme.c appended after the testcase name. run_testcase = \ Modified: branches/gsoc2008-jezabek/configure.in =================================================================== --- branches/gsoc2008-jezabek/configure.in 2008-07-19 22:46:15 UTC (rev 10684) +++ branches/gsoc2008-jezabek/configure.in 2008-07-19 23:28:39 UTC (rev 10685) @@ -1876,6 +1876,10 @@ if test "widl" = "$COM_IDL" ; then COM_IDL_SWITCHES=-t + COM_IDL_HEADER_SWITCHES='-h -H' +elif test "midl" = "$COM_IDL" ; then + COM_IDL_SWITCHES= + COM_IDL_HEADER_SWITCHES='/notlb /h' fi if test "rc" = "$COM_RC" ; then @@ -1921,6 +1925,7 @@ AC_SUBST(COM_RC) AC_SUBST(COM_LIBS) AC_SUBST(COM_IDL_SWITCHES) +AC_SUBST(COM_IDL_HEADER_SWITCHES) AC_SUBST(COM_RC_IN_SWITCHES) AC_SUBST(COM_RC_OUT_SWITCHES) AC_SUBST(COM_CC_SHARED_SWITCHES) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |