vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

CI: fix building v

pull/2337/head
joe-conigliaro 2019-10-14 15:08:02 +11:00 committed by Alexander Medvednikov
parent e2bca190a9
commit de10a529b0
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View File

@ -14,9 +14,9 @@ jobs:
brew install freetype glfw openssl brew install freetype glfw openssl
export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/" export LIBRARY_PATH="$LIBRARY_PATH:/usr/local/opt/openssl/lib/"
- name: Build V - name: Build V
run: make && ./v -o v compiler run: make && ./v -o v v.v
- name: Build V using V - name: Build V using V
run: ./v -o v2 compiler && ./v2 -o v3 compiler run: ./v -o v2 v.v && ./v2 -o v3 v.v
- name: Test v->c - name: Test v->c
run: ./v test v run: ./v test v
- name: Test v->js - name: Test v->js
@ -36,7 +36,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: sudo apt-get update; sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libssl-dev run: sudo apt-get update; sudo apt-get install --quiet -y libglfw3 libglfw3-dev libfreetype6-dev libssl-dev
- name: Build v - name: Build v
run: make && ./v -cc gcc -o v compiler run: make && ./v -cc gcc -o v v.v
- name: Test v->c - name: Test v->c
run: ./v test v run: ./v test v
- name: Test v->js - name: Test v->js
@ -49,13 +49,13 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: sudo apt-get update; sudo apt-get install --quiet -y tcc libglfw3 libglfw3-dev libfreetype6-dev libssl-dev run: sudo apt-get update; sudo apt-get install --quiet -y tcc libglfw3 libglfw3-dev libfreetype6-dev libssl-dev
- name: Build v - name: Build v
run: make && ./v -o v compiler run: make && ./v -o v v.v
- name: Test v->c with tcc - name: Test v->c with tcc
env: env:
VFLAGS: -cc tcc VFLAGS: -cc tcc
run: | run: |
tcc -version tcc -version
./v -o v2 compiler # Make sure vtcc can build itself ./v -o v2 v.v # Make sure vtcc can build itself
./v test v ./v test v
build-windows-gcc: build-windows-gcc:

2
.travis.yml
View File

@ -60,7 +60,7 @@ script:
- | - |
if [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then if [[ "${TRAVIS_OS_NAME}" != "windows" ]]; then
make make
./v -o v compiler ./v -o v v.v
./v test v ./v test v
fi fi
- | - |

5
vlib/builtin/js/map.v
View File

@ -22,9 +22,6 @@ struct map {
//return false //return false
//} //}
fn (m mut map) _set(key string, val voidptr) {
}
//fn preorder_keys(node &mapnode, keys mut []string, key_i int) int { //fn preorder_keys(node &mapnode, keys mut []string, key_i int) int {
//return 0 //return 0
//} //}
@ -40,7 +37,7 @@ fn (m map) get(key string, out voidptr) bool {
pub fn (m mut map) delete(key string) { pub fn (m mut map) delete(key string) {
} }
fn (m map) _exists(key string) bool { fn (m map) exists(key string) bool {
return false return false
} }

2
vlib/compiler/cc.v
View File

@ -22,7 +22,7 @@ fn (v mut V) cc() {
dir := os.dir(vexe) dir := os.dir(vexe)
if !os.file_exists(vjs_path) { if !os.file_exists(vjs_path) {
println('V.js compiler not found, building...') println('V.js compiler not found, building...')
ret := os.system('$vexe -o $vjs_path -os js $dir/compiler') ret := os.system('$vexe -o $vjs_path -os js $dir/v.v')
if ret == 0 { if ret == 0 {
println('Done.') println('Done.')
} else { } else {