[haiku-commits] haiku: hrev46211 - build/jam

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 10 Oct 2013 23:46:09 +0200 (CEST)

hrev46211 adds 1 changeset to branch 'master'
old head: 40b9ac787c692d8ef51806c1f14ad419955500e2
new head: 56434332b1d718ebf610e80a5d6043f3e28dba16
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=5643433+%5E40b9ac7

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

5643433: Make some values of default build profiles overridable.
  
  * Defining things like HAIKU_ROOT_USER_NAME in UserBuildConfig now 
    has an effect on the image again.

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

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

Revision:    hrev46211
Commit:      56434332b1d718ebf610e80a5d6043f3e28dba16
URL:         http://cgit.haiku-os.org/haiku/commit/?id=5643433
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Thu Oct 10 21:45:29 2013 UTC

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

1 file changed, 10 insertions(+), 10 deletions(-)
build/jam/DefaultBuildProfiles | 20 ++++++++++----------

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

diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 4615f55..d780c23 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -29,11 +29,11 @@ rule DefineDefaultBuildProfiles
        switch $(HAIKU_BUILD_PROFILE) {
                case "alpha-*" : {
                        Echo Building Haiku R1/alpha ;
-                       HAIKU_ROOT_USER_NAME = user ;
-                       HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
+                       HAIKU_ROOT_USER_NAME ?= user ;
+                       HAIKU_ROOT_USER_REAL_NAME ?= "Yourself" ;
                        AddGroupToHaikuImage party : 101 : user sshd ;
-                       HAIKU_IMAGE_HOST_NAME = shredder ;
-                       HAIKU_IMAGE_SIZE = 800 ;
+                       HAIKU_IMAGE_HOST_NAME ?= shredder ;
+                       HAIKU_IMAGE_SIZE ?= 800 ;
 
                        AddHaikuImagePackages
                                bepdf
@@ -81,11 +81,11 @@ rule DefineDefaultBuildProfiles
 
                case "nightly-*" : {
                        Echo Building Haiku Nightly ;
-                       HAIKU_ROOT_USER_NAME = user ;
-                       HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
+                       HAIKU_ROOT_USER_NAME ?= user ;
+                       HAIKU_ROOT_USER_REAL_NAME ?= "Yourself" ;
                        AddGroupToHaikuImage party : 101 : user sshd ;
-                       HAIKU_IMAGE_HOST_NAME = shredder ;
-                       HAIKU_IMAGE_SIZE = 600 ;
+                       HAIKU_IMAGE_HOST_NAME ?= shredder ;
+                       HAIKU_IMAGE_SIZE ?= 600 ;
 
                        AddHaikuImagePackages
                                man
@@ -104,8 +104,8 @@ rule DefineDefaultBuildProfiles
 
                case "bootstrap-*" : {
                        Echo Building Haiku Bootstrap ;
-                       HAIKU_IMAGE_HOST_NAME = shredder ;
-                       HAIKU_IMAGE_SIZE = 20000 ;
+                       HAIKU_IMAGE_HOST_NAME ?= shredder ;
+                       HAIKU_IMAGE_SIZE ?= 20000 ;
 
                        AddHaikuImagePackages
                                autoconf


Other related posts: