Skip to content

Commit 1ac735e

Browse files
committed
support linux aio
1 parent 114736d commit 1ac735e

4 files changed

Lines changed: 14 additions & 4 deletions

File tree

config/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.7.2
1+
9.7.3

main/text.ijs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ NB.+
7373
NB.+three
7474
topara=: 3 : 0
7575
if. 0=#y do. '' return. end.
76+
y=. toJ y
7677
b=. y=LF
7778
c=. b +. y=' '
7879
b=. b > (1,}:b) +. }.c,0

pacman/init.ijs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ NB. =========================================================
7373
3 : 0''
7474
HTTPCMD=: ''
7575
nc=. '--no-cache'
76-
RELNO=: ,'0,p<.>0' (8!:2) 2 {. 100 #.inv >{.revinfo_j_''
76+
NB. e.g. RELNO = '9.7', VERNO = 907
77+
n=. 2 {. 100 #.inv >{.revinfo_j_''
78+
RELNO=: ,'0,p<.>0' (8!:2) n
79+
VERNO=: 100 #. n
7780
if. IFUNIX do.
7881
IFWGET=. IFCURL=. 0
7982
if. -. IFIOS +. UNAME-:'Android' do.

pacman/stdlib.ijs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,11 @@ smoutput m
126126

127127
NB. ---------------------------------------------------------
128128
NB. install Qt library:
129-
if. ((<UNAME)e.'Linux';'OpenBSD';'FreeBSD') do.
129+
130+
NB. linux aio has Qt installed in J folder from j9.7 beta7
131+
linuxaio=. (UNAME -: 'Linux') *. 907 <: VERNO
132+
133+
if. linuxaio < (<UNAME)e.'Linux';'OpenBSD';'FreeBSD' do.
130134
qt_ldd_test d1
131135
smoutput 'If libjqt cannot be loaded, see this guide for installing the Qt library'
132136
smoutput 'https://code.jsoftware.com/wiki/Guides/Qt_IDE/Install'
@@ -139,6 +143,8 @@ y=. (*#y){::0;y
139143
smoutput 'Installing Qt library...'
140144
if. IFWA64 do.
141145
z=. 'qt68-win-arm64-slim.zip'
146+
elseif. linuxaio do.
147+
z=. 'qt68-linux',((y-:'slim')#'-slim'),'.tar.gz'
142148
elseif. IFWIN do.
143149
z=. 'qt68-win',((y-:'slim')#'-slim'),'.zip'
144150
elseif. do.
@@ -149,7 +155,7 @@ if. rc do.
149155
smoutput 'unable to download: ',z return.
150156
end.
151157
d=. jpath IFWIN{::'~install';'~bin'
152-
if. IFWIN do.
158+
if. IFWIN +. linuxaio do.
153159
unzip_jpacman_ p;d
154160
else.
155161
hostcmd_jpacman_ 'unzip -o ',(dquote p),' -d ',dquote d

0 commit comments

Comments
 (0)