Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HaikuDepot : Generate Sources -Fix Build

Browse Source 
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 <pulkomandy@gmail.com>
This commit is contained in:
Andrew Lindesay 2019-03-02 11:09:32 +01:00
parent 2c73537c43
commit c91b716e09
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/apps/haikudepot/build/jam/HdsSchemaGenRules
View File

@ -39,15 +39,14 @@ rule HdsSchemaGenModel
Clean $(1:D) ;
Depends $(1) : $(2) $(3) ;
MkDir $(1:D) ;
HdsSchemaGenTouch $(1) ;
HdsSchemaGenModel1 $(1) : $(2) $(3) $(1:D) ;
}
actions HdsSchemaGenModel1
{
mkdir -p $(2[3])
python $(2[2]) -i $(2[1]) --outputdirectory $(2[3])
touch $(1)
}
# pragma mark - Bulk Parsing Class Generation
@ -63,15 +62,14 @@ rule HdsSchemaGenBulkParser
Clean $(1:D) ;
Depends $(1) : $(2) $(3) ;
MkDir $(1:D) ;
HdsSchemaGenTouch $(1) ;
HdsSchemaGenBulkParser1 $(1) : $(2) $(3) $(1:D) ;
}
actions HdsSchemaGenBulkParser1
{
mkdir -p $(2[3])
python $(2[2]) -i $(2[1]) --outputdirectory $(2[3]) --supportbulkcontainer
touch $(1)
}
# pragma mark - Registering Generated Classes

2
src/apps/haikudepot/model/Model.cpp
View File

@ -406,7 +406,7 @@ Model::Model()
// Force the preferred language to one of the currently supported
// ones, until the web application supports all ISO language codes.
printf("User preferred language '%s' not currently supported, "
"defaulting to 'en'.", fPreferredLanguage.String());
"defaulting to 'en'.\n", fPreferredLanguage.String());
fPreferredLanguage = "en";
}
fWebAppInterface.SetPreferredLanguage(fPreferredLanguage);