Sun Dec 19 05:42:50 2021 UTC ()
lang/ruby/rails.mk: add support for Ruby no Rails 7.0


(taca)
diff -r1.108 -r1.109 pkgsrc/lang/ruby/rails.mk
cvs diff -r1.108 -r1.109 pkgsrc/lang/ruby/rails.mk (switch to unified diff)

--- pkgsrc/lang/ruby/rails.mk 2021/12/19 05:22:30 1.108
+++ pkgsrc/lang/ruby/rails.mk 2021/12/19 05:42:50 1.109
@@ -1,160 +1,163 @@ @@ -1,160 +1,163 @@
1# $NetBSD: rails.mk,v 1.108 2021/12/19 05:22:30 taca Exp $ 1# $NetBSD: rails.mk,v 1.109 2021/12/19 05:42:50 taca Exp $
2 2
3.if !defined(_RUBY_RAILS_MK) 3.if !defined(_RUBY_RAILS_MK)
4_RUBY_RAILS_MK= # defined 4_RUBY_RAILS_MK= # defined
5 5
6# 6#
7# === User-settable variables === 7# === User-settable variables ===
8# 8#
9# RUBY_RAILS_DEFAULT 9# RUBY_RAILS_DEFAULT
10# Select default Ruby on Rails version. 10# Select default Ruby on Rails version.
11# 11#
12# Possible values: 52 60 61 12# Possible values: 52 60 61 70
13# Default: 52 13# Default: 52
14# 14#
15# 15#
16# === Infrastructure variables === 16# === Infrastructure variables ===
17# 17#
18# RUBY_RAILS_REQD 18# RUBY_RAILS_REQD
19# Ruby Rails version to use. This variable should not be set in 19# Ruby Rails version to use. This variable should not be set in
20# packages. 20# packages.
21# 21#
22# Possible values: ${RUBY_RAILS_ACCEPTED} 22# Possible values: ${RUBY_RAILS_ACCEPTED}
23# Default: ${RUBY_RAILS_DEFAULT} 23# Default: ${RUBY_RAILS_DEFAULT}
24# 24#
25# === Package-settable variables === 25# === Package-settable variables ===
26# 26#
27# RUBY_RAILS_ACCEPTED 27# RUBY_RAILS_ACCEPTED
28# The Ruby on Rails versions that are acceptable for the package. 28# The Ruby on Rails versions that are acceptable for the package.
29# 29#
30# Possible values: 52 60 61 30# Possible values: 52 60 61 70
31# Default: (empty) 31# Default: (empty)
32# 32#
33# RUBY_RAILS_STRICT_DEP 33# RUBY_RAILS_STRICT_DEP
34# Strict dependency to Ruby on Rails component packages. 34# Strict dependency to Ruby on Rails component packages.
35# 35#
36# Possible value: yes no 36# Possible value: yes no
37# Default: no 37# Default: no
38# 38#
39# === Defined variables === 39# === Defined variables ===
40# 40#
41# RUBY_RAILS 41# RUBY_RAILS
42# Selected Ruby on Rails version. 42# Selected Ruby on Rails version.
43# 43#
44# Possible values: 52 60 61 44# Possible values: 52 60 61 70
45# 45#
46 46
47# 47#
48# current Ruby on Rails versions. 48# current Ruby on Rails versions.
49# 49#
50RUBY_RAILS52_VERSION?= 5.2.6 50RUBY_RAILS52_VERSION?= 5.2.6
51RUBY_RAILS60_VERSION?= 6.0.4.4 51RUBY_RAILS60_VERSION?= 6.0.4.4
52RUBY_RAILS61_VERSION?= 6.1.4.4 52RUBY_RAILS61_VERSION?= 6.1.4.4
 53RUBY_RAILS70_VERSION?= 7.0.0
53 54
54RUBY_RAILS_ACCEPTED?= # defined 55RUBY_RAILS_ACCEPTED?= # defined
55RUBY_RAILS_DEFAULT?= 52 56RUBY_RAILS_DEFAULT?= 52
56 57
57RUBY_RAILS_STRICT_DEP?= no 58RUBY_RAILS_STRICT_DEP?= no
58 59
59RUBY_RAILS_SUPPORTED= 52 60 61 60RUBY_RAILS_SUPPORTED= 52 60 61 70
60 61
61.if empty(RUBY_RAILS_SUPPORTED:M${RUBY_RAILS_DEFAULT}) 62.if empty(RUBY_RAILS_SUPPORTED:M${RUBY_RAILS_DEFAULT})
62. error Unsupported RUBY_RAILS_DEFAULT: ${RUBY_RAILS_DEFAULT} 63. error Unsupported RUBY_RAILS_DEFAULT: ${RUBY_RAILS_DEFAULT}
63.endif 64.endif
64 65
65.if empty(RUBY_RAILS_ACCEPTED) 66.if empty(RUBY_RAILS_ACCEPTED)
66RUBY_RAILS_ACCEPTED= ${RUBY_RAILS_SUPPORTED} 67RUBY_RAILS_ACCEPTED= ${RUBY_RAILS_SUPPORTED}
67.endif 68.endif
68 69
69.if defined(RUBY_RAILS_REQD) 70.if defined(RUBY_RAILS_REQD)
70. if empty(RUBY_RAILS_ACCEPTED:M${RUBY_RAILS_REQD}) 71. if empty(RUBY_RAILS_ACCEPTED:M${RUBY_RAILS_REQD})
71. error Unsupported RUBY_RAILS_REQD: ${RUBY_RAILS_REQD} 72. error Unsupported RUBY_RAILS_REQD: ${RUBY_RAILS_REQD}
72. endif 73. endif
73. for rr in ${RUBY_RAILS_ACCEPTED} 74. for rr in ${RUBY_RAILS_ACCEPTED}
74. if ${rr} == ${RUBY_RAILS_REQD} 75. if ${rr} == ${RUBY_RAILS_REQD}
75RUBY_RAILS= ${rr} 76RUBY_RAILS= ${rr}
76. endif 77. endif
77. endfor 78. endfor
78.endif 79.endif
79 80
80.if !defined(RUBY_RAILS) 81.if !defined(RUBY_RAILS)
81. for rr in ${RUBY_RAILS_ACCEPTED} 82. for rr in ${RUBY_RAILS_ACCEPTED}
82. if ${rr} == ${RUBY_RAILS_DEFAULT} 83. if ${rr} == ${RUBY_RAILS_DEFAULT}
83RUBY_RAILS= ${rr} 84RUBY_RAILS= ${rr}
84. else 85. else
85RUBY_RAILS?= ${rr} 86RUBY_RAILS?= ${rr}
86. endif 87. endif
87. endfor 88. endfor
88.endif 89.endif
89 90
90RUBY_RAILS?= ${RUBY_RAILS_SUPPORTED} 91RUBY_RAILS?= ${RUBY_RAILS_SUPPORTED}
91 92
92.if ${RUBY_RAILS} == "61" 93.if ${RUBY_RAILS} == "70"
 94RAILS_VERSION:= ${RUBY_RAILS70_VERSION}
 95.elif ${RUBY_RAILS} == "61"
93RAILS_VERSION:= ${RUBY_RAILS61_VERSION} 96RAILS_VERSION:= ${RUBY_RAILS61_VERSION}
94.elif ${RUBY_RAILS} == "60" 97.elif ${RUBY_RAILS} == "60"
95RAILS_VERSION:= ${RUBY_RAILS60_VERSION} 98RAILS_VERSION:= ${RUBY_RAILS60_VERSION}
96.elif ${RUBY_RAILS} == "52" 99.elif ${RUBY_RAILS} == "52"
97RAILS_VERSION:= ${RUBY_RAILS52_VERSION} 100RAILS_VERSION:= ${RUBY_RAILS52_VERSION}
98.endif 101.endif
99 102
100# 103#
101# Components of Ruby's version. 104# Components of Ruby's version.
102# 105#
103_RAILS_MAJOR= ${RAILS_VERSION:C/([0-9]+)\..*/\1/} 106_RAILS_MAJOR= ${RAILS_VERSION:C/([0-9]+)\..*/\1/}
104_RAILS_MINOR= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/} 107_RAILS_MINOR= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\..*/\2/}
105_RAILS_TEENY= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/} 108_RAILS_TEENY= ${RAILS_VERSION:C/([0-9]+)\.([0-9]+)\.([0-9]+).*/\3/}
106 109
107# 110#
108# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails 111# If RUBY_RAILS_STRICT_DEP is defined, match exact current Ruby no Rails
109# version. 112# version.
110# Otherwise allow greater minor version. 113# Otherwise allow greater minor version.
111 114
112.if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS]) 115.if !empty(RUBY_RAILS_STRICT_DEP:M[yY][eE][sS])
113_RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1 116_RAILS_NEXT!= ${EXPR} ${_RAILS_TEENY} + 1
114_RAILS_DEP= \ 117_RAILS_DEP= \
115 ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT} 118 ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_MINOR}.${_RAILS_NEXT}
116.else 119.else
117_RAILS_NEXT!= ${EXPR} ${_RAILS_MINOR} + 1 120_RAILS_NEXT!= ${EXPR} ${_RAILS_MINOR} + 1
118_RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT} 121_RAILS_DEP= ${RUBY_RAILS}>=${RAILS_VERSION}<${_RAILS_MAJOR}.${_RAILS_NEXT}
119.endif 122.endif
120 123
121# 124#
122MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ 125MAKE_ENV+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \
123 RUBY_RAILS_ACCEPTED=${RUBY_RAILS} 126 RUBY_RAILS_ACCEPTED=${RUBY_RAILS}
124# 127#
125MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \ 128MULTI+= RUBY_RAILS_DEFAULT=${RUBY_RAILS} \
126 RUBY_RAILS_ACCEPTED=${RUBY_RAILS} 129 RUBY_RAILS_ACCEPTED=${RUBY_RAILS}
127 130
128PLIST_SUBST+= RUBY_RAILS=${RUBY_RAILS} 131PLIST_SUBST+= RUBY_RAILS=${RUBY_RAILS}
129FILES_SUBST+= RUBY_RAILS=${RUBY_RAILS} 132FILES_SUBST+= RUBY_RAILS=${RUBY_RAILS}
130 133
131RUBY_ACTIVESUPPORT_DEPENDS= \ 134RUBY_ACTIVESUPPORT_DEPENDS= \
132 ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:../../devel/ruby-activesupport${RUBY_RAILS} 135 ${RUBY_PKGPREFIX}-activesupport${_RAILS_DEP}:../../devel/ruby-activesupport${RUBY_RAILS}
133RUBY_ACTIVEMODEL_DEPENDS= \ 136RUBY_ACTIVEMODEL_DEPENDS= \
134 ${RUBY_PKGPREFIX}-activemodel${_RAILS_DEP}:../../devel/ruby-activemodel${RUBY_RAILS} 137 ${RUBY_PKGPREFIX}-activemodel${_RAILS_DEP}:../../devel/ruby-activemodel${RUBY_RAILS}
135RUBY_ACTIONPACK_DEPENDS= \ 138RUBY_ACTIONPACK_DEPENDS= \
136 ${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:../../www/ruby-actionpack${RUBY_RAILS} 139 ${RUBY_PKGPREFIX}-actionpack${_RAILS_DEP}:../../www/ruby-actionpack${RUBY_RAILS}
137RUBY_ACTIVERECORD_DEPENDS= \ 140RUBY_ACTIVERECORD_DEPENDS= \
138 ${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:../../databases/ruby-activerecord${RUBY_RAILS} 141 ${RUBY_PKGPREFIX}-activerecord${_RAILS_DEP}:../../databases/ruby-activerecord${RUBY_RAILS}
139RUBY_ACTIONMAILER_DEPENDS= \ 142RUBY_ACTIONMAILER_DEPENDS= \
140 ${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:../../mail/ruby-actionmailer${RUBY_RAILS} 143 ${RUBY_PKGPREFIX}-actionmailer${_RAILS_DEP}:../../mail/ruby-actionmailer${RUBY_RAILS}
141RUBY_RAILTIES_DEPENDS= \ 144RUBY_RAILTIES_DEPENDS= \
142 ${RUBY_PKGPREFIX}-railties${_RAILS_DEP}:../../devel/ruby-railties${RUBY_RAILS} 145 ${RUBY_PKGPREFIX}-railties${_RAILS_DEP}:../../devel/ruby-railties${RUBY_RAILS}
143RUBY_RAILS_DEPENDS= \ 146RUBY_RAILS_DEPENDS= \
144 ${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:../../www/ruby-rails${RUBY_RAILS} 147 ${RUBY_PKGPREFIX}-rails${_RAILS_DEP}:../../www/ruby-rails${RUBY_RAILS}
145RUBY_ACTIONVIEW_DEPENDS= \ 148RUBY_ACTIONVIEW_DEPENDS= \
146 ${RUBY_PKGPREFIX}-actionview${_RAILS_DEP}:../../www/ruby-actionview${RUBY_RAILS} 149 ${RUBY_PKGPREFIX}-actionview${_RAILS_DEP}:../../www/ruby-actionview${RUBY_RAILS}
147RUBY_ACTIVEJOB_DEPENDS= \ 150RUBY_ACTIVEJOB_DEPENDS= \
148 ${RUBY_PKGPREFIX}-activejob${_RAILS_DEP}:../../devel/ruby-activejob${RUBY_RAILS} 151 ${RUBY_PKGPREFIX}-activejob${_RAILS_DEP}:../../devel/ruby-activejob${RUBY_RAILS}
149RUBY_ACTIONCABLE_DEPENDS= \ 152RUBY_ACTIONCABLE_DEPENDS= \
150 ${RUBY_PKGPREFIX}-actioncable${_RAILS_DEP}:../../www/ruby-actioncable${RUBY_RAILS} 153 ${RUBY_PKGPREFIX}-actioncable${_RAILS_DEP}:../../www/ruby-actioncable${RUBY_RAILS}
151RUBY_ACTIVESTORAGE_DEPENDS= \ 154RUBY_ACTIVESTORAGE_DEPENDS= \
152 ${RUBY_PKGPREFIX}-activestorage${_RAILS_DEP}:../../devel/ruby-activestorage${RUBY_RAILS} 155 ${RUBY_PKGPREFIX}-activestorage${_RAILS_DEP}:../../devel/ruby-activestorage${RUBY_RAILS}
153.if ${RUBY_RAILS} >= 60 156.if ${RUBY_RAILS} >= 60
154RUBY_ACTIONMAILBOX_DEPENDS= \ 157RUBY_ACTIONMAILBOX_DEPENDS= \
155 ${RUBY_PKGPREFIX}-actionmailbox${_RAILS_DEP}:../../mail/ruby-actionmailbox${RUBY_RAILS} 158 ${RUBY_PKGPREFIX}-actionmailbox${_RAILS_DEP}:../../mail/ruby-actionmailbox${RUBY_RAILS}
156RUBY_ACTIONTEXT_DEPENDS= \ 159RUBY_ACTIONTEXT_DEPENDS= \
157 ${RUBY_PKGPREFIX}-actiontext${_RAILS_DEP}:../../textproc/ruby-actiontext${RUBY_RAILS} 160 ${RUBY_PKGPREFIX}-actiontext${_RAILS_DEP}:../../textproc/ruby-actiontext${RUBY_RAILS}
158.endif 161.endif
159 162
160.endif 163.endif