Skip to content

Commit 46c9abb

Browse files
committed
make the BUILD and TEST_REQUIRES attributes not extendable
It doesn't make sense to define them per package, so disallow that. Global attributes are still copied to the configuration for each package, so the handling of them can remain at package level where it makes sense. (PROVIDES and REQUIRES are still package-specific of course.) Part of #363.
1 parent 9e14179 commit 46c9abb

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

HaikuPorter/RecipeAttributes.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,20 @@ def getRecipeFormatVersion():
3333
'extendable': Extendable.NO,
3434
'indexable': False,
3535
},
36+
'BUILD_PREREQUIRES': {
37+
'type': RequiresList,
38+
'required': False,
39+
'default': [],
40+
'extendable': Extendable.NO,
41+
'indexable': False,
42+
},
43+
'BUILD_REQUIRES': {
44+
'type': RequiresList,
45+
'required': False,
46+
'default': [],
47+
'extendable': Extendable.NO,
48+
'indexable': False,
49+
},
3650
'DISABLE_SOURCE_PACKAGE': {
3751
'type': YesNo,
3852
'required': False,
@@ -61,6 +75,13 @@ def getRecipeFormatVersion():
6175
'extendable': Extendable.NO,
6276
'indexable': False,
6377
},
78+
'TEST_REQUIRES': {
79+
'type': RequiresList,
80+
'required': False,
81+
'default': [],
82+
'extendable': Extendable.NO,
83+
'indexable': False,
84+
},
6485

6586
# indexable, i.e. per-source attributes
6687
'ADDITIONAL_FILES': {
@@ -114,27 +135,6 @@ def getRecipeFormatVersion():
114135
'extendable': Extendable.INHERITED,
115136
'indexable': False,
116137
},
117-
'BUILD_PREREQUIRES': {
118-
'type': RequiresList,
119-
'required': False,
120-
'default': [],
121-
'extendable': Extendable.INHERITED,
122-
'indexable': False,
123-
},
124-
'BUILD_REQUIRES': {
125-
'type': RequiresList,
126-
'required': False,
127-
'default': [],
128-
'extendable': Extendable.INHERITED,
129-
'indexable': False,
130-
},
131-
'TEST_REQUIRES': {
132-
'type': RequiresList,
133-
'required': False,
134-
'default': [],
135-
'extendable': Extendable.INHERITED,
136-
'indexable': False,
137-
},
138138
'CONFLICTS': {
139139
'type': RequiresList,
140140
'required': False,

0 commit comments

Comments
 (0)