mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 09:34:08 +00:00
Code Activity

include Java bindinings in the binary distribution

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2012-12-12 07:29:04 -08:00
parent f02d2ee0e3
commit 512cdc182a
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/mk_util.py
View file

@ -1040,6 +1040,11 @@ class JavaDLLComponent(Component):
def main_component(self): def main_component(self):
return is_java_enabled() return is_java_enabled()
def mk_win_dist(self, build_path, dist_path):
if JAVA_ENABLED:
mk_dir(os.path.join(dist_path, 'bin'))
shutil.copy('%s.jar' % os.path.join(build_path, self.package_name),
'%s.jar' % os.path.join(dist_path, 'bin', self.package_name))
class ExampleComponent(Component): class ExampleComponent(Component):
def __init__(self, name, path): def __init__(self, name, path):

16
scripts/mk_win_dist.py
View file

@ -16,6 +16,7 @@ import subprocess
import zipfile import zipfile
from mk_exception import * from mk_exception import *
from mk_project import * from mk_project import *
import mk_util
BUILD_DIR='build-dist' BUILD_DIR='build-dist'
BUILD_X64_DIR=os.path.join('build-dist', 'x64') BUILD_X64_DIR=os.path.join('build-dist', 'x64')
@ -23,6 +24,7 @@ BUILD_X86_DIR=os.path.join('build-dist', 'x86')
VERBOSE=True VERBOSE=True
DIST_DIR='dist' DIST_DIR='dist'
FORCE_MK=False FORCE_MK=False
JAVA_ENABLED=True
def set_verbose(flag): def set_verbose(flag):
global VERBOSE global VERBOSE
@ -52,16 +54,18 @@ def display_help():
print " -s, --silent do not print verbose messages." print " -s, --silent do not print verbose messages."
print " -b <sudir>, --build=<subdir> subdirectory where x86 and x64 Z3 versions will be built (default: build-dist)." print " -b <sudir>, --build=<subdir> subdirectory where x86 and x64 Z3 versions will be built (default: build-dist)."
print " -f, --force force script to regenerate Makefiles." print " -f, --force force script to regenerate Makefiles."
print " --nojava do not include Java bindings in the binary distribution files."
exit(0) exit(0)
# Parse configuration option for mk_make script # Parse configuration option for mk_make script
def parse_options(): def parse_options():
global FORCE_MK global FORCE_MK, JAVA_ENABLED
path = BUILD_DIR path = BUILD_DIR
options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=', options, remainder = getopt.gnu_getopt(sys.argv[1:], 'b:hsf', ['build=',
'help', 'help',
'silent', 'silent',
'force' 'force',
'nojava'
]) ])
for opt, arg in options: for opt, arg in options:
if opt in ('-b', '--build'): if opt in ('-b', '--build'):
@ -74,6 +78,8 @@ def parse_options():
display_help() display_help()
elif opt in ('-f', '--force'): elif opt in ('-f', '--force'):
FORCE_MK = True FORCE_MK = True
elif opt == '--nojava':
JAVA_ENABLED = False
else: else:
raise MKException("Invalid command line option '%s'" % opt) raise MKException("Invalid command line option '%s'" % opt)
set_build_dir(path) set_build_dir(path)
@ -86,6 +92,8 @@ def check_build_dir(path):
def mk_build_dir(path, x64): def mk_build_dir(path, x64):
if not check_build_dir(path) or FORCE_MK: if not check_build_dir(path) or FORCE_MK:
opts = ["python", os.path.join('scripts', 'mk_make.py'), "-b", path] opts = ["python", os.path.join('scripts', 'mk_make.py'), "-b", path]
if JAVA_ENABLED:
opts.append('--java')
if x64: if x64:
opts.append('-x') opts.append('-x')
if subprocess.call(opts) != 0: if subprocess.call(opts) != 0:
@ -149,6 +157,10 @@ def mk_dist_dir_core(x64):
build_path = BUILD_X86_DIR build_path = BUILD_X86_DIR
dist_path = os.path.join(DIST_DIR, 'z3-%s.%s.%s-%s' % (major, minor, build, platform)) dist_path = os.path.join(DIST_DIR, 'z3-%s.%s.%s-%s' % (major, minor, build, platform))
mk_dir(dist_path) mk_dir(dist_path)
if JAVA_ENABLED:
# HACK: Propagate JAVA_ENABLED flag to mk_util
# TODO: fix this hack
mk_util.JAVA_ENABLED = JAVA_ENABLED
mk_win_dist(build_path, dist_path) mk_win_dist(build_path, dist_path)
if is_verbose(): if is_verbose():
print "Generated %s distribution folder at '%s'" % (platform, dist_path) print "Generated %s distribution folder at '%s'" % (platform, dist_path)