Skip to content

Added --no-optimize-python option to remove -OO in sdl2 bootstrap #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndreMiras merged 1 commit into from
Dec 14, 2018
Merged

Added --no-optimize-python option to remove -OO in sdl2 bootstrap #1221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions pythonforandroid/bootstraps/common/build/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def select(fn):
zf.close()


def make_tar(tfn, source_dirs, ignore_path=[]):
def make_tar(tfn, source_dirs, ignore_path=[], optimize_python=True):
'''
Make a zip file `fn` from the contents of source_dis.
'''
Expand All @@ -205,7 +205,7 @@ def select(fn):
files = []
for sd in source_dirs:
sd = realpath(sd)
compile_dir(sd)
compile_dir(sd, optimize_python=optimize_python)
files += [(x, relpath(realpath(x), sd)) for x in listfiles(sd)
if select(x)]

Expand Down Expand Up @@ -233,7 +233,7 @@ def select(fn):
tf.close()


def compile_dir(dfn):
def compile_dir(dfn, optimize_python=True):
'''
Compile *.py in directory `dfn` to *.pyo
'''
Expand All @@ -244,7 +244,10 @@ def compile_dir(dfn):
# -OO = strip docstrings
if PYTHON is None:
return
subprocess.call([PYTHON, '-OO', '-m', 'compileall', '-f', dfn])
args = [PYTHON, '-m', 'compileall', '-f', dfn]
if optimize_python:
args.insert(1, '-OO')
subprocess.call(args)


def make_package(args):
Expand Down Expand Up @@ -283,10 +286,10 @@ def make_package(args):
tar_dirs.append(python_bundle_dir)
if get_bootstrap_name() == "webview":
tar_dirs.append('webview_includes')
if args.private:
make_tar(join(assets_dir, 'private.mp3'), tar_dirs, args.ignore_path)
elif args.launcher:
make_tar(join(assets_dir, 'private.mp3'), tar_dirs, args.ignore_path)
if args.private or args.launcher:
make_tar(
join(assets_dir, 'private.mp3'), tar_dirs, args.ignore_path,
optimize_python=args.optimize_python)

# Prepare some variables for templating process
res_dir = "src/main/res"
Expand Down Expand Up @@ -644,6 +647,10 @@ def parse_args(args=None):
help='Set the launch mode of the main activity in the manifest.')
ap.add_argument('--allow-backup', dest='allow_backup', default='true',
help="if set to 'false', then android won't backup the application.")
ap.add_argument('--no-optimize-python', dest='optimize_python',
action='store_false', default=True,
help=('Whether to compile to optimised .pyo files, using -OO '
'(strips docstrings and asserts)'))

# Put together arguments, and add those from .p4a config file:
if args is None:
Expand Down