Patch build scripts.

Author: emina

jni/lingeling/wscript

@@ -16,7 +16,7 @@ def configure(conf):
     sourceclean(conf)
     root = conf.path.abspath()
     subprocess.check_call(['wget', 'http://fmv.jku.at/lingeling/' + LINGELING + '.zip', '--directory-prefix', root])
-    subprocess.check_call(['tar', '-xzf', root + '/' + LINGELING + '.zip', '-C', root, 'code'])
+    subprocess.check_call(['unzip', root + '/' + LINGELING + '.zip','code/*', '-d', root])
 
 def build(bld):
     DEFINES = ['NDBLSCR', 'NLGLOG','NDEBUG', 'NCHKSOL', 'NLGLPICOSAT', 'NLGLDRUPLIG', 'NLGLYALSAT']

jni/plingeling/wscript

@@ -12,7 +12,8 @@ def configure(conf):
     sourceclean(conf)
     root = conf.path.abspath()
     subprocess.check_call(['wget', 'http://fmv.jku.at/lingeling/' + PLINGELING + '.zip', '--directory-prefix', root])
-    subprocess.check_call(['tar', '-xzf', root + '/' + PLINGELING + '.zip', '-C', root, 'build.sh', 'code'])
+    subprocess.check_call(['unzip', root + '/' + PLINGELING + '.zip', 'code/*', '-d', root])
+    subprocess.check_call(['unzip', root + '/' + PLINGELING + '.zip', 'build.sh', '-d', root])
 
 def build(bld):
 

wscript

@@ -74,7 +74,8 @@ def test(bld):
     bld(rule = 'java -cp {classpath} -Djava.library.path={libpath} {junit} {test}'.format(classpath = ':'.join(cp),
                                                                                           libpath = bld.env.LIBDIR,
                                                                                           junit = 'org.junit.runner.JUnitCore',
-                                                                                          test = 'kodkod.test.AllTests')) 
+                                                                                          test = 'kodkod.test.AllTests'),
+        always = True)