Skip to content

Commit a84a531

Browse files
Kray-GKray-G
authored
Merge pull request #208 from Kray-G/develop
Merge to the latest.
2 parents e0c1459 + af20550 commit a84a531

File tree

8 files changed

+43
-50
lines changed

8 files changed

+43
-50
lines changed

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,7 @@ rebuild:
2020
cp -f build/kxrepl ./
2121
cp -f build/kxtest ./
2222
cp -f build/*.so* ./
23+
24+
install:
25+
(cd build; make install)
26+

‎build/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ kxdouble.so: $(SRCDIR)/extlib/kxdouble.c $(PICOBJS)
236236
kxarray.so: $(SRCDIR)/extlib/kxarray.c $(PICOBJS)
237237
$(CC) $(CFLAGS) -fPIC -o $@ -shared $< $(PICOBJS)
238238

239-
kxfile.so: $(SRCDIR)/extlib/kxfile.c $(PICOBJS) libz.so
240-
$(CC) $(CFLAGS) -fPIC -o $@ -shared $< $(PICOBJS) $(SRCDIR)/extlib/zip/x64/gcc/libminizip.a -Wl,-rpath,'$$ORIGIN' -L. -lz
239+
kxfile.so: $(SRCDIR)/extlib/kxfile.c $(PICOBJS) libz.so libcrypto.so
240+
$(CC) $(CFLAGS) -fPIC -o $@ -shared $< $(PICOBJS) $(SRCDIR)/extlib/zip/x64/gcc/libminizip.a -Wl,-rpath,'$$ORIGIN' -L. -lcrypto -lz
241241

242242
kxdebugger.so: $(SRCDIR)/extlib/kxdebugger.c $(PICOBJS)
243243
$(CC) $(CFLAGS) -fPIC -o $@ -shared $< $(PICOBJS) -Wl,-rpath,'$$ORIGIN'

‎build/Makefile.msc‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ RCFILE = \
176176
.SUFFIXES :
177177
.SUFFIXES : .c .obj
178178

179-
all: timex kinx zlib.dll libxml2.dll libssh2.dll libssl-3.dll libcrypto-3.dll $(SOFILES) main_kxcmd
179+
all: timex kinx zlib.dll libxml2.dll libssh2.dll libssl-3-x64.dll libcrypto-3-x64.dll $(SOFILES) main_kxcmd
180180

181181
lib: $(SOFILES)
182182

@@ -253,12 +253,13 @@ kxssh.dll: $(SRCDIR)/extlib/kxssh.c $(PICOBJS) onig.dll
253253
kxsqlite.dll: $(SRCDIR)/extlib/kxsqlite.c $(PICOBJS) sqlite3.obj
254254
$(CC) /LD $(CFLAGS) /Fe$@ $(SRCDIR)/extlib/kxsqlite.c $(PICOBJS) sqlite3.obj
255255

256-
kxnet.dll: $(SRCDIR)/extlib/kxnet.c $(PICOBJS) libssl-3.dll libcrypto-3.dll
256+
kxnet.dll: $(SRCDIR)/extlib/kxnet.c $(PICOBJS) libssl-3-x64.dll libcrypto-3-x64.dll
257257
$(CC) /LD $(CFLAGS) /Fe$@ $(SRCDIR)/extlib/kxnet.c $(PICOBJS) \
258258
$(SRCDIR)\extlib\libcurl\x64\vs2017\libcurl_a.lib \
259259
$(SRCDIR)\extlib\openssl\x64\vs2017\libssl.lib \
260260
$(SRCDIR)\extlib\openssl\x64\vs2017\libcrypto.lib \
261-
$(SRCDIR)\extlib\zip\x64\vs2017\zlib.lib
261+
$(SRCDIR)\extlib\zip\x64\vs2017\zlib.lib \
262+
advapi32.lib
262263

263264
kxxml.dll: $(SRCDIR)/extlib/kxxml.c $(PICOBJS)
264265
$(CC) /LD $(CFLAGS) /I $(SRCDIR)/extlib/libxml2/include/libxml2 /Fe$@ $(SRCDIR)/extlib/kxxml.c $(PICOBJS) $(SRCDIR)/extlib/libxml2/x64/vs2017/libxml2.lib
@@ -278,11 +279,11 @@ libxml2.dll:
278279
libssh2.dll:
279280
copy /y $(SRCDIR)\extlib\libssh2\x64\vs2017\libssh2.dll libssh2.dll
280281

281-
libssl-3.dll:
282-
copy /y $(SRCDIR)\extlib\openssl\x64\vs2017\libssl-3.dll libssl-3.dll
282+
libssl-3-x64.dll:
283+
copy /y $(SRCDIR)\extlib\openssl\x64\vs2017\libssl-3-x64.dll libssl-3-x64.dll
283284

284-
libcrypto-3.dll:
285-
copy /y $(SRCDIR)\extlib\openssl\x64\vs2017\libcrypto-3.dll libcrypto-3.dll
285+
libcrypto-3-x64.dll:
286+
copy /y $(SRCDIR)\extlib\openssl\x64\vs2017\libcrypto-3-x64.dll libcrypto-3-x64.dll
286287

287288
zip/x64/vs2017/minizip.lib:
288289
echo Build minizip.lib first.

‎docs/spec/definition/lambda.md‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,6 @@ var doit = { => _1() };
5151

5252
When the block style without an arrow of `=>` operator, it can be just like a block statement with argument list inside block.
5353

54-
```javascript
55-
var add = { &(a, b):
56-
return a + b;
57-
};
58-
System.println(add(1, 2)); // => 3
59-
```
60-
61-
The ':' in the above example can be omitted. You can just use it as a separator if you want it.
62-
6354
```javascript
6455
var add = { &(a, b)
6556
return a + b;

‎examples/blockfunc.kx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,12 @@ System.println(r);
1616
var r = f(3, 10) { &(a, b) return a + b; };
1717
System.println(r);
1818

19-
# ':' is available for distinguishing parameters and a statement list.
20-
var r = f(4, 10) { &(a, b): return a + b; };
21-
System.println(r);
22-
2319
# Can put a statement list directly without a parameter list.
2420
var r = f(5, 10) { return _1 * _2; };
2521
System.println(r);
2622

27-
# No sense, but it is okay without statements.
28-
var r = f(6, 10) { &(a, b) };
23+
# No sense.
24+
var r = f(6, 10) { &(a, b) ; };
2925
System.println(r.isUndefined);
3026

3127
# This means nothing to do, it can be used for ignoring callback, etc.

‎examples/ssh.kx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ using net.Ssh;
22

33
var [, user, pass] = $$;
44

5+
56
var ssh = new Net.Ssh("127.0.0.1");
6-
ssh.setTimeout(100); # for connection timeout.
7-
ssh.open { &(con):
7+
# ssh.setTimeout(100); # for connection timeout.
8+
ssh.open { &(con)
89
System.println("Fingerprint: ", con.getFingerprint());
910

1011
con.setTimeout(10000); # for user auth timeout.

‎lib/std/net/http.kx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ _namespace Net {
6565
}
6666

6767
public setProxyUserPassword(user, pass) {
68-
curl_.setOptionInt(Net.CURLOPT_PROXYUSERPWD, user + ":" + pass);
68+
curl_.setOptionString(Net.CURLOPT_PROXYUSERPWD, user + ":" + pass);
6969
return this;
7070
}
7171

‎src/extlib/version.md‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
# x64
1+
## Platform: x64
22

3-
## Windows VS2019
3+
### Windows VS2019
44

5-
| Name | Type | Version | Updated | Repository |
6-
| ---------- | :---: | :-----: | :--------: | ------------------------------------- |
7-
| oniguruma | Src | 6.9.6 | 2021.02.12 | https://github.com/kkos/oniguruma.git |
8-
| sqlite3 | Src | 3.34.1 | 2021.02.12 | https://www.sqlite.org/ |
9-
| minizip-ng | Lib | 3.0.0 | 2021.02.12 | https://github.com/zlib-ng/minizip-ng |
10-
| OpenSSL | Lib | 3.0 | 2021.02.12 | https://github.com/openssl/openssl |
11-
| libxml2 | Lib | 2.9.9 | 2020.03.04 | |
12-
| libssh2 | Lib | | | |
13-
| libcurl | Lib | 7.76.0 | | https://github.com/curl/curl |
14-
| libharu | Lib | | | |
5+
| Name | Type | Version | Updated | Repository |
6+
| ---------- | :---: | :--------------: | :--------: | ------------------------------------- |
7+
| oniguruma | Src | 6.9.6 | 2021.02.12 | https://github.com/kkos/oniguruma |
8+
| sqlite3 | Src | 3.34.1 | 2021.02.12 | https://www.sqlite.org/ |
9+
| minizip-ng | Lib | 3.0.0 | 2021.02.12 | https://github.com/zlib-ng/minizip-ng |
10+
| OpenSSL | Lib | 3.0.0alpha12-dev | 2021.02.15 | https://github.com/openssl/openssl |
11+
| libxml2 | Lib | 2.9.10 | 2021.02.15 | https://github.com/GNOME/libxml2 |
12+
| libssh2 | Lib | 1.9.0 | 2021.02.15 | https://github.com/libssh2/libssh2 |
13+
| libcurl | Lib | 7.76.0 | 2021.02.15 | https://github.com/curl/curl |
14+
| libharu | Lib | 2.3.0 RC2 | 2020.08.21 | https://github.com/libharu/libharu |
1515

16-
## Linux gcc 7.5.0
16+
### Linux gcc 7.5.0
1717

18-
| Name | Type | Version | Updated | Repository |
19-
| --------- | :---: | :-----: | :--------: | ------------------------------------- |
20-
| oniguruma | Src | 6.9.6 | 2020.02.12 | https://github.com/kkos/oniguruma.git |
21-
| sqlite3 | Src | 3.34.1 | 2021.02.12 | https://www.sqlite.org/ |
22-
| OpenSSL | Lib | | | |
23-
| minizip | Lib | 2.9.2 | 2020.02.28 | |
24-
| libxml2 | Lib | 2.9.9 | 2020.03.04 | |
25-
| libssh2 | Lib | | | |
26-
| libcurl | Lib | | | |
27-
| libharu | Lib | | | |
18+
| Name | Type | Version | Updated | Repository |
19+
| ---------- | :---: | :--------------: | :--------: | ------------------------------------- |
20+
| oniguruma | Src | 6.9.6 | 2021.02.12 | https://github.com/kkos/oniguruma |
21+
| sqlite3 | Src | 3.34.1 | 2021.02.12 | https://www.sqlite.org/ |
22+
| minizip-ng | Lib | 3.0.0 | 2021.02.15 | https://github.com/zlib-ng/minizip-ng |
23+
| OpenSSL | Lib | 3.0.0alpha12-dev | 2021.02.15 | https://github.com/openssl/openssl |
24+
| libxml2 | Lib | 2.9.10 | 2021.02.15 | https://github.com/GNOME/libxml2 |
25+
| libssh2 | Lib | 1.9.0 | 2021.02.15 | https://github.com/libssh2/libssh2 |
26+
| libcurl | Lib | 7.76.0 | 2021.02.15 | https://github.com/curl/curl |
27+
| libharu | Lib | 2.3.0 RC2 | 2020.08.21 | https://github.com/libharu/libharu |

0 commit comments

Comments
 (0)