release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Extract version/release in external source builder.

Browse source
This commit is contained in:
Devan Goodwin 2014-01-09 15:20:04 -04:00
parent 381debd36b
commit 05e3b80205
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/tito/builder.py
View file

@ -1127,6 +1127,30 @@ class ExternalSourceBuilder(ConfigObject, BuilderBase):
self.manual_sources = [os.path.abspath(s) for s in kwargs['sources']]
debug("Got sources: %s" % self.manual_sources)
def _get_version_and_release(self):
"""
Get the version and release from the builder.
Sources are configured at this point.
"""
# Assuming source0 is a tar.gz we can extract a version and possibly
# release from:
base_name = os.path.basename(self.sources[0])
debug("Extracting version/release from: %s" % base_name)
# usually a source tarball won't have a release, that is an RPM concept.
# Don't forget dist!
release = "1%{?dist}"
# Example filename: tito-0.4.18.tar.gz:
simple_version_re = re.compile(".*-(.*).(tar.gz|tgz|zip|bz2)")
match = re.search(simple_version_re, base_name)
if match:
version = match.group(1)
else:
error_out("Unable to determine version from file: %s" % base_name)
return (version, release)
def tgz(self):
self.ran_tgz = True
self._create_build_dirs()
@ -1160,6 +1184,12 @@ class ExternalSourceBuilder(ConfigObject, BuilderBase):
version_regex = re.compile("^(version:\s*)(.+)$", re.IGNORECASE)
release_regex = re.compile("^(release:\s*)(.+)$", re.IGNORECASE)
(version, release) = self._get_version_and_release()
print("Building version: %s" % version)
print("Building release: %s" % release)
replacements.append((version_regex, "Version: %s\n" % version))
replacements.append((release_regex, "Release: %s\n" % release))
self.replace_in_spec(replacements)
# Copy every normal file in the directory we ran tito from. This
@ -1193,7 +1223,7 @@ class ExternalSourceBuilder(ConfigObject, BuilderBase):
match = re.match(line_regex, line)
if match:
line = new_line
out_f.write(line)
out_f.write(line)
in_f.close()
out_f.close()

4
test/functional/multiproject_tests.py
View file

@ -89,9 +89,9 @@ class ExternalSourceBuilderTests(TitoGitTestFixture):
tito('build --rpm --output=%s --no-cleanup --source=%s --debug' %
(self.output_dir, self.source_filename))
self.assertTrue(os.path.exists(
os.path.join(self.output_dir, 'extsrc-0.0.1-1.fc20.src.rpm')))
os.path.join(self.output_dir, 'extsrc-0.0.2-1.fc20.src.rpm')))
self.assertTrue(os.path.exists(
os.path.join(self.output_dir, 'noarch/extsrc-0.0.1-1.fc20.noarch.rpm')))
os.path.join(self.output_dir, 'noarch/extsrc-0.0.2-1.fc20.noarch.rpm')))
# test_tag_rejected