Mercurial > gub
changeset 3491:b55a3a1cc0ca
Merge branch 'gub' of git+ssh://git.sv.gnu.org/srv/git/lilypond into gub
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Sat, 12 May 2007 15:59:09 +0200 |
| parents | 6aedb71a61f7 (current diff) ae3575c26fd5 (diff) |
| children | d1d5c381d987 |
| files | |
| diffstat | 7 files changed, 38 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/installer-builder Sat May 12 15:58:47 2007 +0200 +++ b/bin/installer-builder Sat May 12 15:59:09 2007 +0200 @@ -88,6 +88,7 @@ help='select target platform', choices=gub.settings.platforms.keys ()) + p.add_option ('-v', '--verbose', action='count', dest='verbose', default=0) (options, args) = p.parse_args () @@ -174,7 +175,7 @@ installer.checksum = pickle.dumps (checksum_list) def strip_installer (obj): - obj.command (' ** Stage: %s (%s)\n' % ('strip', obj.name)) + obj.command (' ** Stage: %s (%s installer)\n' % ('strip', obj.name)) obj.strip () def package_installer (installer):
--- a/gub.make Sat May 12 15:58:47 2007 +0200 +++ b/gub.make Sat May 12 15:59:09 2007 +0200 @@ -32,8 +32,8 @@ $(LOCAL_GPKG_OPIONS) INVOKE_INSTALLER_BUILDER=$(INSTALLER_BUILDER)\ - --target-platform $(1)\ - $(INSTALLER_BUILDER_OPTIONS)\ + --target-platform $(1) \ + $(INSTALLER_BUILDER_OPTIONS) \ $(LOCAL_INSTALLER_BUILDER_OPTIONS) BUILD=$(call INVOKE_GUB,$(1)) $(2)\
--- a/gub/specs/git.py Sat May 12 15:58:47 2007 +0200 +++ b/gub/specs/git.py Sat May 12 15:59:09 2007 +0200 @@ -6,7 +6,7 @@ def __init__ (self, settings): toolpackage.ToolBuildSpec.__init__ (self, settings) self.with (mirror='http://kernel.org/pub/software/scm/git/git-%(version)s.tar.bz2', - version='1.5.1.2') + version='1.5.1.4') def patch (self): self.shadow_tree ('%(srcdir)s', '%(builddir)s') self.file_sub ([('git describe','true')], @@ -40,6 +40,7 @@ return {'': [ 'zlib', 'regex', + 'libiconv' ]} def get_subpackage_names (self): @@ -48,6 +49,7 @@ def get_build_dependencies (self): return ['zlib-devel', 'regex-devel', + 'libiconv-devel' ] def patch (self):
--- a/gub/versiondb.py Sat May 12 15:58:47 2007 +0200 +++ b/gub/versiondb.py Sat May 12 15:59:09 2007 +0200 @@ -16,7 +16,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software + along with this program; if not, write toth e Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. """ @@ -27,17 +27,6 @@ import optparse import os -platforms = ['linux-x86', - 'linux-64', - 'linux-ppc', - 'darwin-ppc', - 'darwin-x86', - 'documentation', - 'freebsd-x86', - 'mingw', - 'cygwin', - 'source', - ] def get_url_versions (url): opener = urllib.URLopener () @@ -69,6 +58,7 @@ def __init__ (self, file_name): self._db = {} self.file_name = file_name + self.platforms = [] if os.path.exists (file_name): self.read () @@ -93,7 +83,7 @@ def get_binaries_from_url (self, url): package = os.path.basename (os.path.splitext (self.file_name)[0]) - for p in platforms: + for p in self.platforms: if p == 'source': continue @@ -109,17 +99,19 @@ continue def write (self): - open (self.file_name,'w').write (pickle.dumps (self._db)) + open (self.file_name,'w').write (pickle.dumps ((self.platforms, + self._db))) def read (self): - self._db = pickle.loads (open (self.file_name).read ()) + (self.platforms, + self._db) = pickle.loads (open (self.file_name).read ()) ## UI functions: def get_next_build_number (self, version_tuple): assert (type (version_tuple) == type (())) sub_db = {} - for platform in platforms: + for platform in self.platforms: sub_db[platform] = [0] if self._db.has_key (platform): sub_db[platform] = [buildnum @@ -178,6 +170,11 @@ default=False, help='self test') + p.add_option ('--platforms', action='store', + dest='platforms', + default='', + help='platforms to inspect; space separated') + return p def main (): @@ -188,6 +185,7 @@ options.url += "/" db = VersionDataBase (options.dbfile) + db.platforms = options.platforms.split (' ') if options.test: print '2.9.28:', db.get_next_build_number ((2,9,28)) print '2.8.2:', db.get_next_build_number ((2,8,2))
--- a/lilypond.make Sat May 12 15:58:47 2007 +0200 +++ b/lilypond.make Sat May 12 15:59:09 2007 +0200 @@ -69,7 +69,7 @@ ################ unlocked-update-versions: - python gub/versiondb.py --dbfile $(LILYPOND_VERSIONS) --download + python gub/versiondb.py --dbfile $(LILYPOND_VERSIONS) --download python gub/versiondb.py --dbfile uploads/fontconfig.versions --download python gub/versiondb.py --dbfile uploads/guile.versions --download python gub/versiondb.py --dbfile uploads/libtool.versions --download
--- a/mingit.make Sat May 12 15:58:47 2007 +0200 +++ b/mingit.make Sat May 12 15:59:09 2007 +0200 @@ -2,7 +2,6 @@ PACKAGE = git ALL_PLATFORMS=mingw -PLATFORMS=$(ALL_PLATFORMS) MINGIT_BRANCH_FILEIFIED=$(subst /,--,$(MINGIT_BRANCH)) MINGIT_LOCAL_BRANCH=$(MINGIT_BRANCH_FILEIFIED)-repo.or.cz-git-mingw.git @@ -12,6 +11,8 @@ include gub.make include compilers.make +PLATFORMS = mingw + GPKG_OPTIONS=--branch git=$(MINGIT_LOCAL_BRANCH) GUB_OPTIONS=\ @@ -19,7 +20,7 @@ INSTALLER_BUILDER_OPTIONS=\ --branch git=$(MINGIT_LOCAL_BRANCH)\ - --version-db uploads/git.versions + --version-db uploads/git.versions \ all: $(PLATFORMS) @@ -41,4 +42,7 @@ $(call BUILD,$@,git) update-versions: - python gub/versiondb.py --no-sources --url http://lilypond.org/git --dbfile uploads/git.db --download + python gub/versiondb.py --no-sources --url http://lilypond.org/git --dbfile uploads/git.versions --download --platforms="$(PLATFORMS)" + +upload: + scp `ls -1 -t uploads/git*.exe|head -1` hanwen@lilypond.org:www/git/binaries/mingw/
--- a/nsis/git.nsi Sat May 12 15:58:47 2007 +0200 +++ b/nsis/git.nsi Sat May 12 15:59:09 2007 +0200 @@ -31,8 +31,8 @@ ${UnStrLoc} ;;SetCompressor lzma ; very slow -SetCompressor zlib -;; SetCompressor bzip2 ;; +;;SetCompressor zlib +SetCompressor bzip2 ;; Name "${PRETTY_NAME}" @@ -96,8 +96,15 @@ CreateDirectory "$INSTDIR\usr\bin" Call registry_installer + Call registry_path SectionEnd + +Function registry_path + ReadRegStr $R0 HKLM "${ENVIRON}" "PATH" + WriteRegExpandStr HKLM "${ENVIRON}" "PATH" "$R0;$INSTDIR\usr\bin" +FunctionEnd + ;; copy & paste from the NSIS code examples Function un.install_installed_files IfFileExists "$INSTDIR\${UninstLog}" +3