[haiku-commits] r39114 - in haiku/trunk: . build/jam

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sun, 24 Oct 2010 05:31:34 +0200 (CEST)

Author: mmadia
Date: 2010-10-24 05:31:34 +0200 (Sun, 24 Oct 2010)
New Revision: 39114
Changeset: http://dev.haiku-os.org/changeset/39114

Modified:
   haiku/trunk/Jamfile
   haiku/trunk/build/jam/LocaleRules
Log:
Improved upon r39090.
 * removed the catkeys pseudo-target
 * created catalogs pseudo-target, which builds all catalogs & en.catkeys(.pre)
 * created LocalizedTargets pseudo-target, which builds all targets that have
 been localized.


Modified: haiku/trunk/Jamfile
===================================================================
--- haiku/trunk/Jamfile 2010-10-24 02:55:46 UTC (rev 39113)
+++ haiku/trunk/Jamfile 2010-10-24 03:31:34 UTC (rev 39114)
@@ -198,5 +198,8 @@
 }
 
 # Pseudo-target to build all targets that are localized.
-NotFile catkeys ;
-Depends catkeys : $(HAIKU_LOCALIZED_TARGETS) ;
+NotFile catalogs ;
+Depends catalogs : $(HAIKU_LOCALIZED_CATALOGS) ;
+
+NotFile LocalizedTargets ;
+Depends LocalizedTargets : $(HAIKU_LOCALIZED_TARGETS) ;

Modified: haiku/trunk/build/jam/LocaleRules
===================================================================
--- haiku/trunk/build/jam/LocaleRules   2010-10-24 02:55:46 UTC (rev 39113)
+++ haiku/trunk/build/jam/LocaleRules   2010-10-24 03:31:34 UTC (rev 39114)
@@ -119,10 +119,6 @@
        # regexp            The regular expression used to parse the files.
        #                   Optional: default is matching be_catalog->GetString
 
-       # 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 ;
        if [ on $(SUBDIR) return $(HAIKU_MULTIPLE_LOCALIZED_TARGETS) ] {
                subdir = $(SUBDIR_TOKENS[2-]) $(target) ;
@@ -157,4 +153,10 @@
 
        HAIKU_CATALOG_FILES on $(target) = $(catkeysFiles:S=.catalog) ;
        HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
+
+       # For the pseudo-target LocalizedTargets
+       HAIKU_LOCALIZED_TARGETS += $(target) ;
+
+       # For the pseudo-target catalogs
+       HAIKU_LOCALIZED_CATALOGS += $(catkeysFiles:S=.catalog) ;
 }


Other related posts:

  • » [haiku-commits] r39114 - in haiku/trunk: . build/jam - mattmadia