Skip to content

Commit 1c76e23

Browse files
committed
fixup appveyor ci
1 parent 5a3d2af commit 1c76e23

File tree

3 files changed

+21
-13
lines changed

3 files changed

+21
-13
lines changed

appveyor.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,27 @@ platform: x86
55
clone_depth: 2
66
clone_folder: C:\lua-openssl
77
install:
8-
- cd c:\lua-openssl
9-
- git submodule update --init --recursive
10-
- git submodule update --recursive
118
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
12-
- ls C:\openssl-v111-win32\lib
139
- cd C:\
14-
- git clone http://luajit.org/git/luajit-2.0.git C:\luajit-2.0
15-
build_script:
16-
- cd c:\luajit-2.0\src
10+
- git clone https://github.com/LuaJIT/LuaJIT.git C:\luajit
11+
- cd c:\luajit\src
1712
- msvcbuild.bat
1813
- copy luajit.exe C:\
1914
- copy lua51.* C:\
15+
- curl https://www.openssl.org/source/old/1.0.2/openssl-1.0.2u.tar.gz > openssl-1.0.2u.tar.gz
16+
- 7z x "openssl-1.0.2u.tar.gz" -so | 7z x -aoa -si -ttar -o"penssl-1.0.2u"
17+
- cd openssl-1.0.2u
18+
- ls .
19+
- perl Configure --prefix=C:\openssl-win32 no-asm no-shared VC-WIN32
20+
- do\ms.bat
21+
- nmake -f do\nt.mak
22+
- nmake -f do\nt.mak install
23+
- ls C:\openssl-win32\lib
24+
- ls C:\openssl-win32\bin
25+
- cd c:\lua-openssl
26+
- git submodule update --init --recursive
27+
- git submodule update --recursive
28+
build_script:
2029
- cd c:\lua-openssl
2130
- nmake -f makefile.win
2231
- copy src\openssl.dll c:\

config.win

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
# Installation directories
22
# System's libraries directory (where binary libraries are installed)
3-
LUA_LIBDIR= "d:\work\luabuild\bin\Win32Debug\clibs\"
43

54
# Lua includes and lib
6-
LUA_INC= "c:\luajit-2.0\src"
7-
LUA_LIB= "c:\luajit-2.0\src\lua51.lib"
5+
LUA_INC= "c:\luajit\src"
6+
LUA_LIB= "c:\luajit\src\lua51.lib"
87

98
# Openssl include and lib
10-
OPENSSL_INC="c:\openssl-v111-win32\include"
11-
OPENSSL_LIB="c:\openssl-v111-win32\lib\libcrypto_static.lib c:\openssl-v111-win32\lib\libssl_static.lib"
9+
OPENSSL_INC="c:\openssl-win32\include"
10+
OPENSSL_LIB="c:\openssl-win32\lib\libeay32.lib c:\openssl-win32\lib\ssleay32.lib"
1211

1312
LIBNAME= $T.dll
1413

test/1.asn1.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ function TestTime:testUTCTime()
185185
at:adj(self.time, 1, 1)
186186
day, sec = ab:diff(at)
187187
assert(day==1, day)
188-
assert(sec==0, day)
188+
assert(sec==0, sec)
189189
assert(type(ab:toprint()=='string'))
190190
end
191191
end

0 commit comments

Comments
 (0)