From 7252308f7d6bfc3cfa2b542dc627f2f3bec293ec Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Sat, 31 Dec 2011 13:49:34 +0100 Subject: [PATCH] #1094 again --- waflib/Tools/javaw.py | 4 +--- wscript | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/waflib/Tools/javaw.py b/waflib/Tools/javaw.py index 5021c542..11049023 100644 --- a/waflib/Tools/javaw.py +++ b/waflib/Tools/javaw.py @@ -26,7 +26,7 @@ You would have to run:: [1] http://www.jython.org/ """ -import os, re, tempfile +import os, re, tempfile, shutil from waflib.Configure import conf from waflib import TaskGen, Task, Utils, Options, Build, Errors, Node, Logs from waflib.TaskGen import feature, before_method, after_method @@ -347,8 +347,6 @@ def check_java_class(self, classname, with_classpath=None): :type with_classpath: string """ - import shutil - javatestdir = '.waf-javatest' classpath = javatestdir diff --git a/wscript b/wscript index 7da46862..04e44421 100644 --- a/wscript +++ b/wscript @@ -27,7 +27,7 @@ import tokenize import os, sys, re, io, optparse -from waflib import Utils, Options +from waflib import Utils, Options, Logs from hashlib import md5 from waflib import Configure @@ -71,6 +71,9 @@ def init(ctx): sys.exit(0) +def check(ctx): + Logs.warn('Nothing to do') + # this function is called before any other for parsing the command-line def options(opt):