Skip to content

Commit f5968d5

Browse files
bilambilam
committed
typo
1 parent 8cf4e68 commit f5968d5

3 files changed

Lines changed: 43 additions & 48 deletions

File tree

‎.github/workflows/jsource.yml‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
strip -S libjavx512.so || true
5757
strip -S libtsdll.so
5858
strip -S jamalgam || true
59-
strip -S libgmp.so
59+
strip -S libgmp.so || true
6060
cd -
6161
ls -l j64
6262
zip -r l64.zip j64
@@ -149,7 +149,7 @@ jobs:
149149
strip -S libj.so
150150
strip -S libtsdll.so
151151
strip -S jamalgam || true
152-
strip -S libgmp.so
152+
strip -S libgmp.so || true
153153
cd -
154154
ls -l j32
155155
zip -r l32.zip j32
@@ -383,7 +383,7 @@ jobs:
383383
strip -S libj.so
384384
strip -S libtsdll.so
385385
strip -S jamalgam || true
386-
strip -S libgmp.so
386+
strip -S libgmp.so || true
387387
cd -
388388
ls -l j64
389389
zip -r rpi64.zip j64
@@ -440,7 +440,7 @@ jobs:
440440
strip -S libj.so
441441
strip -S libtsdll.so
442442
strip -S jamalgam || true
443-
strip -S libgmp.so
443+
strip -S libgmp.so || true
444444
cd -
445445
ls -l j32
446446
zip -r rpi32.zip j32
@@ -492,7 +492,7 @@ jobs:
492492
strip -S libj.so
493493
strip -S libtsdll.so
494494
strip -S jamalgam || true
495-
strip -S libgmp.so
495+
strip -S libgmp.so || true
496496
cd -
497497
zip -r rpi64.zip j64
498498
zip rpi64.zip /usr/bin/zip
@@ -559,7 +559,7 @@ jobs:
559559
strip -S libj.so
560560
strip -S libtsdll.so
561561
strip -S jamalgam || true
562-
strip -S libgmp.so
562+
strip -S libgmp.so || true
563563
cd -
564564
zip -r rpi32.zip j32
565565
rm -rf j32
@@ -633,7 +633,7 @@ jobs:
633633
strip -S libjavx512.so || true
634634
strip -S libtsdll.so
635635
strip -S jamalgam || true
636-
strip -S libgmp.so
636+
strip -S libgmp.so || true
637637
cd -
638638
ls -l j64
639639
zip -r obsd64.zip j64
@@ -702,7 +702,7 @@ jobs:
702702
strip -S libjavx512.so || true
703703
strip -S libtsdll.so
704704
strip -S jamalgam || true
705-
strip -S libgmp.so
705+
strip -S libgmp.so || true
706706
cd -
707707
ls -l j64
708708
zip -r obsd64.zip j64
@@ -769,7 +769,7 @@ jobs:
769769
strip -S libj.so
770770
strip -S libtsdll.so
771771
strip -S jamalgam || true
772-
strip -S libgmp.so
772+
strip -S libgmp.so || true
773773
cd -
774774
ls -l j64
775775
zip -r obsdarm64.zip j64
@@ -842,7 +842,7 @@ jobs:
842842
strip -S libjavx512.so || true
843843
strip -S jamalgam || true
844844
strip -S libtsdll.so
845-
strip -S libgmp.so
845+
strip -S libgmp.so || true
846846
cd -
847847
ls -l j64
848848
zip -r fbsd64.zip j64
@@ -915,7 +915,7 @@ jobs:
915915
strip -S libjavx512.so || true
916916
strip -S libtsdll.so
917917
strip -S jamalgam || true
918-
strip -S libgmp.so
918+
strip -S libgmp.so || true
919919
cd -
920920
ls -l j64
921921
zip -r fbsd64.zip j64
@@ -989,7 +989,7 @@ jobs:
989989
strip -S libjavx512.so || true
990990
strip -S libtsdll.so
991991
strip -S jamalgam || true
992-
strip -S libgmp.so
992+
strip -S libgmp.so || true
993993
cd -
994994
ls -l j64
995995
zip -r fbsdarm64.zip j64
@@ -1105,7 +1105,6 @@ jobs:
11051105
env:
11061106
USE_PYXES: 1
11071107
USE_EMU_AVX: 1
1108-
jplatform: windows
11091108
run: |
11101109
script\buildga.cmd x64
11111110
@@ -1155,7 +1154,6 @@ jobs:
11551154
env:
11561155
USE_PYXES: 0
11571156
USE_EMU_AVX: 0
1158-
jplatform: windows
11591157
run: |
11601158
script\buildga.cmd x86
11611159
@@ -1206,7 +1204,6 @@ jobs:
12061204
env:
12071205
USE_PYXES: 1
12081206
USE_EMU_AVX: 1
1209-
jplatform: windows
12101207
run: |
12111208
script\buildga.cmd arm64
12121209
@@ -1257,7 +1254,6 @@ jobs:
12571254
env:
12581255
USE_PYXES: 1
12591256
USE_EMU_AVX: 1
1260-
jplatform: windows
12611257
run: |
12621258
script\buildga.cmd arm64
12631259

‎make2/build_jamalgam.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -901,14 +901,14 @@ case "$jplatform/$j64x" in
901901
# these flags do not work on iOS
902902
# -msse2 -msimd128
903903
# EMSCRIPTEN_KEEPALIVE instead of -s LINKABLE=1 -s EXPORT_ALL=1
904-
LDFLAGS=" -L../../../../mpir/linux/wasm32 -lgmp \
904+
LDFLAGS=" -L../mpir/linux/wasm32 -lgmp \
905905
-s WASM=1 -s ASSERTIONS=1 -s INITIAL_MEMORY=220MB -s TOTAL_MEMORY=600MB -s ALLOW_MEMORY_GROWTH=1 -s STACK_SIZE=984KB \
906906
-s BINARYEN_EXTRA_PASSES="--pass-arg=max-func-params@80" -s EMULATE_FUNCTION_POINTER_CASTS=1 -s EXIT_RUNTIME=1 \
907907
-s EXPORTED_FUNCTIONS='[\"_main\"]' \
908908
-s EXPORTED_RUNTIME_METHODS='[\"cwrap\",\"ccall\", \"UTF8ToString\", \"lengthBytesUTF8\", \"stringToUTF8\"]' \
909-
--embed-file ../../../../jlibrary/@/home/web_user/j --exclude-file *.dylib --exclude-file *.so --exclude-file *.dll \
909+
--embed-file ../jlibrary/@/home/web_user/j --exclude-file *.dylib --exclude-file *.so --exclude-file *.dll \
910910
--exclude-file *.exe --exclude-file jconsole* --exclude-file jamalgam* --exclude-file bin32 \
911-
--embed-file ../../../../test/@/home/web_user/j/test "
911+
--embed-file ../test/@/home/web_user/j/test "
912912
SRC_ASM=""
913913
GASM_FLAGS=""
914914
FLAGS_BASE64=""

‎script/buildga.cmd‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -53,42 +53,41 @@ echo #define jlicense "commercial" >> jsrc\jversion.h
5353
echo #define jbuilder "www.jsoftware.com" >> jsrc\jversion.h
5454

5555
cd jsrc
56-
set jplatform=windows
5756
set CC=clang-cl
5857

5958
IF "%~1"=="x86" GOTO L04A
6059
IF "%~1"=="arm64" GOTO L04B
6160
IF "%~1" NEQ "x64" EXIT /b 1
62-
nmake -f ..\makemsvc\tsdll\makefile.win j64x=j64 clean
63-
nmake -f ..\makemsvc\tsdll\makefile.win j64x=j64
61+
nmake -f ..\makemsvc\tsdll\makefile.win jplatform=windows j64x=j64 clean
62+
nmake -f ..\makemsvc\tsdll\makefile.win jplatform=windows j64x=j64
6463
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
6564
GOTO L04C
6665
:L04A
67-
nmake -f ..\makemsvc\tsdll\makefile.win j64x=j32 clean
68-
nmake -f ..\makemsvc\tsdll\makefile.win j64x=j32
66+
nmake -f ..\makemsvc\tsdll\makefile.win jplatform=windows j64x=j32 clean
67+
nmake -f ..\makemsvc\tsdll\makefile.win jplatform=windows j64x=j32
6968
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
7069
GOTO L04C
7170
:L04B
72-
nmake -f ..\makemsvc\tsdll\makefile.win j64x=j64arm clean
73-
nmake -f ..\makemsvc\tsdll\makefile.win j64x=j64arm
71+
nmake -f ..\makemsvc\tsdll\makefile.win jplatform=windows j64x=j64arm clean
72+
nmake -f ..\makemsvc\tsdll\makefile.win jplatform=windows j64x=j64arm
7473
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
7574
:L04C
7675

7776
IF "%~1"=="x86" GOTO L02A
7877
IF "%~1"=="arm64" GOTO L02B
7978
IF "%~1" NEQ "x64" EXIT /b 1
80-
nmake -f ..\makemsvc\jconsole\makefile.win j64x=j64 clean
81-
nmake -f ..\makemsvc\jconsole\makefile.win j64x=j64
79+
nmake -f ..\makemsvc\jconsole\makefile.win jplatform=windows j64x=j64 clean
80+
nmake -f ..\makemsvc\jconsole\makefile.win jplatform=windows j64x=j64
8281
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
8382
GOTO L02C
8483
:L02A
85-
nmake -f ..\makemsvc\jconsole\makefile.win j64x=j32 clean
86-
nmake -f ..\makemsvc\jconsole\makefile.win j64x=j32
84+
nmake -f ..\makemsvc\jconsole\makefile.win jplatform=windows j64x=j32 clean
85+
nmake -f ..\makemsvc\jconsole\makefile.win jplatform=windows j64x=j32
8786
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
8887
GOTO L02C
8988
:L02B
90-
nmake -f ..\makemsvc\jconsole\makefile.win j64x=j64arm clean
91-
nmake -f ..\makemsvc\jconsole\makefile.win j64x=j64arm
89+
nmake -f ..\makemsvc\jconsole\makefile.win jplatform=windows j64x=j64arm clean
90+
nmake -f ..\makemsvc\jconsole\makefile.win jplatform=windows j64x=j64arm
9291
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
9392
:L02C
9493

@@ -97,25 +96,25 @@ IF "%~1"=="arm64" GOTO L03B
9796
IF "%~1" NEQ "x64" EXIT /b 1
9897
IF "%USE_EMU_AVX%"=="0" GOTO L03F
9998
IF "%USE_PYXES%"=="0" GOTO L03F
100-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j64avx512 clean
101-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j64avx512
99+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j64avx512 clean
100+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j64avx512
102101
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
103-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j64avx2 clean
104-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j64avx2
102+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j64avx2 clean
103+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j64avx2
105104
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
106105
:L03F
107-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j64 clean
108-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j64
106+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j64 clean
107+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j64
109108
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
110109
GOTO L03C
111110
:L03A
112-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j32 clean
113-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j32
111+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j32 clean
112+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j32
114113
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
115114
GOTO L03C
116115
:L03B
117-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j64arm NO_SHA_ASM=1 clean
118-
nmake -f ..\makemsvc\jdll\makefile.win j64x=j64arm NO_SHA_ASM=1
116+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j64arm NO_SHA_ASM=1 clean
117+
nmake -f ..\makemsvc\jdll\makefile.win jplatform=windows j64x=j64arm NO_SHA_ASM=1
119118
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
120119
:L03C
121120

@@ -124,18 +123,18 @@ GOTO L05C
124123
IF "%~1"=="x86" GOTO L05A
125124
IF "%~1"=="arm64" GOTO L05B
126125
IF "%~1" NEQ "x64" EXIT /b 1
127-
nmake -f ..\makemsvc\jamalgam\makefile.win j64x=j64 clean
128-
nmake -f ..\makemsvc\jamalgam\makefile.win j64x=j64
126+
nmake -f ..\makemsvc\jamalgam\makefile.win jplatform=windows j64x=j64 clean
127+
nmake -f ..\makemsvc\jamalgam\makefile.win jplatform=windows j64x=j64
129128
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
130129
GOTO L05C
131130
:L05A
132-
nmake -f ..\makemsvc\jamalgam\makefile.win j64x=j32 jclean
133-
nmake -f ..\makemsvc\jamalgam\makefile.win j64x=j32
131+
nmake -f ..\makemsvc\jamalgam\makefile.win jplatform=windows j64x=j32 jclean
132+
nmake -f ..\makemsvc\jamalgam\makefile.win jplatform=windows j64x=j32
134133
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
135134
GOTO L05C
136135
:L05B
137-
nmake -f ..\makemsvc\jamalgam\makefile.win j64x=j64arm NO_SHA_ASM=1 clean
138-
nmake -f ..\makemsvc\jamalgam\makefile.win j64x=j64arm NO_SHA_ASM=1
136+
nmake -f ..\makemsvc\jamalgam\makefile.win jplatform=windows j64x=j64arm NO_SHA_ASM=1 clean
137+
nmake -f ..\makemsvc\jamalgam\makefile.win jplatform=windows j64x=j64arm NO_SHA_ASM=1
139138
IF %ERRORLEVEL% NEQ 0 EXIT /b %ERRORLEVEL%
140139
:L05C
141140

0 commit comments

Comments
 (0)