[haiku-commits] haiku: hrev52467 - /

  • From: waddlesplash@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 1 Nov 2018 21:37:50 -0400 (EDT)

hrev52467 adds 1 changeset to branch 'master'
old head: f7b5d8a16b6028fec9d5614672be992be38e358a
new head: c52d856e2d7011fe1e95fa0c7e04d843a5009ea6
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=c52d856e2d70+%5Ef7b5d8a16b60

----------------------------------------------------------------------------

c52d856e2d70: Jamrules: Permit (but don't advertise) support for any relative 
path.
  
  This allows fully "shadowed" builds to work, as the buildbots do.

                              [ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev52467
Commit:      c52d856e2d7011fe1e95fa0c7e04d843a5009ea6
URL:         https://git.haiku-os.org/haiku/commit/?id=c52d856e2d70
Author:      Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date:        Fri Nov  2 01:37:04 2018 UTC

----------------------------------------------------------------------------

1 file changed, 4 insertions(+), 2 deletions(-)
Jamrules | 6 ++++--

----------------------------------------------------------------------------

diff --git a/Jamrules b/Jamrules
index 363860c102..f6cd45ce9e 100644
--- a/Jamrules
+++ b/Jamrules
@@ -1,11 +1,13 @@
 # Haiku Jamrules
 
-# Make sure HAIKU_TOP is relative and either the current or parent directory.
+# Make sure HAIKU_TOP is a relative path (and prefer it to be the current or
+# parent directory.)
 #
 # This is done so that invocations to the compiler and other tools, which
 # under some circumstances inject the source's path into the generated file,
 # are passed relative paths, making builds more reproducible.
-if $(HAIKU_TOP) != "." && $(HAIKU_TOP) != ".." {
+if $(HAIKU_TOP) != "." && $(HAIKU_TOP) != ".."
+               && ! [ Match "\\.\\./(.*)" : $(HAIKU_TOP) ] {
        Exit "The present path to the project root is '$(HAIKU_TOP)', but you"
                "must be in the project root or a \"generated\" directory in 
order to"
                "build Haiku."


Other related posts:

  • » [haiku-commits] haiku: hrev52467 - / - waddlesplash