[haiku-commits] haiku: hrev43355 - data/develop
- From: zharik@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 28 Nov 2011 13:25:09 +0100 (CET)
hrev43355 adds 1 changeset to branch 'master'
old head: f6bd30f2af5b97b4e133173150ab6e25d6f01bd1
new head: 7e2f796c901c4d3eba299728d0334971ce4b865b
----------------------------------------------------------------------------
2 files changed, 145 insertions(+), 4 deletions(-)
data/develop/Jamfile | 16 +++++-
data/develop/Jamfile-engine | 133 ++++++++++++++++++++++++++++++++++++++-
############################################################################
Revision: hrev43355
Commit: 7e2f796c901c4d3eba299728d0334971ce4b865b
URL: http://cgit.haiku-os.org/haiku/commit/?id=7e2f796
Author: Root User <baron@HaikuVBoxik.(none)>
Date: Mon Nov 28 12:16:28 2011 UTC
Localization support added into Jamfile-engine.
* Added possibility to localize projects driven by Jamfile-engine in
the easy way. Targets "catkeys", "catalogs", "catlogsinstall",
"bindcatalogs" introduced.
* This contribution was made by Peter Polacik during working on GCI 2011
tasks. Thank you!
----------------------------------------------------------------------------
diff --git a/data/develop/Jamfile b/data/develop/Jamfile
index 80cbb78..96e9eba 100644
--- a/data/develop/Jamfile
+++ b/data/develop/Jamfile
@@ -1,4 +1,4 @@
-## Haiku Generic Jamfile v1.0 ##
+## Haiku Generic Jamfile v1.0.1 ##
## Fill in this file to specify the project being created, and the referenced
## Jamfile-engine will do all of the hard work for you. This handles both
@@ -17,6 +17,10 @@ NAME = ;
# DRIVER: Kernel Driver
TYPE = ;
+# Specify the application MIME signature, if you plan to use localization
+# features. String format x-vnd.<VendorName>-<AppName> is recommended.
+APP_MIME_SIG = ;
+
# Specify the source files to use
# Full paths or paths relative to the Jamfile can be included.
# All files, regardless of directory, will have their object
@@ -36,6 +40,9 @@ RSRCS = ;
# - if your library follows the naming pattern of:
# libXXX.so or libXXX.a you can simply specify XXX
# library: libbe.so entry: be
+#
+# - for localization support add following libs:
+# locale localestub
#
# - if your library does not follow the standard library
# naming scheme you need to specify the path to the library
@@ -65,6 +72,13 @@ LOCAL_INCLUDE_PATHS = ;
# NONE, SOME, FULL
OPTIMIZE = ;
+# Specify the codes for languages you are going to support in this
+# application. The default "en" one must be provided too. "jam catkeys"
+# will recreate only locales/en.catkeys file. Use it as template for
+# creating other languages catkeys. All localization files must be
+# placed in "locales" sub-directory.
+LOCALES = ;
+
# Specify any preprocessor symbols to be defined. The symbols will not
# have their values set automatically; you must supply the value (if any)
# to use. For example, setting DEFINES to "DEBUG=1" will cause the
diff --git a/data/develop/Jamfile-engine b/data/develop/Jamfile-engine
index 6f3c6e6..bdec959 100644
--- a/data/develop/Jamfile-engine
+++ b/data/develop/Jamfile-engine
@@ -1,4 +1,4 @@
-## Haiku Generic Jamfile Engine v1.0.1
+## Haiku Generic Jamfile Engine v1.0.2
## Does all the hard work for the Generic Jamfile
## which simply defines the project parameters.
## Most of the real work is done in the Jambase
@@ -6,9 +6,10 @@
##
## Inspired by the Be Makefile Engine
##
-## Supports Generic Jamfile v1.0
+## Supports Generic Jamfile v1.0.1
##
## Copyright (c) 2002-2010 Ryan Leavengood
+## Copyright (c) 2011 Peter Poláčik
## Released under the Terms of the MIT License, see
## http://www.opensource.org/licenses/mit-license.html
@@ -70,6 +71,95 @@ rule MkObjectDirs
}
}
+# CollectCatKeys <Pseudotarget Name> : <Source Files> ;
+# Collects catalog keys for localization from sources into per-locale files
+rule CollectCatKeys
+{
+ Depends $(<) : $(>) ;
+ Depends $(<) : $(LOCATE_TARGET) ;
+ #Depends $(<) : $(SRCS) ;
+ Depends $(CATKEYS_DIR)/en.catkeys : $(<) ;
+}
+
+actions CollectCatKeys
+{
+ cat $(SRCS) | gcc -E -x c++ $(HDRS) $(CCFLAGS) \
+ -DB_COLLECTING_CATKEYS - > $(LOCATE_TARGET)/$(NAME).pre
+ mkdir -p "$(CATKEYS_DIR)"
+ collectcatkeys -s $(APP_MIME_SIG) $(LOCATE_TARGET)/$(NAME).pre \
+ -o $(CATKEYS_DIR)/en.catkeys
+}
+
+# Catalogs <Pseudotarget Name> : <CollectCatKeys Target> ;
+# Compiles .catkeys files into .catalog files, one per locale
+rule Catalogs
+{
+ Depends $(<) : $(>) ;
+ Depends $(<) : $(SRCS) ;
+ for lng in $(LOCALES)
+ {
+ Depends $(<) : $(CATKEYS_DIR)/$(lng:S=.catkeys) ;
+ Depends $(CATKEYS_DIR)/$(lng:S=.catkeys) : $(>) ;
+ #Clean clean : $(CATKEYS_DIR)/$(lng:S=.catkeys) ;
+ Clean clean :
+ $(LOCATE_TARGET)/$(APP_MIME_SIG)/$(lng:S=.catalog) ;
+ }
+ Clean clean : $(LOCATE_TARGET)/$(NAME).pre ;
+}
+
+actions Catalogs
+{
+ mkdir -p $(LOCATE_TARGET)/$(APP_MIME_SIG)
+ TMP=`echo "$(LOCALES)" | tr ';' ' '`
+
+ for lang in $TMP ; do
+ if [ ! -f $(CATKEYS_DIR)/$lang.catkeys ]; then
+ cp $(CATKEYS_DIR)/en.catkeys \
+ $(CATKEYS_DIR)/$lang.catkeys; fi
+ linkcatkeys \
+ -o $(LOCATE_TARGET)/$(APP_MIME_SIG)/$lang.catalog \
+ -s $(APP_MIME_SIG) \
+ -l `basename $(LOCATE_TARGET)/$(APP_MIME_SIG)/$lang.catalog` \
+ $(CATKEYS_DIR)/$lang.catkeys
+ done
+}
+
+# CatalogsInstall <Pseudotarget Name> : <Catalog Files> ;
+# Copies .catalog files into system locale directory
+rule CatalogsInstall
+{
+ Depends $(<) : $(>) ;
+ Depends $(>) : catalogs ;
+}
+
+actions CatalogsInstall
+{
+ mkdir -p "/boot/home/config/data/locale/catalogs/$(APP_MIME_SIG)" ;
+ cp $(LOCATE_TARGET)/$(APP_MIME_SIG)/*.catalog \
+ /boot/home/config/data/locale/catalogs/$(APP_MIME_SIG)
+}
+
+# BindCatalogs <Pseudotarget Name> : <Catalog Files> ;
+# Binds .catalog files into program executable
+rule BindCatalogs
+{
+ Depends $(<) : $(>) ;
+ Depends $(<) : $(NAME) ;
+ Depends $(<) : $(LOCATE_TARGET)/$(NAME) ;
+ Depends $(LOCATE_TARGET)/$(NAME) : $(NAME) ;
+ Clean clean : $(<) ;
+}
+
+actions BindCatalogs
+{
+ TMP=`echo $(LOCALES) | tr ';' ' '`
+ for lc in $TMP; do
+ linkcatkeys -o $(LOCATE_TARGET)/$(NAME) \
+ -s $(APP_MIME_SIG) -tr \
+ -l $lc $(CATKEYS_DIR)/$lc.catkeys
+ done
+}
+
# RmApp <Pseudotarget Name> : <Application Name> ;
# Removes the given application file when the given pseudotarget
# is specified.
@@ -151,7 +241,12 @@ rule BeMain
{
AddResources $(<) : $(RSRCS) ;
}
-
+
+ if ( $(LOCALES) )
+ {
+ CollectCatKeys ;
+ }
+
MimeSet $(<) ;
}
@@ -322,6 +417,21 @@ CCFLAGS += $(COMPILER_FLAGS) ;
C++FLAGS += $(COMPILER_FLAGS) ;
LINKFLAGS += $(LINKER_FLAGS) ;
+# Localization specific variables
+
+if ( ! $(APP_MIME_SIG) )
+{
+ ECHO "No mime signature defined! Defaulting to x.vnd-Haiku-$(NAME)" ;
+ APP_MIME_SIG = x.vnd-Haiku-$(NAME) ;
+}
+
+CATKEYS_DIR = locales ;
+if ( $(APP_MIME_SIG) )
+{
+ CATALOGS_DIR = $(LOCATE_TARGET)/$(APP_MIME_SIG) ;
+ CATALOGS = $(LOCALES:D=$(CATALOGS_DIR):S=.catalog) ;
+}
+
# Define some tools
XRES = xres ;
MIMESET = mimeset ;
@@ -347,8 +457,25 @@ RmApp rmapp : $(NAME) ;
NotFile test ;
RunApp test : $(NAME) ;
+Always catkeys ;
+NotFile catkeys ;
+CollectCatKeys catkeys : $(SRCS) ;
+
+#Always catalogs ;
+NotFile catalogs ;
+Catalogs catalogs : catkeys ;
+
+#Always catalogsinstall ;
+NotFile catalogsinstall ;
+CatalogsInstall catalogsinstall : $(CATALOGS_DIR)/$(LOCALES:S=.catalog) ;
+
+#Always bindcatalogs ;
+NotFile bindcatalogs ;
+BindCatalogs bindcatalogs : $(CATALOGS_DIR)/$(LOCALES:S=.catalog) ;
+
##-------------------------------------------------------------------
## OK, let's build
##-------------------------------------------------------------------
BeMain $(NAME) : $(SRCS) ;
+
Other related posts:
