[banshee] [build] support retaining sources fetched remotely
- From: Aaron Bockover <abock src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [banshee] [build] support retaining sources fetched remotely
- Date: Mon, 21 Dec 2009 04:02:36 +0000 (UTC)
commit 41b21ec418a5c61cc5dd8f05a6639482d2ace782
Author: Aaron Bockover <abockover novell com>
Date: Sun Dec 20 23:01:31 2009 -0500
[build] support retaining sources fetched remotely
build/bundle/build.py | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/build/bundle/build.py b/build/bundle/build.py
index aa36337..4ffceb8 100755
--- a/build/bundle/build.py
+++ b/build/bundle/build.py
@@ -11,8 +11,9 @@ from optparse import OptionParser
def build_package (profile, (package, vars)):
package_dir = os.path.dirname (package['_path'])
- package_build_dir = os.path.join (profile['build_root'],
+ package_dest_dir = os.path.join (profile['build_root'],
'%s-%s' % (package['name'], package['version']))
+ package_build_dir = os.path.join (package_dest_dir, '_build')
build_success_file = os.path.join (profile['build_root'],
'%s-%s.success' % (package['name'], package['version']))
@@ -38,15 +39,18 @@ def build_package (profile, (package, vars)):
source = expand_macros (source, vars)
local_source = os.path.join (package_dir, source)
local_source_file = os.path.basename (local_source)
- local_sources.append (local_source_file)
- local_dest_file = os.path.join (package_build_dir, local_source_file)
-
- if os.path.isfile (local_source):
- log (1, 'copying local source: %s' % local_source_file)
- shutil.copy2 (local_source, local_dest_file)
- elif source.startswith (('http', 'https', 'ftp')):
- log (1, 'downloading remote source: %s' % source)
- urllib.urlretrieve (source, local_dest_file)
+ local_dest_file = os.path.join (package_dest_dir, local_source_file)
+ local_sources.append (local_dest_file)
+
+ if os.path.isfile (local_dest_file):
+ log (1, 'using cached source: %s' % local_dest_file)
+ else:
+ if os.path.isfile (local_source):
+ log (1, 'copying local source: %s' % local_source_file)
+ shutil.copy2 (local_source, local_dest_file)
+ elif source.startswith (('http', 'https', 'ftp')):
+ log (1, 'downloading remote source: %s' % source)
+ urllib.urlretrieve (source, local_dest_file)
package['sources'] = local_sources
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]