Mercurial > gub
changeset 3490:ae3575c26fd5
excise --platforms from installer-builder; use pickled platforms instead
| author | Han-Wen Nienhuys <hanwen@lilypond.org> |
|---|---|
| date | Sat, 12 May 2007 00:41:49 -0300 |
| parents | 778f79a7d288 |
| children | b55a3a1cc0ca |
| files | bin/installer-builder gub.make gub/versiondb.py lilypond.make mingit.make |
| diffstat | 5 files changed, 10 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/installer-builder Sat May 12 00:04:16 2007 -0300 +++ b/bin/installer-builder Sat May 12 00:41:49 2007 -0300 @@ -89,11 +89,6 @@ choices=gub.settings.platforms.keys ()) - p.add_option ('--platforms', action='store', - dest='platforms', - default='', - help='platforms to inspect; space separated') - p.add_option ('-v', '--verbose', action='count', dest='verbose', default=0) (options, args) = p.parse_args () @@ -164,7 +159,6 @@ version_tup = tuple (map (int, version.split ('.'))) db = versiondb.VersionDataBase (options.version_db) - db.platforms = options.platforms.split (' ') buildnumber = '%d' % db.get_next_build_number (version_tup) settings.installer_version = version
--- a/gub.make Sat May 12 00:04:16 2007 -0300 +++ b/gub.make Sat May 12 00:41:49 2007 -0300 @@ -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/versiondb.py Sat May 12 00:04:16 2007 -0300 +++ b/gub/versiondb.py Sat May 12 00:41:49 2007 -0300 @@ -99,10 +99,12 @@ 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:
--- a/lilypond.make Sat May 12 00:04:16 2007 -0300 +++ b/lilypond.make Sat May 12 00:41:49 2007 -0300 @@ -69,9 +69,7 @@ ################ unlocked-update-versions: - python gub/versiondb.py --dbfile $(LILYPOND_VERSIONS) --download \ - --platforms="$(PLATFORMS) documentation source" - + 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 00:04:16 2007 -0300 +++ b/mingit.make Sat May 12 00:41:49 2007 -0300 @@ -20,7 +20,7 @@ INSTALLER_BUILDER_OPTIONS=\ --branch git=$(MINGIT_LOCAL_BRANCH)\ - --version-db uploads/git.versions + --version-db uploads/git.versions \ all: $(PLATFORMS) @@ -42,7 +42,7 @@ $(call BUILD,$@,git) update-versions: - python gub/versiondb.py --no-sources --url http://lilypond.org/git --dbfile uploads/git.db --download --platforms="$(PLATFORMS)" + python gub/versiondb.py --no-sources --url http://lilypond.org/git --dbfile uploads/git.versions --download --platforms="$(PLATFORMS)" upload: - scp `ls -1 -tr upload/git*.exe` hanwen@lilypond.org:www/git/binaries/mingw/ + scp `ls -1 -t uploads/git*.exe|head -1` hanwen@lilypond.org:www/git/binaries/mingw/