comparison recipes/wince/gnupg/base.py @ 327:f5282057838a

Revisions are now handled as strings
author Andre Heinecke <aheinecke@intevation.de>
date Wed, 17 Mar 2010 13:42:42 +0000
parents 278abafc2d86
children c7d22fd36815
comparison
equal deleted inserted replaced
326:23be5ab5bc7c 327:f5282057838a
43 43
44 raise RuntimeError("Could not determine the version number from %s" 44 raise RuntimeError("Could not determine the version number from %s"
45 % filename) 45 % filename)
46 46
47 def determine_package_version(self, directory): 47 def determine_package_version(self, directory):
48 return "%s-svn%d" % (self.orig_source_version(directory), self.revision) 48 return "%s-svn%s" % (self.orig_source_version(directory), self.revision)
49 def sign_package(self): 49 def sign_package(self):
50 return None 50 return None
51 51
52 def do_package(self): 52 def do_package(self):
53 pkgbaseversion, pkgbasedir = self.export_sources() 53 pkgbaseversion, pkgbasedir = self.export_sources()
60 # file. autogen.sh normally determines it from svn, but here it 60 # file. autogen.sh normally determines it from svn, but here it
61 # ran on a copy that did not include the .svn subdirectories and 61 # ran on a copy that did not include the .svn subdirectories and
62 # thus could not find the svn revision. 62 # thus could not find the svn revision.
63 treepkg.util.replace_in_file(os.path.join(pkgbasedir, "configure"), 63 treepkg.util.replace_in_file(os.path.join(pkgbasedir, "configure"),
64 re.escape(orig_version) + "-svn0", 64 re.escape(orig_version) + "-svn0",
65 orig_version + "-svn%d" % self.revision) 65 orig_version + "-svn%s" % self.revision)
66 66
67 pkgbasename = self.pkg_basename + "_" + pkgbaseversion 67 pkgbasename = self.pkg_basename + "_" + pkgbaseversion
68 origtargz = os.path.join(self.work_dir, 68 origtargz = os.path.join(self.work_dir,
69 pkgbasename + ".orig.tar.gz") 69 pkgbasename + ".orig.tar.gz")
70 self.create_tarball(origtargz, self.work_dir, 70 self.create_tarball(origtargz, self.work_dir,
71 os.path.basename(pkgbasedir)) 71 os.path.basename(pkgbasedir))
72 72
73 changemsg = ("Update to SVN rev. %d" % (self.revision,)) 73 changemsg = ("Update to SVN rev. %s" % (self.revision,))
74 self.copy_debian_directory(pkgbasedir, pkgbaseversion, 74 self.copy_debian_directory(pkgbasedir, pkgbaseversion,
75 changemsg) 75 changemsg)
76 76
77 self.create_source_package(pkgbasedir, origtargz) 77 self.create_source_package(pkgbasedir, origtargz)
78 self.move_source_package(pkgbasename) 78 self.move_source_package(pkgbasename)
189 189
190 def do_package(self): 190 def do_package(self):
191 self.create_original_tarball() 191 self.create_original_tarball()
192 orig_dir = self.create_orig_dir() 192 orig_dir = self.create_orig_dir()
193 193
194 changemsg = ("Update to SVN rev. %d" % (self.revision,)) 194 changemsg = ("Update to SVN rev. %s" % (self.revision,))
195 self.copy_debian_directory(orig_dir, self.pkgbaseversion, changemsg) 195 self.copy_debian_directory(orig_dir, self.pkgbaseversion, changemsg)
196 196
197 self.create_source_package(orig_dir, self.origtargz) 197 self.create_source_package(orig_dir, self.origtargz)
198 self.move_source_package(self.pkgbasename) 198 self.move_source_package(self.pkgbasename)
199 199
This site is hosted by Intevation GmbH (Datenschutzerklärung und Impressum | Privacy Policy and Imprint)