ok, I've uploaded 2.12.3-2, and a quick glance at the web docs looks like they work.
If anybody cares about 2.12, CHECK IT NOW. I am going to be even more pissed off if somebody comes along in a few weeks and asks for anything else to do with 2.12. My gub tree includes a ridiculous number of hacks and stuff like directly setting target = 'v2.12.3-2', which is hardly the kind of thing that we should see in a build system. I will wait 3 days, and then if nobody's complained, I'm clearing out my gub tree and going back a sensible way of working on it. I will not be making ANY more 2.12 releases after those 3 days. (or rather, I won't start working on any more; if somebody raises a vital item within those days, I'll start working on it and keep on working until it's out). Jan: here's the result of 3 hours of work. - Graham
From 19c69b2d334bce0e42631f1e07aa711c872f73b8 Mon Sep 17 00:00:00 2001 From: Graham Percival <[email protected]> Date: Tue, 12 Jan 2010 16:10:01 +0000 Subject: [PATCH] Keep branch name for lilypond-installer. --- gub.make | 2 +- lilypond.make | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gub.make b/gub.make index 2232f77..272d308 100644 --- a/gub.make +++ b/gub.make @@ -66,7 +66,7 @@ installers: packages $(foreach p,$(PLATFORMS),$(call INVOKE_INSTALLER_BUILDER,$(p)) $(INSTALL_PACKAGE) && ) : lilypond-installers: packages - $(foreach p,$(PLATFORMS),$(call INVOKE_GUB,$(p)) $(INSTALL_PACKAGE)-installer && ) : + $(foreach p,$(PLATFORMS),$(call INVOKE_GUB,$(p)) $(INSTALL_PACKAGE) && ) : platforms: $(PLATFORMS) diff --git a/lilypond.make b/lilypond.make index 8646572..33a2668 100644 --- a/lilypond.make +++ b/lilypond.make @@ -45,8 +45,9 @@ LILYPOND_SOURCE_URL=$(LILYPOND_REPO_URL)?branch=$(LILYPOND_BRANCH) LILYPOND_DIRRED_BRANCH=$(shell $(PYTHON) gub/repository.py --branch-dir '$(LILYPOND_SOURCE_URL)') LILYPOND_FLATTENED_BRANCH=$(shell $(PYTHON) gub/repository.py --full-branch-name '$(LILYPOND_SOURCE_URL)') BUILD_PACKAGE='$(LILYPOND_SOURCE_URL)' -INSTALL_PACKAGE = lilypond +# these keep the git branch name when making packages +INSTALL_PACKAGE=$(subst lilypond,lilypond-installer,$(BUILD_PACKAGE)) DOC_PACKAGE=$(subst lilypond,lilypond-doc,$(BUILD_PACKAGE)) TEST_PACKAGE=$(subst lilypond,lilypond-test,$(BUILD_PACKAGE)) -- 1.6.0.4
From 2ca2586d1318d2627fa8f437a3ef99facb51165f Mon Sep 17 00:00:00 2001 From: Graham Percival <[email protected]> Date: Wed, 13 Jan 2010 14:42:50 +0000 Subject: [PATCH] Use the dependencies from LilyPond_base; fixed release build. Before this patch, gub was building -master for the installer instead of using stable/2.12. (when called with that LILYPOND_BRANCH) --- gub/specs/lilypond-installer.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/gub/specs/lilypond-installer.py b/gub/specs/lilypond-installer.py index e8d3a6a..883e0c5 100644 --- a/gub/specs/lilypond-installer.py +++ b/gub/specs/lilypond-installer.py @@ -12,9 +12,6 @@ from gub.specs import lilypond # not really a 'python driver'. class LilyPond_installer (lilypond.LilyPond_base): install_command = 'true' - def __init__ (self, settings, source): - lilypond.LilyPond_base.__init__ (self, settings, source) - self.dependencies = [self.settings.target_platform + '::lilypond'] def compile (self): # FIXME: ugh, no branches anymore in self.settings.branches['guile'], # let's hope/assume the user did not override guile source or branch... -- 1.6.0.4
_______________________________________________ lilypond-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/lilypond-devel
