working on it

fiendish · Dec 13, 2017 · 3f8ff60 · 3f8ff60
1 parent a683cfa
commit 3f8ff60
Showing 1 changed file with 44 additions and 95 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,107 +10,56 @@ environment:
   auth_token:
     secure: /WceWguzAExHlMwJIOMl2MxPw+QmMne5MGQItu45rQ66xLoKLYGVQ8taqaLkrMYD
 install:
-- '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86'
-- git clone -b v2.1 --single-branch --depth=1 https://github.com/LuaJIT/LuaJIT.git C:\luajit
-- git clone --depth=1 https://github.com/zhaozg/lua-openssl.git c:\lua-openssl
-- git clone https://github.com/moteus/lua-llthreads2.git C:\llthreads2
-- ps: >-
-    # build LuaJIT
-
-    pushd c:\luajit\src
-
-    (Get-Content msvcbuild.bat) | ForEach-Object { $_ -replace " /MD " , " /MT " } | Set-Content msvcbuild.bat
-
-    ./msvcbuild.bat
-
-    copy luajit.exe C:\
-
-    copy lua51.* C:\
-
-    # build lua-openssl
-
-    popd
-
-    pushd c:\lua-openssl
-
-    (Get-Content Makefile.win) | ForEach-Object { $_ -replace '"' , '' } | Set-Content Makefile.win
-
-    (Get-Content config.win) | ForEach-Object { $_ -replace '"' , '' } | Set-Content config.win
-
-    (Get-Content config.win) | ForEach-Object { $_ -replace " /MD " , " /MT " } | Set-Content config.win
-
-    (Get-Content config.win) | ForEach-Object { $_ -replace "libeay32" , "VC\static\libeay32MT" } | Set-Content config.win
-
-    (Get-Content config.win) | ForEach-Object { $_ -replace "ssleay32" , "VC\static\ssleay32MT" } | Set-Content config.win
-
-    (Get-Content config.win) | ForEach-Object { $_ -replace "LUA_INC=.+" , "LUA_INC=C:\luajit\src" } | Set-Content config.win
-
-    (Get-Content config.win) | ForEach-Object { $_ -replace "LUA_LIB=.+" , "LUA_LIB=C:\lua51.lib" } | Set-Content config.win
-
-    nmake -f Makefile.win
-
-    copy src\openssl.dll c:\
-
-    # build lua-llthreads2
-
-    popd
-
-    pushd 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 }
-
-    popd
-
-    pushd C:\projects\aardwolfclientpackage
-
-    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
-
-    Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/aardmush_installer.nsi'
-
-    Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/get_version.nsi'
-
-    Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/hello.rtf'
-
-    & "C:\Program Files (x86)\NSIS\makensis.exe" aardmush_installer.nsi
-
+- cmd: '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86'
+- cmd: git clone -b v2.1 --single-branch --depth=1 https://github.com/LuaJIT/LuaJIT.git C:\luajit
+- cmd: git clone --depth=1 https://github.com/zhaozg/lua-openssl.git c:\lua-openssl
+- cmd: git clone https://github.com/moteus/lua-llthreads2.git C:\llthreads2
+- cmd: pushd c:\luajit\src
+- ps: (Get-Content msvcbuild.bat) | ForEach-Object { $_ -replace " /MD " , " /MT " } | Set-Content msvcbuild.bat
+- cmd: ./msvcbuild.bat
+- cmd: copy luajit.exe C:\
+- cmd: copy lua51.* C:\
+- cmd: popd
+- cmd: pushd c:\lua-openssl
+- ps: (Get-Content Makefile.win) | ForEach-Object { $_ -replace '"' , '' } | Set-Content Makefile.win
+- ps: (Get-Content config.win) | ForEach-Object { $_ -replace '"' , '' } | Set-Content config.win
+- ps: (Get-Content config.win) | ForEach-Object { $_ -replace " /MD " , " /MT " } | Set-Content config.win
+- ps: (Get-Content config.win) | ForEach-Object { $_ -replace "libeay32" , "VC\static\libeay32MT" } | Set-Content config.win
+- ps: (Get-Content config.win) | ForEach-Object { $_ -replace "ssleay32" , "VC\static\ssleay32MT" } | Set-Content config.win
+- ps: (Get-Content config.win) | ForEach-Object { $_ -replace "LUA_INC=.+" , "LUA_INC=C:\luajit\src" } | Set-Content config.win
+- ps: (Get-Content config.win) | ForEach-Object { $_ -replace "LUA_LIB=.+" , "LUA_LIB=C:\lua51.lib" } | Set-Content config.win
+- cmd: nmake -f Makefile.win
+- cmd: copy src\openssl.dll c:\
+- cmd: popd
+- cmd: pushd C:\
+- cmd: cl /nologo /MT /O2 -c -Fol52util.obj -Ic:\luajit\src c:\llthreads2\src\l52util.c -DLLTHREAD_MODULE_NAME=llthreads2
+- cmd: cl /nologo /MT /O2 -c -Follthread.obj -Ic:\luajit\src c:\llthreads2\src\llthread.c -DLLTHREAD_MODULE_NAME=llthreads2
+- cmd: link -dll -export:luaopen_llthreads2 -out:llthreads2.dll lua51.lib l52util.obj llthread.obj kernel32.lib
+- cmd: popd
+- cmd: pushd C:\projects\aardwolfclientpackage
+- ps: Move-Item C:\*.dll MUSHclient -force
+- ps: $env:PACKAGE_VERSION=(Get-Content MUSHclient\AardwolfPackageChanges.txt)[2].split()[0]
+- ps: 7z a -tzip -mx=9 -mfb=257 Aardwolf_MUSHclient_$($env:PACKAGE_VERSION)_no_install.zip MUSHclient
+- ps: Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/aardmush_installer.nsi'
+- ps: Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/get_version.nsi'
+- ps: Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/hello.rtf'
+- cmd: "C:\Program Files (x86)\NSIS\makensis.exe" aardmush_installer.nsi
+- ps: |
     function Insert-Content {
       param ( [String]$Path )
       process {
         $( ,$_; Get-Content $Path -ea SilentlyContinue) | Out-File -encoding ASCII $Path
       }
     }
-
-    "aard_req_novisuals_mode = true  -- this line added by the no-visuals installer`r`n" | Insert-Content .\MUSHclient\lua\aard_requirements.lua
-
-    Move-Item .\MUSHclient\worlds\Aardwolf_no_visuals.mcl .\MUSHclient\worlds\Aardwolf.mcl -force
-
-    $VIAPPOUT = 'OutFile "Aardwolf_MUSHclient_${PackageVersion}_no_visuals.exe"'
-
-    (Get-Content aardmush_installer.nsi) | ForEach-Object { $_ -replace "OutFile.+" , "$VIAPPOUT" } | Set-Content aardmush_installer.nsi
-
-    & "C:\Program Files (x86)\NSIS\makensis.exe" aardmush_installer.nsi
-
-    7z a -tzip -mx=9 -mfb=257 Aardwolf_MUSHclient_$($env:PACKAGE_VERSION)_no_visuals_no_install.zip .\MUSHclient
-
-    Get-ChildItem .\Aardwolf_MUSHclient_r*.exe -Recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-
-    Get-ChildItem .\Aardwolf_MUSHclient_r*.zip -Recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
-
-    git checkout -- .
+- ps: "aard_req_novisuals_mode = true  -- this line added by the no-visuals installer`r`n" | Insert-Content .\MUSHclient\lua\aard_requirements.lua
+- ps: Move-Item .\MUSHclient\worlds\Aardwolf_no_visuals.mcl .\MUSHclient\worlds\Aardwolf.mcl -force
+- ps: $env:VIAPPOUT = 'OutFile "Aardwolf_MUSHclient_${PackageVersion}_no_visuals.exe"'
+- ps: (Get-Content aardmush_installer.nsi) | ForEach-Object { $_ -replace "OutFile.+" , "$env:VIAPPOUT" } | Set-Content aardmush_installer.nsi
+- cmd: "C:\Program Files (x86)\NSIS\makensis.exe" aardmush_installer.nsi
+- ps: 7z a -tzip -mx=9 -mfb=257 Aardwolf_MUSHclient_$($env:PACKAGE_VERSION)_no_visuals_no_install.zip .\MUSHclient
+- ps: Get-ChildItem .\Aardwolf_MUSHclient_r*.exe -Recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+- ps: Get-ChildItem .\Aardwolf_MUSHclient_r*.zip -Recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+- cmd: git checkout -- .
 build: off
 before_deploy:
 - ps: >-