* 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

@@ -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 <target> : <signature> : <sources> [ : <sourceLanguage> ]
-	#	[ : <regexp> ] [ : <folder> ]
+	#	[ : <regexp> ]
 	#
 	# 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

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
 ;

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 ;