[Swig-cvs] SF.net SVN: swig:[12173] trunk/Examples/test-suite

[<va...@us...>]

Revision: 12173
          http://swig.svn.sourceforge.net/swig/?rev=12173&view=rev
Author:   vadz
Date:     2010-07-22 17:01:36 +0000 (Thu, 22 Jul 2010)

Log Message:
-----------
Correct top_{src,build}dir definitions in csharp and java test suite.

The ".." artificially appended to these variables was enough to make the build
work in the source directory but broke down when the build directory was
different from the source one. Remove this hack and use absolute path to the
build directory instead to ensure that it's still valid even when csharp/java
makefiles invoke swig_and_compile_{c,cpp} macros from a subdirectory.

Modified Paths:
--------------
    trunk/Examples/test-suite/csharp/Makefile.in
    trunk/Examples/test-suite/java/Makefile.in

Modified: trunk/Examples/test-suite/csharp/Makefile.in
===================================================================
--- trunk/Examples/test-suite/csharp/Makefile.in	2010-07-22 17:01:16 UTC (rev 12172)
+++ trunk/Examples/test-suite/csharp/Makefile.in	2010-07-22 17:01:36 UTC (rev 12173)
@@ -8,8 +8,8 @@
 CSHARPPATHSEPARATOR = "@CSHARPPATHSEPARATOR@"
 CSHARPCYGPATH_W     = @CSHARPCYGPATH_W@
 srcdir       = @srcdir@
-top_srcdir   = @top_srcdir@/..
-top_builddir = @top_builddir@/..
+top_srcdir   = @top_srcdir@
+top_builddir = $(abspath @top_builddir@)
 
 CPP_TEST_CASES = \
 	csharp_attributes \
@@ -66,7 +66,7 @@
 # Note C# uses LD_LIBRARY_PATH under Unix, PATH under Cygwin/Windows and SHLIB_PATH on HPUX.
 run_testcase = \
 	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
-	  $(MAKE) -f $*/$(top_builddir)/$(EXAMPLES)/Makefile \
+	  $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile \
 	  CSHARPFLAGS='-nologo $(CSHARPFLAGSSPECIAL) -out:$*_runme.exe' \
 	  CSHARPSRCS='`$(CSHARPCYGPATH_W) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX)` `find $* -name "*.cs" -exec $(CSHARPCYGPATH_W) "{}" \+`' csharp_compile && \
 	  env LD_LIBRARY_PATH="$*:$$LD_LIBRARY_PATH" PATH="$*:$$PATH" SHLIB_PATH="$*:$$SHLIB_PATH" $(RUNTOOL) $(INTERPRETER) $*_runme.exe; \

Modified: trunk/Examples/test-suite/java/Makefile.in
===================================================================
--- trunk/Examples/test-suite/java/Makefile.in	2010-07-22 17:01:16 UTC (rev 12172)
+++ trunk/Examples/test-suite/java/Makefile.in	2010-07-22 17:01:36 UTC (rev 12173)
@@ -7,8 +7,8 @@
 JAVAC        = javac
 SCRIPTSUFFIX = _runme.java
 srcdir       = @srcdir@
-top_srcdir   = @top_srcdir@/..
-top_builddir = @top_builddir@/..
+top_srcdir   = @top_srcdir@
+top_builddir = $(abspath @top_builddir@)
 
 C_TEST_CASES = \
 	java_lib_arrays \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.