Merge remote-tracking branch 'upstream/master' into subst_rewrite

1 files changed, 16 insertions, 8 deletions

diff --git a/test/Java/multi-step.py b/test/Java/multi-step.py
index 01a3163..f5ee257 100644
--- a/test/Java/multi-step.py
+++ b/test/Java/multi-step.py
@@ -35,6 +35,7 @@ import os
 import TestSCons
 
 test = TestSCons.TestSCons()
+# test.verbose_set(1)
 
 where_javac, java_version = test.java_where_javac()
 where_javah = test.java_where_javah()
@@ -44,15 +45,14 @@ swig = test.where_is('swig')
 if not swig:
     test.skip_test('Can not find installed "swig", skipping test.\n')
 
+# Skip this test on AppVeyor
+
 # Skip this test as SCons doesn't (currently) predict the generated
 # inner/anonymous class generated .class files generated by gcj
 # and so will always fail 
 if test.javac_is_gcj:
     test.skip_test('Test not valid for gcj (gnu java); skipping test(s).\n')
 
-
-
-
 test.subdir(['src'],
             ['src', 'HelloApplet'],
             ['src', 'HelloApplet', 'com'],
@@ -74,12 +74,17 @@ test.subdir(['src'],
 
 test.write(['SConstruct'], """\
 import os,sys
-env=Environment(tools = ['default', 'javac', 'javah', 'swig'],
-                CPPPATH=%(where_java_include)s,                 
-                JAVAC = r'%(where_javac)s',
-                JAVAH = r'%(where_javah)s')
+
+if sys.platform == 'win32':
+    # Ensure tests don't pick up link from mingw or cygwin
+    tools = ['msvc', 'mslink', 'jar', 'javac', 'javah', 'swig']
+else:
+    tools = ['default', 'javac', 'javah', 'swig']
+
+env=Environment(tools = tools,
+                CPPPATH=["$JAVAINCLUDES"])
 Export('env')
-env.PrependENVPath('PATH',os.environ.get('PATH',[]))
+# env.PrependENVPath('PATH',os.environ.get('PATH',[]))
 env['INCPREFIX']='-I'
 env.Append(SWIGFLAGS=['-c++','$_CPPINCFLAGS'])
 
@@ -154,6 +159,9 @@ public class Hello extends Applet {
 
 test.write(['src', 'javah', 'MyID.cc'], """\
 #include "MyID.h"
+#ifdef _MSC_VER
+__declspec(dllexport)
+#endif
 int getMyID()
 {
    return 0;