diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-05 12:42:57 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-12-08 21:35:14 -0500 |
| commit | 1eb49d95843a46b38385e7bfcbb37fe8dcf339df (patch) | |
| tree | 59706c016d3d64f184eecb7fa77bb2783d1d42b0 | |
| parent | ba0cd938c9acc27e5a93a7cc5181fdbe43b11ddc (diff) | |
jarmonbuild: Adjust to use git instead of bzr
| -rw-r--r-- | jarmonbuild/commands.py | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/jarmonbuild/commands.py b/jarmonbuild/commands.py index 5dfa10e..87b9a22 100644 --- a/jarmonbuild/commands.py +++ b/jarmonbuild/commands.py @@ -185,22 +185,7 @@ class BuildReleaseCommand(BuildCommand): build_dir = self.build_dir self.log.debug('Export versioned files to a build folder') - from bzrlib.commands import main as bzr_main - status = bzr_main(['bzr', 'export', build_dir, workingbranch_dir]) - if status != 0: - raise BuildError('bzr export failure. Status: %r' % (status,)) - - self.log.debug('Record the branch version') - from bzrlib.branch import Branch - from bzrlib.version_info_formats import format_python - v = format_python.PythonVersionInfoBuilder( - Branch.open(workingbranch_dir)) - - versionfile_path = os.path.join( - build_dir, 'jarmonbuild', '_version.py') - - with open(versionfile_path, 'w') as f: - v.generate(f) + check_call(('git', '--work-tree=%s' % (build_dir,), 'checkout', '-f')) self.log.debug('Generate apidocs') BuildApidocsCommand().main([buildversion]) |