i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Allow to put the different catalogs for the bin/ directory in spearate places in the generated folder.

Browse Source 
*  I didn't manage to make it work for the translations, however. If someone with better jam knowledge could look at it...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37871 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Adrien Destugues
2010-08-03 14:10:15 +00:00
parent 2651e51d92
commit a7faa05822
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/LocaleRules
+5 -2
View File
@@ -66,6 +66,7 @@ rule ExtractCatalogEntries target : sources : signature : regexp
actions ExtractCatalogEntries1 actions ExtractCatalogEntries1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
mkdir -p "$(1:D)"
cat "$(2[2-])" \ cat "$(2[2-])" \
| $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) - > "$(1)".pre | $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) - > "$(1)".pre
$(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \ $(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
@@ -91,11 +92,12 @@ rule LinkApplicationCatalog target : sources : signature : language
actions LinkApplicationCatalog1 actions LinkApplicationCatalog1
{ {
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
mkdir -p "$(1:D)"
$(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) \ $(2[1]) "$(2[2-])" -l $(HAIKU_CATALOG_LANGUAGE) \
-s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)" -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
} }
rule DoCatalogs target : signature : sources : sourceLanguage : regexp rule DoCatalogs target : signature : sources : sourceLanguage : regexp : folder
{ {
# DoCatalogs <target> : <signature> : <sources> [ : <sourceLanguage> ] # DoCatalogs <target> : <signature> : <sources> [ : <sourceLanguage> ]
# [ : <regexp> ] # [ : <regexp> ]
@@ -112,8 +114,9 @@ rule DoCatalogs target : signature : sources : sourceLanguage : regexp
# the sources. Optional: default is "en". # the sources. Optional: default is "en".
# regexp The regular expression used to parse the files. # regexp The regular expression used to parse the files.
# Optional: default is matching be_catalog->GetString # Optional: default is matching be_catalog->GetString
# folder Subfolder where to put the generated files. Optional.
local generatedCatalog = [ FGristFiles $(sourceLanguage:E=en:S=.catalog) ] ; local generatedCatalog = [ FGristFiles $(sourceLanguage:E=en:S=.catalog:D=$(folder)) ] ;
# generate catkeys file from sources # generate catkeys file from sources
ExtractCatalogEntries $(generatedCatalog:S=.catkeys) ExtractCatalogEntries $(generatedCatalog:S=.catkeys)
src/bin/Jamfile
+1 -1
View File
@@ -218,7 +218,7 @@ StdBinCommands
DoCatalogs dstcheck : DoCatalogs dstcheck :
x-vnd.Haiku-cmd-dstconfig x-vnd.Haiku-cmd-dstconfig
: dstcheck.cpp : dstcheck.cpp
: dstcheck : : : dstcheck
; ;
SubInclude HAIKU_TOP src bin addattr ; SubInclude HAIKU_TOP src bin addattr ;