Opened 10 years ago

Closed 10 years ago

#6741 closed bug (fixed)

Screenshot has colliding catkeys

Reported by: mmadia Owned by: pulkomandy
Priority: normal Milestone: R1
Component: Build System Version: R1/Development
Keywords: Cc:
Blocked By: Blocking:
Platform: All

Description

haiku/trunk/src/apps/screenshot/Jamfile appears to have conflicting DoCatalogs invocations.

Jam a target that builds the catkeys (jam -q @alpha-raw). Then compare haiku/trunk/data/catalogs/apps/screenshot with en.catkeys in <generated>objects/catalogs/apps/screenshot

1	english	x-vnd.haiku-screenshot-cli	721864121
screenshot	Screenshot	Base filename of screenshot files	screenshot

Change History (2)

comment:1 by mmadia, 10 years ago

It seems to be conflicting grist on en.catalog 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 } 

comment:2 by mmadia, 10 years ago

Resolution: fixed
Status: newclosed

Fixed in hrev39109.

Note: See TracTickets for help on using tickets.