From 1974e3382646e618bdc5e8f54e57e0bc3f46cc64 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sun, 24 Oct 2010 02:49:44 +0000 Subject: [PATCH] * More work relating to supporting multiple localized targets in the same directory. Introduced a new variable HAIKU_MULTIPLE_LOCALIZED_TARGETS, which gets set in any Jamfiles that contain multiple DoCatalogs invocations. This removes the need to supply folder parameter to DoCatalogs. * Add the DoCatalogs invocation for filepanel. * Relocated the catkeys for Screenshot and screenshot into their respective directories. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39112 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/LocaleRules | 13 +++++++++---- .../apps/screenshot/{ => Screenshot}/de.catkeys | 0 .../apps/screenshot/{ => Screenshot}/es.catkeys | 0 .../apps/screenshot/{ => Screenshot}/fi.catkeys | 0 .../apps/screenshot/{ => Screenshot}/ja.catkeys | 0 .../apps/screenshot/{ => Screenshot}/ko.catkeys | 0 .../apps/screenshot/{ => Screenshot}/lt.catkeys | 0 .../apps/screenshot/{ => Screenshot}/pt_br.catkeys | 0 .../apps/screenshot/{ => Screenshot}/ru.catkeys | 0 .../apps/screenshot/{ => Screenshot}/sv.catkeys | 0 .../apps/screenshot/{ => Screenshot}/uk.catkeys | 0 .../apps/screenshot/{ => screenshot}/fr.catkeys | 0 .../apps/screenshot/{ => screenshot}/pt.catkeys | 0 .../screenshot/{ => screenshot}/zh_hans.catkeys | 0 src/apps/screenshot/Jamfile | 5 ++--- src/bin/Jamfile | 10 +++++++--- 16 files changed, 18 insertions(+), 10 deletions(-) rename data/catalogs/apps/screenshot/{ => Screenshot}/de.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/es.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/fi.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/ja.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/ko.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/lt.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/pt_br.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/ru.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/sv.catkeys (100%) rename data/catalogs/apps/screenshot/{ => Screenshot}/uk.catkeys (100%) rename data/catalogs/apps/screenshot/{ => screenshot}/fr.catkeys (100%) rename data/catalogs/apps/screenshot/{ => screenshot}/pt.catkeys (100%) rename data/catalogs/apps/screenshot/{ => screenshot}/zh_hans.catkeys (100%) diff --git a/build/jam/LocaleRules b/build/jam/LocaleRules index a0c5e5721c..8f9e118c26 100644 --- a/build/jam/LocaleRules +++ b/build/jam/LocaleRules @@ -101,10 +101,10 @@ actions LinkApplicationCatalog1 -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)" } -rule DoCatalogs target : signature : sources : sourceLanguage : regexp : folder +rule DoCatalogs target : signature : sources : sourceLanguage : regexp { # DoCatalogs : : [ : ] - # [ : ] [ : ] + # [ : ] # # Extracts the catkeys from a target's source files, generates the # default catalog from them, and also generates catalogs for all @@ -118,13 +118,18 @@ rule DoCatalogs target : signature : sources : sourceLanguage : regexp : folder # the sources. Optional: default is "en". # regexp The regular expression used to parse the files. # Optional: default is matching be_catalog->GetString - # folder Optional: the subdirectory containing *.catkeys # Make a note of all targets that call this rule. # This will be used for the pseudo-target catkeys HAIKU_LOCALIZED_TARGETS += $(target) ; - local subdir = $(SUBDIR_TOKENS[2-]) $(folder) ; + local subdir ; + if [ on $(SUBDIR) return $(HAIKU_MULTIPLE_LOCALIZED_TARGETS) ] { + subdir = $(SUBDIR_TOKENS[2-]) $(target) ; + } else { + subdir = $(SUBDIR_TOKENS[2-]) ; + } + HAIKU_CATALOGS_SUBDIR on $(signature) = $(subdir) ; local generatedCatalog diff --git a/data/catalogs/apps/screenshot/de.catkeys b/data/catalogs/apps/screenshot/Screenshot/de.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/de.catkeys rename to data/catalogs/apps/screenshot/Screenshot/de.catkeys diff --git a/data/catalogs/apps/screenshot/es.catkeys b/data/catalogs/apps/screenshot/Screenshot/es.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/es.catkeys rename to data/catalogs/apps/screenshot/Screenshot/es.catkeys diff --git a/data/catalogs/apps/screenshot/fi.catkeys b/data/catalogs/apps/screenshot/Screenshot/fi.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/fi.catkeys rename to data/catalogs/apps/screenshot/Screenshot/fi.catkeys diff --git a/data/catalogs/apps/screenshot/ja.catkeys b/data/catalogs/apps/screenshot/Screenshot/ja.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/ja.catkeys rename to data/catalogs/apps/screenshot/Screenshot/ja.catkeys diff --git a/data/catalogs/apps/screenshot/ko.catkeys b/data/catalogs/apps/screenshot/Screenshot/ko.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/ko.catkeys rename to data/catalogs/apps/screenshot/Screenshot/ko.catkeys diff --git a/data/catalogs/apps/screenshot/lt.catkeys b/data/catalogs/apps/screenshot/Screenshot/lt.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/lt.catkeys rename to data/catalogs/apps/screenshot/Screenshot/lt.catkeys diff --git a/data/catalogs/apps/screenshot/pt_br.catkeys b/data/catalogs/apps/screenshot/Screenshot/pt_br.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/pt_br.catkeys rename to data/catalogs/apps/screenshot/Screenshot/pt_br.catkeys diff --git a/data/catalogs/apps/screenshot/ru.catkeys b/data/catalogs/apps/screenshot/Screenshot/ru.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/ru.catkeys rename to data/catalogs/apps/screenshot/Screenshot/ru.catkeys diff --git a/data/catalogs/apps/screenshot/sv.catkeys b/data/catalogs/apps/screenshot/Screenshot/sv.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/sv.catkeys rename to data/catalogs/apps/screenshot/Screenshot/sv.catkeys diff --git a/data/catalogs/apps/screenshot/uk.catkeys b/data/catalogs/apps/screenshot/Screenshot/uk.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/uk.catkeys rename to data/catalogs/apps/screenshot/Screenshot/uk.catkeys diff --git a/data/catalogs/apps/screenshot/fr.catkeys b/data/catalogs/apps/screenshot/screenshot/fr.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/fr.catkeys rename to data/catalogs/apps/screenshot/screenshot/fr.catkeys diff --git a/data/catalogs/apps/screenshot/pt.catkeys b/data/catalogs/apps/screenshot/screenshot/pt.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/pt.catkeys rename to data/catalogs/apps/screenshot/screenshot/pt.catkeys diff --git a/data/catalogs/apps/screenshot/zh_hans.catkeys b/data/catalogs/apps/screenshot/screenshot/zh_hans.catkeys similarity index 100% rename from data/catalogs/apps/screenshot/zh_hans.catkeys rename to data/catalogs/apps/screenshot/screenshot/zh_hans.catkeys diff --git a/src/apps/screenshot/Jamfile b/src/apps/screenshot/Jamfile index dea306acef..32ccccd9fe 100644 --- a/src/apps/screenshot/Jamfile +++ b/src/apps/screenshot/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src apps screenshot ; +HAIKU_MULTIPLE_LOCALIZED_TARGETS on $(SUBDIR) = 1 ; + UsePrivateHeaders interface ; Application Screenshot : @@ -29,7 +31,4 @@ DoCatalogs screenshot : x-vnd.haiku-screenshot-cli : Utility.cpp - : - : - : cli ; diff --git a/src/bin/Jamfile b/src/bin/Jamfile index bada2f4b13..77d17d7d4e 100644 --- a/src/bin/Jamfile +++ b/src/bin/Jamfile @@ -1,5 +1,7 @@ SubDir HAIKU_TOP src bin ; +HAIKU_MULTIPLE_LOCALIZED_TARGETS on $(SUBDIR) = 1 ; + SetSubDirSupportedPlatformsBeOSCompatible ; AddSubDirSupportedPlatforms libbe_test ; @@ -218,9 +220,11 @@ StdBinCommands DoCatalogs dstcheck : x-vnd.Haiku-cmd-dstconfig : dstcheck.cpp - : - : - : dstcheck +; + +DoCatalogs filepanel + : x-vnd.mmu_man.filepanel + : filepanel.cpp ; SubInclude HAIKU_TOP src bin addattr ;