From 4bcbf65b5b0ddf996f79e95fab92c4dc6025bc31 Mon Sep 17 00:00:00 2001 From: Calvin Rose Date: Sat, 8 Dec 2018 17:10:46 -0500 Subject: [PATCH] Update appveyor and windows build_win script. --- Makefile | 3 ++- appveyor.yml | 18 +++++------------- build_win.bat | 12 ++++++++++++ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 584be4d1..ff74977b 100644 --- a/Makefile +++ b/Makefile @@ -159,7 +159,8 @@ clean-natives: dist: janet-dist.tar.gz -janet-%.tar.gz: $(JANET_TARGET) src/include/janet/janet.h janet.1 $(JANET_LIBRARY) +janet-%.tar.gz: $(JANET_TARGET) src/include/janet/janet.h \ + janet.1 LICENSE CONTRIBUTING.md $(JANET_LIBRARY) README.md tar -czvf $@ $^ clean: diff --git a/appveyor.yml b/appveyor.yml index 8ce84b4c..d915f151 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,6 +20,7 @@ init: install: - build_win - build_win test + - build_win dist build: off @@ -29,25 +30,16 @@ only_commits: - src/ artifacts: - - path: janet.exe - name: janet.exe - type: File - - path: janet.def - name: janet.def - type: File - - path: janet.lib - name: janet.lib - type: File - - path: src\include\janet\janet.h - name: janet.h - type: File + - path: dist + name: janet-%APPVEYOR_TAG_NAME%-windows.zip + type: Zip deploy: description: 'The Janet Programming Language.' provider: GitHub auth_token: secure: lwEXy09qhj2jSH9s1C/KvCkAUqJSma8phFR+0kbsfUc3rVxpNK5uD3z9Md0SjYRx - artifact: janet.exe + artifact: janet-%APPVEYOR_TAG_NAME%-windows.zip draft: true on: APPVEYOR_REPO_TAG: true diff --git a/build_win.bat b/build_win.bat index a3cc3897..81892de2 100644 --- a/build_win.bat +++ b/build_win.bat @@ -12,6 +12,7 @@ @if "%1"=="help" goto HELP @if "%1"=="clean" goto CLEAN @if "%1"=="test" goto TEST +@if "%1"=="dist" goto DIST @rem Set compile and link options here @setlocal @@ -88,6 +89,17 @@ for %%f in (test/suite*.janet) do ( @if errorlevel 1 goto :TESTFAIL ) exit /b 0 + +@rem Build a dist directory +:DIST +mkdir dist +copy janet.exe dist\janet.exe +copy LICESNE dist\LICENSE +copy README.md dist\README.md +copy janet.lib dist\janet.lib +copy janet.exp dist\janet.exp +copy src\include\janet\janet.h dist\janet.h + :TESTFAIL @echo. @echo *******************************************************