diff options
| author | Vadim Zeitlin <vadim@zeitlins.org> | 2014-04-30 18:37:57 +0200 |
|---|---|---|
| committer | Vadim Zeitlin <vadim@zeitlins.org> | 2014-04-30 18:37:57 +0200 |
| commit | 1ebd2334b8c407d8a60da9d131cd0cbd09f515ca (patch) | |
| tree | 011be495bf3f52376e5f025813a3e97f6a348e25 /Examples/test-suite/java/Makefile.in | |
| parent | 1bf26f216d5333ff29a083bed3ce95b57cc201f0 (diff) | |
| parent | 36be36d6185cf75c91532f9aa50fb2f77bc55465 (diff) | |
| download | swig-1ebd2334b8c407d8a60da9d131cd0cbd09f515ca.tar.gz | |
Merge branch 'master' into doxygen
Merge with ~3.0.1 sources from master.
Diffstat (limited to 'Examples/test-suite/java/Makefile.in')
| -rw-r--r-- | Examples/test-suite/java/Makefile.in | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Examples/test-suite/java/Makefile.in b/Examples/test-suite/java/Makefile.in index 3cb9d0c23..453d29be8 100644 --- a/Examples/test-suite/java/Makefile.in +++ b/Examples/test-suite/java/Makefile.in @@ -3,8 +3,8 @@ ####################################################################### LANGUAGE = java -JAVA = java -JAVAC = javac +JAVA = @JAVA@ +JAVAC = @JAVAC@ JAVAFLAGS = -Xcheck:jni SCRIPTSUFFIX = _runme.java srcdir = @srcdir@ @@ -27,10 +27,14 @@ CPP_TEST_CASES = \ intermediary_classname \ java_constants \ java_director \ + java_director_assumeoverride \ + java_director_exception_feature \ + java_director_exception_feature_nspace \ java_enums \ + java_jnitypes \ java_lib_arrays_dimensionless \ java_lib_various \ - java_jnitypes \ + java_nspacewithoutpackage \ java_pgcpp \ java_pragmas \ java_prepost \ @@ -43,12 +47,16 @@ include $(srcdir)/../common.mk # Overridden variables here JAVA_PACKAGE = $* -SWIGOPT += -package $(JAVA_PACKAGE) +JAVA_PACKAGEOPT = -package $(JAVA_PACKAGE) +SWIGOPT += $(JAVA_PACKAGEOPT) # Custom tests - tests with additional commandline options +java_nspacewithoutpackage.%: JAVA_PACKAGEOPT = +java_director_exception_feature_nspace.%: JAVA_PACKAGE = $*Package nspace.%: JAVA_PACKAGE = $*Package nspace_extend.%: JAVA_PACKAGE = $*Package director_nspace.%: JAVA_PACKAGE = $*Package +director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package # Rules for the different types of tests %.cpptest: @@ -69,9 +77,9 @@ director_nspace.%: JAVA_PACKAGE = $*Package # Makes a directory for the testcase if it does not exist setup = \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ - echo "$(ACTION)ing testcase $* (with run test) under $(LANGUAGE)" ; \ + echo "$(ACTION)ing $(LANGUAGE) testcase $* (with run test)" ; \ else \ - echo "$(ACTION)ing testcase $* under $(LANGUAGE)" ; \ + echo "$(ACTION)ing $(LANGUAGE) testcase $*" ; \ fi; \ if [ ! -d $(JAVA_PACKAGE) ]; then \ mkdir $(JAVA_PACKAGE); \ |