Skip to content

Commit 5c5fef7

Browse files
committed
Get rid of the 'release build' concept
Currently all revisions in versions.yml except HEAD are considered to be 'release' builds and are treated slightly differently from the other revisions. This change removes the distinction: - The suffix '-HEAD' is now added to package names when building the HEAD revision - The version name for HEAD builds is no longer generated from the current date and time - The file llvm-index.txt is no longer created for non-HEAD builds (we don't use it for anything)
1 parent b6be674 commit 5c5fef7

File tree

2 files changed

+7
-33
lines changed

2 files changed

+7
-33
lines changed

scripts/config.py

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
# limitations under the License.
1515

1616
import argparse
17-
import datetime
1817
import enum
1918
import logging
2019
import os
@@ -406,24 +405,14 @@ def _fill_inferred(self):
406405
self.llvm_repo_dir = join(self.repos_dir, 'llvm.git')
407406
self.newlib_repo_dir = join(self.repos_dir, 'newlib.git')
408407
self.cmake_generator = 'Ninja' if self.use_ninja else 'Unix Makefiles'
409-
self.release_mode = self.revision != 'HEAD'
410-
if self.release_mode:
411-
version_suffix = '-' + self.revision
412-
self.version_string = self.revision
413-
else:
414-
version_suffix = ''
415-
now = datetime.datetime.now()
416-
self.version_string = now.strftime('%Y-%m-%d-%H:%M:%S')
408+
self.version_string = self.revision
417409
self.skip_reconfigure = self.build_mode == BuildMode.INCREMENTAL
418-
product_name = 'LLVMEmbeddedToolchainForArm'
419-
self.bin_package_base_name = product_name + version_suffix
420-
self.src_package_base_name = product_name + version_suffix + '-src'
421-
self.target_llvm_dir = join(
422-
self.install_dir,
423-
'{}-{}'.format(product_name, self.revision))
424-
self.install_src_subdir = join(
425-
self.install_dir,
426-
'{}-{}-src'.format(product_name, self.revision))
410+
bin_name = 'LLVMEmbeddedToolchainForArm-{}'.format(self.revision)
411+
src_name = bin_name + '-src'
412+
self.bin_package_base_name = bin_name
413+
self.src_package_base_name = src_name
414+
self.target_llvm_dir = join(self.install_dir, bin_name)
415+
self.install_src_subdir = join(self.install_dir, src_name)
427416
if self.is_cross_compiling:
428417
self.native_llvm_build_dir = join(self.build_dir, 'native-llvm')
429418
self.native_llvm_dir = join(self.install_dir, 'native-llvm')

scripts/make.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,6 @@ def _cmake_build(self, build_dir: str, target: str = None) -> None:
119119
except subprocess.CalledProcessError as ex:
120120
raise util.ToolchainBuildError from ex
121121

122-
def _write_llvm_index(self) -> None:
123-
"""Record the list of files and links installed by Clang."""
124-
flist = []
125-
install_dir = self.cfg.target_llvm_dir
126-
for root, _, files in os.walk(install_dir):
127-
for fname in files:
128-
full_path = os.path.abspath(os.path.join(root, fname))
129-
if os.path.isfile(full_path) or os.path.islink(full_path):
130-
flist.append(os.path.relpath(full_path, install_dir))
131-
util.write_lines(sorted(flist),
132-
os.path.join(self.cfg.build_dir, 'llvm-index.txt'))
133-
134122
def _prepare_build_dir(self, build_dir):
135123
if (self.cfg.build_mode == config.BuildMode.REBUILD
136124
and os.path.exists(build_dir)):
@@ -265,9 +253,6 @@ def build_clang(self) -> None:
265253
else:
266254
if cfg.verbose:
267255
logging.info('Skipping the copying Mingw-w64 runtime DLLs')
268-
# Record the list of files and links installed by clang
269-
if cfg.release_mode:
270-
self._write_llvm_index()
271256

272257
def _get_common_cmake_defs_for_llvm(self) -> Dict[str, str]:
273258
"""Return common CMake definitions used for building LLVM."""

0 commit comments

Comments
 (0)