This commit is contained in:
SANO Masatoshi 2017-02-07 23:42:48 +09:00
parent a8c2d5402d
commit 51dee78537
3 changed files with 21 additions and 18 deletions

View file

@ -31,25 +31,12 @@ install:
}
build_script:
- if "%METHOD%"=="cross" msys%MSYS2_BITS%\usr\bin\bash -lc "mkdir /tmp;cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./bootstrap; ./configure; make"
- if "%METHOD%"=="cross" msys%MSYS2_BITS%\usr\bin\bash -lc "mkdir /tmp;cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./bootstrap; ./configure; make; make winrelease"
- if "%METHOD%"=="cross" cd %APPVEYOR_BUILD_FOLDER%
- if "%METHOD%"=="cross" mkdir roswell
- if "%METHOD%"=="cross" mkdir roswell\lisp
- if "%METHOD%"=="cross" mkdir roswell\documents
- if "%METHOD%"=="cross" mkdir roswell\documents\html
- if "%METHOD%"=="cross" copy src\ros.exe roswell
- if "%METHOD%"=="cross" copy lisp\*.lisp roswell\lisp
- if "%METHOD%"=="cross" copy lisp\*.ros roswell\lisp
- if "%METHOD%"=="cross" copy documents\html\*.html roswell\documents\html
- if "%METHOD%"=="cross" copy scripts\chm.ros roswell\documents
- if "%METHOD%"=="cross" cd %APPVEYOR_BUILD_FOLDER%\roswell
- if "%METHOD%"=="cross" ros version
- if "%METHOD%"=="cross" ros version=t run
- if "%METHOD%"=="cross" ros install msys2+ --%MSYS2_BITS%
- if "%METHOD%"=="cross" ros documents\chm.ros
- if "%METHOD%"=="cross" "C:\Program Files (x86)\HTML Help Workshop\hhc.exe" documents\roswell.hhp || copy nul nul > nul
- if "%METHOD%"=="cross" cd %APPVEYOR_BUILD_FOLDER%
- if "%METHOD%"=="cross" 7z a Roswell-%MSYS2_ARCH%.zip roswell/ros.exe roswell/lisp/*.* roswell/documents/roswell.chm
- if "%METHOD%"=="ci" C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./bootstrap; ./configure; make; make install"
test_script:

View file

@ -7,6 +7,20 @@ release:
ros scripts/release.ros release
release-2:
ros scripts/release.ros release-2
winrelease:
mkdir -p roswell
mkdir -p roswell/lisp
mkdir -p roswell/documents/html
cp src/ros.exe roswell
cp lisp/*.lisp roswell/lisp
cp lisp/*.ros roswell/lisp
cp documents/html/*.html roswell/documents/html
cp scripts/chm.ros roswell/documents
cd roswell;ros ./documents/chm.ros
/c/Program\ Files\ \(x86\)/HTML\ Help\ Workshop/hhc.exe roswell/documents/roswell.hhp || true
7z a Roswell-`if [ $$MSYSTEM = 'MINGW64' ];then echo x86_64 ;else echo i686; fi`.zip roswell/ros.exe roswell/lisp/*.* roswell/documents/roswell.chm
test:
run-prove roswell-test.asd
.PHONY: debian prepare-release test
.PHONY: debian prepare release release-2 test

View file

@ -19,10 +19,12 @@ char* uname(void) {
}
char* uname_m(void) {
char* system=getenv("MSYSTEM");
if(strcmp(system,"MINGW64")==0)
char* msystem=getenv("MSYSTEM");
cond_printf(0,"!!!!!!:%s\n",msystem);
if(msystem && strcmp(msystem,"MINGW64")==0)
return q("x86-64");
if(strcmp(system,"MINGW32")==0)
if(msystem && strcmp(msystem,"MINGW32")==0)
return q("x86");
#if defined(_WIN64)
return q("x86-64");