diff options
| author | ruki <[email protected]> | 2017-09-22 22:56:49 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-09-22 11:40:59 +0800 |
| commit | 5058a1e7b723dc2d40eaa7f294729a0764621fc8 (patch) | |
| tree | 299529d6648317065bbdaf0645123e6824456380 | |
| parent | da8837f9c0f7bd3cb1bc9d7fa96be6049145e73e (diff) | |
improve install and ci script
| -rw-r--r-- | .appveyor.yml | 12 | ||||
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | core/src/demo/xmake.lua | 5 |
3 files changed, 10 insertions, 8 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 52f96e12d..90d7dd21c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -25,12 +25,10 @@ install: build_script: - ps: Invoke-Expression (Get-Content scripts\get.ps1 | Out-String) - cmd: xmake lua versioninfo - - cmd: cd core - - cmd: if %platform%==Win64 xmake f -a x64 - - cmd: xmake install -o build --prefix= - - cmd: cd .. + - cmd: if %platform%==Win64 xmake f -a x64 -P core + - cmd: xmake -P core - cmd: set XMAKE_PROGRAM_DIR=%cd%\xmake - - cmd: core\build\bin\xmake lua versioninfo + - cmd: core\build\xmake lua versioninfo - ps: Write-Output "require('luacov.runner').init({['statsfile']='$PWD/luacov.stats.out',['reportfile']='$PWD/luacov.report.out'})".replace('\','/') | Out-File tmp - ps: Write-Output (Get-Content xmake\core\_xmake_main.lua | Out-String) | Out-File tmp -Append - ps: Invoke-Webrequest 'https://svwh.dl.sourceforge.net/project/dos2unix/dos2unix/7.3.4/dos2unix-7.3.4-win32.zip' -OutFile dos2unix.zip @@ -38,7 +36,7 @@ build_script: - cmd: dos2unix\bin\dos2unix tmp - ps: Remove-Item -Recurse dos2unix,dos2unix.zip - ps: Move-Item -Force tmp xmake\core\_xmake_main.lua - - ps: Copy-Item -Force core\build\bin\xmake.exe $HOME\xmake + - ps: Copy-Item -Force core\build\xmake.exe $HOME\xmake - cmd: xmake lua --backtrace tests\test.lua on_success: @@ -49,7 +47,7 @@ on_success: - ps: Invoke-Expression (Get-Content scripts\getpb.ps1 | Out-String) after_build: - - ps: Copy-Item core\build\bin\xmake.exe . + - ps: Copy-Item core\build\xmake.exe . artifacts: - path: xmake.exe diff --git a/.travis.yml b/.travis.yml index 8f9def52a..54361b074 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,6 @@ script: - xmake f -m coverage -P core - xmake -v -P core - export XMAKE_PROGRAM_DIR=$PWD/xmake - - cp `find ./core/build/coverage -name xmake` core/build/xmake - core/build/xmake lua versioninfo - echo "require('luacov.runner').init({['statsfile']='$PWD/luacov.stats.out',['reportfile']='$PWD/luacov.report.out'})" > tmp - cat xmake/core/_xmake_main.lua >> tmp diff --git a/core/src/demo/xmake.lua b/core/src/demo/xmake.lua index a3ab5e003..41a51586d 100644 --- a/core/src/demo/xmake.lua +++ b/core/src/demo/xmake.lua @@ -38,3 +38,8 @@ target("demo") add_links("pthread", "dl", "m", "c") end + -- copy target file to 'build\xmake' + after_build(function (target) + os.cp(target:targetfile(), "$(buildir)") + end) + |