Merge branch 'build_all_dlls' into MUSHclient

fiendish · Dec 12, 2017 · 6040490 · 6040490
2 parents c7205c2 + 4c0d071
commit 6040490
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 3 deletions.
diff --git a/MUSHclient/MUSHclient.exe b/MUSHclient/MUSHclient.exe
diff --git a/MUSHclient/libeay32.dll b/MUSHclient/libeay32.dll
diff --git a/MUSHclient/llthreads.dll b/MUSHclient/llthreads.dll
diff --git a/MUSHclient/llthreads2.dll b/MUSHclient/llthreads2.dll
diff --git a/MUSHclient/lua/async.lua b/MUSHclient/lua/async.lua
@@ -1,5 +1,5 @@
 module("async", package.seeall)
-local _llthreads = require("llthreads")
+local _llthreads = require("llthreads2")
 require "socket.http" -- just make sure they can load
 require "ssl.https" -- just make sure they can load
 

diff --git a/MUSHclient/lua51.dll b/MUSHclient/lua51.dll
diff --git a/MUSHclient/msvcr100.dll b/MUSHclient/msvcr100.dll
diff --git a/MUSHclient/openssl.dll b/MUSHclient/openssl.dll
diff --git a/MUSHclient/ssleay32.dll b/MUSHclient/ssleay32.dll
diff --git a/appveyor.yml b/appveyor.yml
@@ -11,6 +11,62 @@ environment:
     secure: /WceWguzAExHlMwJIOMl2MxPw+QmMne5MGQItu45rQ66xLoKLYGVQ8taqaLkrMYD
 install:
 - ps: >-
+    # build LuaJIT
+
+    git clone -b v2.1 --single-branch --depth=1 https://github.com/LuaJIT/LuaJIT.git C:\luajit
+
+    cd c:\luajit\src
+
+    (Get-Content msvcbuild.bat) | ForEach-Object { $_ -replace " /MD " , " /MT " } | Set-Content msvcbuild.bat
+
+    '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86'
+
+    msvcbuild.bat
+
+    copy luajit.exe C:\
+
+    copy lua51.* C:\
+
+    # build lua-openssl
+
+    git clone --depth=1 https://github.com/zhaozg/lua-openssl.git c:\lua-openssl
+
+    cd c:\lua-openssl
+
+    (Get-Content makefile.win) | ForEach-Object { $_ -replace " /MD " , " /MT " } | Set-Content makefile.win
+
+    (Get-Content makefile.win) | ForEach-Object { $_ -replace "libeay32" , "VC\static\libeay32MT" } | Set-Content makefile.win
+
+    (Get-Content makefile.win) | ForEach-Object { $_ -replace "ssleay32" , "VC\static\ssleay32MT" } | Set-Content makefile.win
+
+    (Get-Content makefile.win) | ForEach-Object { $_ -replace "LUA_INC=.+" , "LUA_INC=C:\luajit\src" } | Set-Content makefile.win
+
+    (Get-Content makefile.win) | ForEach-Object { $_ -replace "LUA_LIB=.+" , "LUA_INC=C:\lua51.lib" } | Set-Content makefile.win
+
+    nmake -f makefile.win
+
+    copy src\openssl.dll c:\
+
+    # build lua-llthreads2
+
+    git clone https://github.com/moteus/lua-llthreads2.git C:\llthreads2
+
+    cd C:\
+
+    cl /nologo /MT /O2 -c -Fol52util.obj -Ic:\luajit\src c:\llthreads2\src\l52util.c -DLLTHREAD_MODULE_NAME=llthreads2
+
+    cl /nologo /MT /O2 -c -Follthread.obj -Ic:\luajit\src c:\llthreads2\src\llthread.c -DLLTHREAD_MODULE_NAME=llthreads2
+
+    link -dll -export:luaopen_llthreads2 -out:llthreads2.dll lua51.lib l52util.obj llthread.obj kernel32.lib
+
+    # deploy the above 3 dlls
+
+    # ps: Get-ChildItem c:\*.dll | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+
+    Move-Item C:\*.dll MUSHclient -force
+
+    # make the installers and zips
+
     $env:PACKAGE_VERSION=(Get-Content MUSHclient\AardwolfPackageChanges.txt)[2].split()[0]
 
     7z a -tzip -mx=9 -mfb=257 Aardwolf_MUSHclient_$($env:PACKAGE_VERSION)_no_install.zip MUSHclient
@@ -52,7 +108,6 @@ before_deploy:
 - ps: >-
     $env:PACKAGE_VERSION=(Get-Content MUSHclient\AardwolfPackageChanges.txt)[2].split()[0]
 
-
     git config --global credential.helper store
 
     Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:auth_token):x-oauth-basic@github.com`n"
@@ -61,7 +116,6 @@ before_deploy:
 
     git config --global user.email "patcherton.fixesthings@gmail.com"
 
-
     git remote set-branches --add origin 'gh-pages' 2>&1 | write-host
 
     git fetch --depth 1 origin gh-pages 2>&1 | write-host