[haiku-commits] Re: buildtools: btrev43020 - jam

  • From: Matt Madia <mattmadia@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 23 Dec 2011 19:52:34 -0500

On Fri, Dec 23, 2011 at 19:42,  <mattmadia@xxxxxxxxx> wrote:
> btrev43020 adds 3 changesets to branch 'master'
> old head: d6fd401aa36cf14d708d907bf2d9471aff0a7ec5
> new head: 18f073d8bf9ef3253f2c8ca65cc05bc5fe26bca2
>
> 9ceedec: Created new jam variable JAMJOBS, which is set by the -jx flag.

In a bit, I'll be updating InvokeSubJam to $(JAM:E=jam) -q
-j$(JAMJOBS:E=1) $(COMMAND_LINE) ;
I don't plan on using multiple jobs for Buildbot -- this has just been
a personal itch for a while.

> 18f073d: Bumped up the VERSION and made JAMVERSYM identical to it.

>  /* Keep JAMVERSYM in sync with VERSION. */
>  /* It can be accessed as $(JAMVERSION) in the Jamfile. */
>
> -#define VERSION "2.5-haiku-20090626"
> -#define JAMVERSYM "JAMVERSION=2.5"
> +#define VERSION "2.5-haiku-20111222"
> +#define JAMVERSYM "JAMVERSION=2.5-haiku-20111222"

Would it be OK to add jam version checking in HAIKU_TOP/Jamfile?

+HAIKU_REQUIRED_JAM_VERSION = 2.5-haiku-20111222 ;
+if $(JAMVERSION) != $(HAIKU_REQUIRED_JAM_VERSION) {
+       Echo "error: jam version $(HAIKU_REQUIRED_JAM_VERSION) is required." ;
+       Echo "For instructions on building and installing jam, " ;
+       Echo "See 'Building the Jam executable' in the ReadMe file." ;
+       Exit ;
+}

--mmadia

Other related posts: