mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

CI: Add back erased commits and dont test hot code examples

Browse Source
This commit is contained in:
Henrixounez
2019-07-08 04:16:20 +02:00
committed by Alexander Medvednikov
parent f767218107
commit 7b1be8a2bd
3 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
compiler/main.v
View File

@@ -464,13 +464,13 @@ fn (c &V) cc_windows_cross() {
}
mut libs := ''
if c.pref.build_mode == .default_mode {
libs = '$TmpPath/vlib/builtin.o'
libs = '"$TmpPath/vlib/builtin.o"'
if !os.file_exists(libs) {
println('`builtin.o` not found')
exit(1)
}
for imp in c.table.imports {
libs += ' $TmpPath/vlib/${imp}.o'
libs += ' "$TmpPath/vlib/${imp}.o"'
}
}
args += ' $c.out_name_c '
@@ -534,7 +534,7 @@ fn (v mut V) cc() {
flags := v.table.flags.join(' ')
//mut shared := ''
if v.pref.is_so {
a << '-shared'// -Wl,-z,defs'
a << '-shared -fPIC'// -Wl,-z,defs'
v.out_name = v.out_name + '.so'
}
if v.pref.is_prod {
@@ -551,7 +551,7 @@ fn (v mut V) cc() {
//
}
else if v.pref.build_mode == .default_mode {
libs = '$TmpPath/vlib/builtin.o'
libs = '"$TmpPath/vlib/builtin.o"'
if !os.file_exists(libs) {
println('`builtin.o` not found')
exit(1)
@@ -560,7 +560,7 @@ fn (v mut V) cc() {
if imp == 'webview' {
continue
}
libs += ' $TmpPath/vlib/${imp}.o'
libs += ' "$TmpPath/vlib/${imp}.o"'
}
}
// -I flags
@@ -592,7 +592,7 @@ mut args := ''
// else {
a << '-o $v.out_name'
// The C file we are compiling
a << '$TmpPath/$v.out_name_c'
a << '"$TmpPath/$v.out_name_c"'
// }
// Min macos version is mandatory I think?
if v.os == MAC {
@@ -747,7 +747,7 @@ fn (v mut V) add_user_v_files() {
// Parse lib imports
if v.pref.build_mode == .default_mode {
for i := 0; i < v.table.imports.len; i++ {
pkg := v.table.imports[i]
pkg := v.module_path(v.table.imports[i])
vfiles := v.v_files_from_dir('$TmpPath/vlib/$pkg')
// Add all imports referenced by these libs
for file in vfiles {
@@ -760,7 +760,7 @@ fn (v mut V) add_user_v_files() {
// TODO this used to crash compiler?
// for pkg in v.table.imports {
for i := 0; i < v.table.imports.len; i++ {
pkg := v.table.imports[i]
pkg := v.module_path(v.table.imports[i])
idir := os.getwd()
mut import_path := '$idir/$pkg'
if(!os.file_exists(import_path)) {
@@ -779,7 +779,8 @@ fn (v mut V) add_user_v_files() {
println(v.table.imports)
}
// Only now add all combined lib files
for pkg in v.table.imports {
for _pkg in v.table.imports {
pkg := v.module_path(_pkg)
idir := os.getwd()
mut module_path := '$idir/$pkg'
// If we are in default mode, we don't parse vlib .v files, but header .vh files in
@@ -820,6 +821,15 @@ fn get_arg(joined_args, arg, def string) string {
return res
}
fn (v &V) module_path(pkg string) string {
// submodule support
if pkg.contains('.') {
//return pkg.replace('.', path_sep)
return pkg.replace('.', '/')
}
return pkg
}
fn (v &V) log(s string) {
if !v.pref.is_verbose {
return