[haiku-commits] r36016 - in haiku/trunk: build/jam src/add-ons/tracker/zipomatic src/apps/aboutsystem src/apps/bootman src/apps/drivesetup ...

  • From: ingo_weinhold@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Wed, 31 Mar 2010 20:34:03 +0200 (CEST)

Author: bonefish
Date: 2010-03-31 20:34:03 +0200 (Wed, 31 Mar 2010)
New Revision: 36016
Changeset: http://dev.haiku-os.org/changeset/36016/haiku

Modified:
   haiku/trunk/build/jam/BeOSRules
   haiku/trunk/src/add-ons/tracker/zipomatic/Jamfile
   haiku/trunk/src/apps/aboutsystem/Jamfile
   haiku/trunk/src/apps/bootman/Jamfile
   haiku/trunk/src/apps/drivesetup/Jamfile
   haiku/trunk/src/apps/expander/Jamfile
   haiku/trunk/src/apps/installer/Jamfile
   haiku/trunk/src/apps/mail/Jamfile
   haiku/trunk/src/apps/midiplayer/Jamfile
   haiku/trunk/src/apps/pairs/Jamfile
   haiku/trunk/src/apps/readonlybootprompt/Jamfile
   haiku/trunk/src/apps/screenshot/Jamfile
   haiku/trunk/src/apps/showimage/Jamfile
   haiku/trunk/src/apps/stylededit/Jamfile
   haiku/trunk/src/preferences/appearance/Jamfile
   haiku/trunk/src/preferences/backgrounds/Jamfile
   haiku/trunk/src/preferences/bluetooth/Jamfile
   haiku/trunk/src/preferences/cpufrequency/Jamfile
   haiku/trunk/src/preferences/fonts/Jamfile
   haiku/trunk/src/preferences/keyboard/Jamfile
   haiku/trunk/src/preferences/keymap/Jamfile
   haiku/trunk/src/preferences/locale/Jamfile
   haiku/trunk/src/preferences/media/Jamfile
   haiku/trunk/src/preferences/mouse/Jamfile
   haiku/trunk/src/preferences/network/Jamfile
   haiku/trunk/src/preferences/opengl/Jamfile
   haiku/trunk/src/preferences/print/Jamfile
   haiku/trunk/src/preferences/touchpad/Jamfile
   haiku/trunk/src/preferences/virtualmemory/Jamfile
   haiku/trunk/src/servers/print/Jamfile
Log:
DoCatalogs:
* Renamed parameter "appName" to "target".
* Replaced parameter "generatedCatalog" by "sourceLanguage" and made it
  optional. Default is "en".
* Removed the no longer needed parameter from the DoCatalogs invocations.


Modified: haiku/trunk/build/jam/BeOSRules
===================================================================
--- haiku/trunk/build/jam/BeOSRules     2010-03-31 17:33:35 UTC (rev 36015)
+++ haiku/trunk/build/jam/BeOSRules     2010-03-31 18:34:03 UTC (rev 36016)
@@ -359,19 +359,22 @@
                -s $(HAIKU_CATALOG_SIGNATURE) -o "$(1)"
 }
 
-rule DoCatalogs appName : signature : sources : generatedCatalog
+rule DoCatalogs target : signature : sources : sourceLanguage
 {
-       # General rules to invoke from jamfiles and that do (almost) everything 
related
-       # to localization
+       # DoCatalogs <target> : <signature> : <sources> [ : <sourceLanguage> ]
        #
-       # appName:                      Application name.
+       # Extracts the catkeys from a target's source files, generates the
+       # default catalog from them, and also generates catalogs for all
+       # translations.
+       #
+       # target:                       The target.
        # signature:            Application MIME signature (must match the one
        #                                       declared in the sourcecode).
        # sources:                      List of cpp files where to search keys.
-       # generatedCatalog:     Name of the generated catalog (most probably
-       #                                       en.catalog).
+       # sourceLanguage        Short name of the language of used for the 
strings in
+       #                                       the sources. Optional: default 
is "en".
 
-       generatedCatalog = [ FGristFiles $(generatedCatalog) ] ;
+       local generatedCatalog = [ FGristFiles 
$(sourceLanguage:E=en:S=.catalog) ] ;
 
        # generate catkeys file from sources
        ExtractCatalogEntries $(generatedCatalog:S=.catkeys)
@@ -391,6 +394,6 @@
                        : $(signature) : $(catkeysFile:B) ;
        }
 
-       HAIKU_CATALOG_FILES on $(appName) = $(catkeysFiles:S=.catalog) ;
-       HAIKU_CATALOG_SIGNATURE on $(appName) = $(signature) ;
+       HAIKU_CATALOG_FILES on $(target) = $(catkeysFiles:S=.catalog) ;
+       HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
 }

Modified: haiku/trunk/src/add-ons/tracker/zipomatic/Jamfile
===================================================================
--- haiku/trunk/src/add-ons/tracker/zipomatic/Jamfile   2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/add-ons/tracker/zipomatic/Jamfile   2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -19,6 +19,5 @@
        ZipOMatic.cpp
        ZipOMaticWindow.cpp
        ZipperThread.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/apps/aboutsystem/Jamfile
===================================================================
--- haiku/trunk/src/apps/aboutsystem/Jamfile    2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/aboutsystem/Jamfile    2010-03-31 18:34:03 UTC (rev 
36016)
@@ -28,5 +28,4 @@
        :
        AboutSystem.cpp
        Utilities.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/apps/bootman/Jamfile
===================================================================
--- haiku/trunk/src/apps/bootman/Jamfile        2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/bootman/Jamfile        2010-03-31 18:34:03 UTC (rev 
36016)
@@ -41,5 +41,4 @@
        PartitionsPage.cpp
        UninstallPage.cpp
        WizardView.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/apps/drivesetup/Jamfile
===================================================================
--- haiku/trunk/src/apps/drivesetup/Jamfile     2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/drivesetup/Jamfile     2010-03-31 18:34:03 UTC (rev 
36016)
@@ -26,6 +26,5 @@
        MainWindow.cpp
        PartitionList.cpp
        Support.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/apps/expander/Jamfile
===================================================================
--- haiku/trunk/src/apps/expander/Jamfile       2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/expander/Jamfile       2010-03-31 18:34:03 UTC (rev 
36016)
@@ -20,5 +20,4 @@
        ExpanderWindow.cpp
        ExpanderSettings.cpp
        DirectoryFilePanel.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/apps/installer/Jamfile
===================================================================
--- haiku/trunk/src/apps/installer/Jamfile      2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/installer/Jamfile      2010-03-31 18:34:03 UTC (rev 
36016)
@@ -24,6 +24,5 @@
        PackageViews.cpp
        ProgressReporter.cpp
        WorkerThread.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/apps/mail/Jamfile
===================================================================
--- haiku/trunk/src/apps/mail/Jamfile   2010-03-31 17:33:35 UTC (rev 36015)
+++ haiku/trunk/src/apps/mail/Jamfile   2010-03-31 18:34:03 UTC (rev 36016)
@@ -50,6 +50,5 @@
        MailWindow.cpp
        Prefs.cpp
        Signature.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/apps/midiplayer/Jamfile
===================================================================
--- haiku/trunk/src/apps/midiplayer/Jamfile     2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/midiplayer/Jamfile     2010-03-31 18:34:03 UTC (rev 
36016)
@@ -17,5 +17,4 @@
        MidiPlayerApp.cpp 
        MidiPlayerWindow.cpp 
        ScopeView.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/apps/pairs/Jamfile
===================================================================
--- haiku/trunk/src/apps/pairs/Jamfile  2010-03-31 17:33:35 UTC (rev 36015)
+++ haiku/trunk/src/apps/pairs/Jamfile  2010-03-31 18:34:03 UTC (rev 36016)
@@ -16,5 +16,4 @@
        x-vnd.Haiku-Pairs
        :
        PairsWindow.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/apps/readonlybootprompt/Jamfile
===================================================================
--- haiku/trunk/src/apps/readonlybootprompt/Jamfile     2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/apps/readonlybootprompt/Jamfile     2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -18,6 +18,5 @@
        :
        BootPrompt.cpp
        BootPromptWindow.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/apps/screenshot/Jamfile
===================================================================
--- haiku/trunk/src/apps/screenshot/Jamfile     2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/screenshot/Jamfile     2010-03-31 18:34:03 UTC (rev 
36016)
@@ -16,5 +16,4 @@
        x-vnd.Haiku-Screenshot
        :
                ScreenshotWindow.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/apps/showimage/Jamfile
===================================================================
--- haiku/trunk/src/apps/showimage/Jamfile      2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/showimage/Jamfile      2010-03-31 18:34:03 UTC (rev 
36016)
@@ -28,5 +28,4 @@
        ResizerWindow.cpp
        ShowImageApp.cpp
        ShowImageWindow.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/apps/stylededit/Jamfile
===================================================================
--- haiku/trunk/src/apps/stylededit/Jamfile     2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/apps/stylededit/Jamfile     2010-03-31 18:34:03 UTC (rev 
36016)
@@ -27,5 +27,4 @@
        ReplaceWindow.cpp
        StyledEditApp.cpp
        StyledEditWindow.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/preferences/appearance/Jamfile
===================================================================
--- haiku/trunk/src/preferences/appearance/Jamfile      2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/preferences/appearance/Jamfile      2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -35,6 +35,5 @@
        ColorSet.cpp
        ColorWell.cpp
        ColorWhichItem.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/preferences/backgrounds/Jamfile
===================================================================
--- haiku/trunk/src/preferences/backgrounds/Jamfile     2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/preferences/backgrounds/Jamfile     2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -17,6 +17,5 @@
        Backgrounds.cpp
        BackgroundsView.cpp
        ImageFilePanel.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/preferences/bluetooth/Jamfile
===================================================================
--- haiku/trunk/src/preferences/bluetooth/Jamfile       2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/preferences/bluetooth/Jamfile       2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -27,6 +27,5 @@
        ExtendedLocalDeviceView.cpp
        InquiryPanel.cpp
        RemoteDevicesView.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/preferences/cpufrequency/Jamfile
===================================================================
--- haiku/trunk/src/preferences/cpufrequency/Jamfile    2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/preferences/cpufrequency/Jamfile    2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -20,6 +20,5 @@
        main.cpp
        StatusView.cpp
        PreferencesWindow.h
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/preferences/fonts/Jamfile
===================================================================
--- haiku/trunk/src/preferences/fonts/Jamfile   2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/preferences/fonts/Jamfile   2010-03-31 18:34:03 UTC (rev 
36016)
@@ -17,6 +17,5 @@
        FontView.cpp
        main.cpp
        MainWindow.cpp
-       : en.catalog
 ;
 

Modified: haiku/trunk/src/preferences/keyboard/Jamfile
===================================================================
--- haiku/trunk/src/preferences/keyboard/Jamfile        2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/preferences/keyboard/Jamfile        2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -24,5 +24,4 @@
        Keyboard.cpp
        KeyboardWindow.cpp
        KeyboardView.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/preferences/keymap/Jamfile
===================================================================
--- haiku/trunk/src/preferences/keymap/Jamfile  2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/preferences/keymap/Jamfile  2010-03-31 18:34:03 UTC (rev 
36016)
@@ -19,5 +19,4 @@
 DoCatalogs Keymap :
        x-vnd.Haiku-Keymap
        : KeymapWindow.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/preferences/locale/Jamfile
===================================================================
--- haiku/trunk/src/preferences/locale/Jamfile  2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/preferences/locale/Jamfile  2010-03-31 18:34:03 UTC (rev 
36016)
@@ -19,6 +19,5 @@
        Locale.cpp
        LocaleWindow.cpp
        TimeFormatSettingsView.cpp
-       : en.catalog            # default catalog generated from sourcecode
 ;
 

Modified: haiku/trunk/src/preferences/media/Jamfile
===================================================================
--- haiku/trunk/src/preferences/media/Jamfile   2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/preferences/media/Jamfile   2010-03-31 18:34:03 UTC (rev 
36016)
@@ -23,5 +23,4 @@
        : x-vnd.Haiku-Media
        : MediaViews.cpp
          MediaWindow.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/preferences/mouse/Jamfile
===================================================================
--- haiku/trunk/src/preferences/mouse/Jamfile   2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/preferences/mouse/Jamfile   2010-03-31 18:34:03 UTC (rev 
36016)
@@ -18,5 +18,4 @@
        Mouse.cpp
        MouseWindow.cpp
        SettingsView.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/preferences/network/Jamfile
===================================================================
--- haiku/trunk/src/preferences/network/Jamfile 2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/preferences/network/Jamfile 2010-03-31 18:34:03 UTC (rev 
36016)
@@ -18,5 +18,4 @@
        :
        EthernetSettingsView.cpp
        NetworkWindow.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/preferences/opengl/Jamfile
===================================================================
--- haiku/trunk/src/preferences/opengl/Jamfile  2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/preferences/opengl/Jamfile  2010-03-31 18:34:03 UTC (rev 
36016)
@@ -22,6 +22,5 @@
        ExtensionsList.cpp
        ExtensionsView.cpp
        InfoView.cpp
-       : en.catalog
 ;
        

Modified: haiku/trunk/src/preferences/print/Jamfile
===================================================================
--- haiku/trunk/src/preferences/print/Jamfile   2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/preferences/print/Jamfile   2010-03-31 18:34:03 UTC (rev 
36016)
@@ -27,7 +27,5 @@
        JobListView.cpp
        PrinterListView.cpp
        PrintersWindow.cpp
-       : 
-       en.catalog
 ;
        

Modified: haiku/trunk/src/preferences/touchpad/Jamfile
===================================================================
--- haiku/trunk/src/preferences/touchpad/Jamfile        2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/preferences/touchpad/Jamfile        2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -15,5 +15,4 @@
        :
        TouchpadPrefView.cpp
        main.cpp
-       : en.catalog
 ;

Modified: haiku/trunk/src/preferences/virtualmemory/Jamfile
===================================================================
--- haiku/trunk/src/preferences/virtualmemory/Jamfile   2010-03-31 17:33:35 UTC 
(rev 36015)
+++ haiku/trunk/src/preferences/virtualmemory/Jamfile   2010-03-31 18:34:03 UTC 
(rev 36016)
@@ -20,5 +20,4 @@
     : 
     VirtualMemory.cpp 
     SettingsWindow.cpp 
-    : en.catalog 
 ; 

Modified: haiku/trunk/src/servers/print/Jamfile
===================================================================
--- haiku/trunk/src/servers/print/Jamfile       2010-03-31 17:33:35 UTC (rev 
36015)
+++ haiku/trunk/src/servers/print/Jamfile       2010-03-31 18:34:03 UTC (rev 
36016)
@@ -36,7 +36,5 @@
        ConfigWindow.cpp
        PrintServerApp.cpp
        PrintServerApp.R5.cpp
-       : 
-       en.catalog
 ;
 


Other related posts:

  • » [haiku-commits] r36016 - in haiku/trunk: build/jam src/add-ons/tracker/zipomatic src/apps/aboutsystem src/apps/bootman src/apps/drivesetup ... - ingo_weinhold