alt/cloud-build
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename due to make terminology

Browse Source 
- rename rule to recipe
- rename require to prerequisite
This commit is contained in:
Mikhail Gordeev 2019-06-20 15:53:34 +03:00
parent 461dda626e
commit 3e12166d07
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cloud-build.py
View File

@ -190,7 +190,7 @@ Dir::Etc::preferencesparts "/var/empty";
def ensure_mkimage_profiles(self, update: bool = False) -> None: def ensure_mkimage_profiles(self, update: bool = False) -> None:
"""Checks that mkimage-profiles exists or clones it""" """Checks that mkimage-profiles exists or clones it"""
def add_rule(variable: str, value: str) -> str: def add_recipe(variable: str, value: str) -> str:
return f'\n\t@$(call add,{variable},{value})' return f'\n\t@$(call add,{variable},{value})'
url = self.mkimage_profiles_git url = self.mkimage_profiles_git
@ -218,29 +218,40 @@ Dir::Etc::preferencesparts "/var/empty";
for branch in self.branches: for branch in self.branches:
ebranch = self.escape_branch(branch) ebranch = self.escape_branch(branch)
requires = [target] prerequisites = [target]
requires.extend(self.requires_by_branch(branch)) prerequisites.extend(
requires_s = ' '.join(requires) self.prerequisites_by_branch(branch)
)
prerequisites_s = ' '.join(prerequisites)
branding = self.branding_by_branch(branch) branding = self.branding_by_branch(branch)
if branding: if branding:
branding = f'\n\t@$(call set,BRANDING,{branding})' branding = f'\n\t@$(call set,BRANDING,{branding})'
rules = [branding] recipes = [branding]
for package in self.packages(image, branch): for package in self.packages(image, branch):
rules.append(add_rule('BASE_PACKAGES', package)) recipes.append(
add_recipe(
'BASE_PACKAGES',
package))
for service in self.enabled_services(image, branch): for service in self.enabled_services(image, branch):
rules.append(add_rule('DEFAULT_SERVICES_ENABLE', recipes.append(
service)) add_recipe(
'DEFAULT_SERVICES_ENABLE',
service))
for service in self.disabled_services(image, branch): for service in self.disabled_services(image, branch):
rules.append(add_rule('DEFAULT_SERVICES_DISABLE', recipes.append(
service)) add_recipe(
'DEFAULT_SERVICES_DISABLE',
service))
rules_s = ''.join(rules) recipes_s = ''.join(recipes)
s = f'{target}_{ebranch}: {requires_s}; @:{rules_s}' rule = f'''
print(s, file=f) {target}_{ebranch}: {prerequisites_s}; @:{recipes_s}
'''.strip()
print(rule, file=f)
self.generate_apt_files() self.generate_apt_files()
@ -254,8 +265,8 @@ Dir::Etc::preferencesparts "/var/empty";
def branding_by_branch(self, branch: str) -> str: def branding_by_branch(self, branch: str) -> str:
return self._branches[branch].get('branding', '') return self._branches[branch].get('branding', '')
def requires_by_branch(self, branch: str) -> List[str]: def prerequisites_by_branch(self, branch: str) -> List[str]:
return self._branches[branch].get('requires', []) return self._branches[branch].get('prerequisites', [])
@property @property
def images(self) -> List[str]: def images(self) -> List[str]: