Jul 11, 2023 · Apr 3, 2023 · Apr 4, 2023 · Apr 5, 2023 · May 10, 2023 · May 10, 2023
diff --git a/Tools/freeze/test/freeze.py b/Tools/freeze/test/freeze.py
 import subprocess


 TESTS_DIR = os.path.dirname(__file__)
 TOOL_ROOT = os.path.dirname(TESTS_DIR)
 SRCDIR = os.path.dirname(os.path.dirname(TOOL_ROOT))
 TESTS_DIR= os.path.dirname(__file__)
 TOOL_ROOT= os.path.dirname(TESTS_DIR)
 SOURCE_DIR = os.path.dirname(os.path.dirname(TOOL_ROOT))

 MAKE = shutil.which('make')
 FREEZE = os.path.join(TOOL_ROOT, 'freeze.py')
 def copy_source_tree(newroot, oldroot):
    print(f'copying the source tree into {newroot}...')
    if os.path.exists(newroot):
        if newroot ==SRCDIR:
        if newroot ==SOURCE_DIR:
            raise Exception('this probably isn\'t what you wanted')
        shutil.rmtree(newroot)

    if os.path.exists(os.path.join(newroot, 'Makefile')):
        _run_quiet([MAKE, 'clean'], newroot)

 def get_makefile_var(builddir, name):
 def get_makefile_var(final_dir, name):
    regex = re.compile(rf'^{name} *=\s*(.*?)\s*$')
    filename = os.path.join(builddir, 'Makefile')
    filename = os.path.join(final_dir, 'Makefile')
    try:
        infile = open(filename, encoding='utf-8')
    except FileNotFoundError:
    return None


 def get_config_var(builddir, name):
    python = os.path.join(builddir, 'python')
 def get_config_var(final_dir, name):
    python = os.path.join(final_dir, 'python')
    if os.path.isfile(python):
        cmd = [python, '-c',
               f'import sysconfig; print(sysconfig.get_config_var("{name}"))']
        try:
            return _run_stdout(cmd)
        except subprocess.CalledProcessError:
            pass
    return get_makefile_var(builddir, name)
    return get_makefile_var(final_dir, name)


 ##################################

    # Make a copy of the repo to avoid affecting the current build
    # (e.g. changing PREFIX).
 srcdir = os.path.join(outdir, 'cpython')
    copy_source_tree(srcdir, SRCDIR)
 interim_dir = os.path.join(outdir, 'cpython')
    copy_source_tree(interim_dir, SOURCE_DIR)

    # We use an out-of-tree build (instead ofsrcdir).
 builddir = os.path.join(outdir, 'python-build')
    os.makedirs(builddir, exist_ok=True)
    # We use an out-of-tree build (instead ofinterim_dir).
 final_dir = os.path.join(outdir, 'python-build')
    os.makedirs(final_dir, exist_ok=True)

    # Run configure.
    print(f'configuring python in {builddir}...')
    print(f'configuring python in {final_dir}...')
    cmd = [
        os.path.join(srcdir, 'configure'),
        *shlex.split(get_config_var(SRCDIR, 'CONFIG_ARGS') or ''),
        os.path.join(interim_dir, 'configure'),
        *shlex.split(get_config_var(SOURCE_DIR, 'CONFIG_ARGS') or ''),
    ]
    ensure_opt(cmd, 'cache-file', os.path.join(outdir, 'python-config.cache'))
    prefix = os.path.join(outdir, 'python-installation')
    ensure_opt(cmd, 'prefix', prefix)
    _run_quiet(cmd,builddir)
    _run_quiet(cmd,final_dir)

    if not MAKE:
        raise UnsupportedError('make')
        parallel = '-j2'

    # Build python.
    print(f'building python {parallel=} in {builddir}...')
    if os.path.exists(os.path.join(srcdir, 'Makefile')):
        # Out-of-tree builds require a cleansrcdir.
        _run_quiet([MAKE, '-C',srcdir, 'clean'])
    _run_quiet([MAKE, '-C',builddir, parallel])
    print(f'building python {parallel=} in {final_dir}...')
    if os.path.exists(os.path.join(interim_dir, 'Makefile')):
        # Out-of-tree builds require a cleaninterim_dir.
        _run_quiet([MAKE, '-C',interim_dir, 'clean'])
    _run_quiet([MAKE, '-C',final_dir, parallel])

    # Install the build.
    print(f'installing python into {prefix}...')
    _run_quiet([MAKE, '-C',builddir, 'install'])
    _run_quiet([MAKE, '-C',final_dir, 'install'])
    python = os.path.join(prefix, 'bin', 'python3')

    return outdir, scriptfile, python
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,9 +6,9 @@
		import subprocess


		TESTS_DIR = os.path.dirname(__file__)
		TOOL_ROOT = os.path.dirname(TESTS_DIR)
		SRCDIR = os.path.dirname(os.path.dirname(TOOL_ROOT))
		TESTS_DIR= os.path.dirname(__file__)
		TOOL_ROOT= os.path.dirname(TESTS_DIR)
		SOURCE_DIR = os.path.dirname(os.path.dirname(TOOL_ROOT))

		MAKE = shutil.which('make')
		FREEZE = os.path.join(TOOL_ROOT, 'freeze.py')
Expand DownExpand Up		@@ -77,7 +77,7 @@ def ensure_opt(args, name, value):
		def copy_source_tree(newroot, oldroot):
		print(f'copying the source tree into {newroot}...')
		if os.path.exists(newroot):
		if newroot ==SRCDIR:
		if newroot ==SOURCE_DIR:
		raise Exception('this probably isn\'t what you wanted')
		shutil.rmtree(newroot)

Expand All		@@ -96,9 +96,9 @@ def ignore_non_src(src, names):
		if os.path.exists(os.path.join(newroot, 'Makefile')):
		_run_quiet([MAKE, 'clean'], newroot)

		def get_makefile_var(builddir, name):
		def get_makefile_var(final_dir, name):
		regex = re.compile(rf'^{name} =\s(.?)\s$')
		filename = os.path.join(builddir, 'Makefile')
		filename = os.path.join(final_dir, 'Makefile')
		try:
		infile = open(filename, encoding='utf-8')
		except FileNotFoundError:
Expand All		@@ -112,16 +112,16 @@ def get_makefile_var(builddir, name):
		return None


		def get_config_var(builddir, name):
		python = os.path.join(builddir, 'python')
		def get_config_var(final_dir, name):
		python = os.path.join(final_dir, 'python')
		if os.path.isfile(python):
		cmd = [python, '-c',
		f'import sysconfig; print(sysconfig.get_config_var("{name}"))']
		try:
		return _run_stdout(cmd)
		except subprocess.CalledProcessError:
		pass
		return get_makefile_var(builddir, name)
		return get_makefile_var(final_dir, name)


		##################################
Expand All		@@ -141,23 +141,23 @@ def prepare(script=None, outdir=None):

		# Make a copy of the repo to avoid affecting the current build
		# (e.g. changing PREFIX).
		srcdir = os.path.join(outdir, 'cpython')
		copy_source_tree(srcdir, SRCDIR)
		interim_dir = os.path.join(outdir, 'cpython')
		copy_source_tree(interim_dir, SOURCE_DIR)

		# We use an out-of-tree build (instead ofsrcdir).
		builddir = os.path.join(outdir, 'python-build')
		os.makedirs(builddir, exist_ok=True)
		# We use an out-of-tree build (instead ofinterim_dir).
		final_dir = os.path.join(outdir, 'python-build')
		os.makedirs(final_dir, exist_ok=True)

		# Run configure.
		print(f'configuring python in {builddir}...')
		print(f'configuring python in {final_dir}...')
		cmd = [
		os.path.join(srcdir, 'configure'),
		*shlex.split(get_config_var(SRCDIR, 'CONFIG_ARGS') or ''),
		os.path.join(interim_dir, 'configure'),
		*shlex.split(get_config_var(SOURCE_DIR, 'CONFIG_ARGS') or ''),
		]
		ensure_opt(cmd, 'cache-file', os.path.join(outdir, 'python-config.cache'))
		prefix = os.path.join(outdir, 'python-installation')
		ensure_opt(cmd, 'prefix', prefix)
		_run_quiet(cmd,builddir)
		_run_quiet(cmd,final_dir)

		if not MAKE:
		raise UnsupportedError('make')
Expand All		@@ -172,15 +172,15 @@ def prepare(script=None, outdir=None):
		parallel = '-j2'

		# Build python.
		print(f'building python {parallel=} in {builddir}...')
		if os.path.exists(os.path.join(srcdir, 'Makefile')):
		# Out-of-tree builds require a cleansrcdir.
		_run_quiet([MAKE, '-C',srcdir, 'clean'])
		_run_quiet([MAKE, '-C',builddir, parallel])
		print(f'building python {parallel=} in {final_dir}...')
		if os.path.exists(os.path.join(interim_dir, 'Makefile')):
		# Out-of-tree builds require a cleaninterim_dir.
		_run_quiet([MAKE, '-C',interim_dir, 'clean'])
		_run_quiet([MAKE, '-C',final_dir, parallel])

		# Install the build.
		print(f'installing python into {prefix}...')
		_run_quiet([MAKE, '-C',builddir, 'install'])
		_run_quiet([MAKE, '-C',final_dir, 'install'])
		python = os.path.join(prefix, 'bin', 'python3')

		return outdir, scriptfile, python
Expand Down