[haiku-bugs] Re: [Haiku] #6741: Screenshot has colliding catkeys
- From: "mmadia" <trac@xxxxxxxxxxxx>
- Date: Sun, 24 Oct 2010 00:58:34 -0000
#6741: Screenshot has colliding catkeys
---------------------------+------------------------------
Reporter: mmadia | Owner: pulkomandy
Type: bug | Status: new
Priority: normal | Milestone: R1
Component: Build System | Version: R1/Development
Resolution: | Keywords:
Blocked By: | Has a Patch: 0
Platform: All | Blocking:
---------------------------+------------------------------
Comment (by mmadia):
It seems to be conflicting grist on en.catalog
[browser:haiku/trunk/build/jam/LocaleRules#L131]
{{{
local generatedCatalog
= [ FGristFiles $(sourceLanguage:E=en:S=.catalog) ] ;
}}}
The following patch shows the conflict
{{{
Index: build/jam/LocaleRules
===================================================================
--- build/jam/LocaleRules (revision 39090)
+++ build/jam/LocaleRules (working copy)
@@ -152,4 +152,7 @@
HAIKU_CATALOG_FILES on $(target) = $(catkeysFiles:S=.catalog) ;
HAIKU_CATALOG_SIGNATURE on $(target) = $(signature) ;
+ if $(target) = "screenshot" || $(target) = "Screenshot" {
+ Echo "{" $(target) "|" $(signature) "|" $(folder) "|"
$(catkeysFiles:S=.catalog) "}" ;
+ }
}
Index: src/apps/screenshot/Jamfile
===================================================================
--- src/apps/screenshot/Jamfile (revision 39067)
+++ src/apps/screenshot/Jamfile (working copy)
@@ -25,8 +25,16 @@
: Screenshot.rdef
;
-DoCatalogs screenshot :
- x-vnd.haiku-screenshot-cli
+#DoCatalogs screenshot :
+# x-vnd.haiku-screenshot-cli
+# :
+# Utility.cpp
+#;
+
+DoCatalogs screenshot
+ : x-vnd.haiku-screenshot-cli
+ : Utility.cpp
:
- Utility.cpp
+ :
+ : cli
;
}}}
Terminal output:
{{{
{ Screenshot | x-vnd.haiku-screenshot | | <src!apps!screenshot>en.catalog
<src!apps!screenshot>de.catalog <src!apps!screenshot>es.catalog
<src!apps!screenshot>fi.catalog <src!apps!screenshot>fr.catalog
<src!apps!screenshot>ja.catalog <src!apps!screenshot>ko.catalog
<src!apps!screenshot>lt.catalog <src!apps!screenshot>pt.catalog
<src!apps!screenshot>pt_br.catalog <src!apps!screenshot>ru.catalog
<src!apps!screenshot>sv.catalog <src!apps!screenshot>uk.catalog
<src!apps!screenshot>zh_hans.catalog }
{ screenshot | x-vnd.haiku-screenshot-cli | cli |
<src!apps!screenshot>en.catalog }
}}}
--
Ticket URL: <http://dev.haiku-os.org/ticket/6741#comment:1>
Haiku <http://dev.haiku-os.org>
Haiku - the operating system.
Other related posts:
