HaikuDepot : Generate Sources -Fix Build

In recent changes to HD's build files to generate
some sources at build-time there was a problem
with builds that were configured to run with some
element of concurrency.  In this change, the steps
that should be in sequence are done with shell
commands to avoid race conditions.

Change-Id: I5b6fb4907d8ea5f3ca90de956ecce322cd89c685
Reviewed-on: https://review.haiku-os.org/c/1130
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Andrew Lindesay
2019-03-02 16:43:33 +00:00
parent 2c73537c43
commit c91b716e09
2 changed files with 5 additions and 7 deletions
@@ -39,15 +39,14 @@ rule HdsSchemaGenModel
Clean $(1:D) ; Clean $(1:D) ;
Depends $(1) : $(2) $(3) ; Depends $(1) : $(2) $(3) ;
MkDir $(1:D) ;
HdsSchemaGenTouch $(1) ;
HdsSchemaGenModel1 $(1) : $(2) $(3) $(1:D) ; HdsSchemaGenModel1 $(1) : $(2) $(3) $(1:D) ;
} }
actions HdsSchemaGenModel1 actions HdsSchemaGenModel1
{ {
mkdir -p $(2[3])
python $(2[2]) -i $(2[1]) --outputdirectory $(2[3]) python $(2[2]) -i $(2[1]) --outputdirectory $(2[3])
touch $(1)
} }
# pragma mark - Bulk Parsing Class Generation # pragma mark - Bulk Parsing Class Generation
@@ -63,15 +62,14 @@ rule HdsSchemaGenBulkParser
Clean $(1:D) ; Clean $(1:D) ;
Depends $(1) : $(2) $(3) ; Depends $(1) : $(2) $(3) ;
MkDir $(1:D) ;
HdsSchemaGenTouch $(1) ;
HdsSchemaGenBulkParser1 $(1) : $(2) $(3) $(1:D) ; HdsSchemaGenBulkParser1 $(1) : $(2) $(3) $(1:D) ;
} }
actions HdsSchemaGenBulkParser1 actions HdsSchemaGenBulkParser1
{ {
mkdir -p $(2[3])
python $(2[2]) -i $(2[1]) --outputdirectory $(2[3]) --supportbulkcontainer python $(2[2]) -i $(2[1]) --outputdirectory $(2[3]) --supportbulkcontainer
touch $(1)
} }
# pragma mark - Registering Generated Classes # pragma mark - Registering Generated Classes
+1 -1
View File
@@ -406,7 +406,7 @@ Model::Model()
// Force the preferred language to one of the currently supported // Force the preferred language to one of the currently supported
// ones, until the web application supports all ISO language codes. // ones, until the web application supports all ISO language codes.
printf("User preferred language '%s' not currently supported, " printf("User preferred language '%s' not currently supported, "
"defaulting to 'en'.", fPreferredLanguage.String()); "defaulting to 'en'.\n", fPreferredLanguage.String());
fPreferredLanguage = "en"; fPreferredLanguage = "en";
} }
fWebAppInterface.SetPreferredLanguage(fPreferredLanguage); fWebAppInterface.SetPreferredLanguage(fPreferredLanguage);