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

builder: parse `.c.v` and `.js.v` correctly

pull/4340/head
lutherwenxu 2020-04-11 00:25:23 +08:00 committed by GitHub
parent fc4a05741c
commit 514d989a27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
vlib/v/builder/builder.v
View File

@ -160,31 +160,10 @@ pub fn (b Builder) v_files_from_dir(dir string) []string {
if file.ends_with('_test.v') {
continue
}
if (file.ends_with('_win.v') || file.ends_with('_windows.v')) && b.pref.os != .windows {
if b.pref.backend == .c && !b.should_compile_c(file) {
continue
}
if (file.ends_with('_lin.v') || file.ends_with('_linux.v')) && b.pref.os != .linux {
continue
}
if (file.ends_with('_mac.v') || file.ends_with('_darwin.v')) && b.pref.os != .mac {
continue
}
if file.ends_with('_nix.v') && b.pref.os == .windows {
continue
}
if file.ends_with('_android.v') && b.pref.os != .android {
continue
}
if file.ends_with('_freebsd.v') && b.pref.os != .freebsd {
continue
}
if file.ends_with('_solaris.v') && b.pref.os != .solaris {
continue
}
if file.ends_with('_js.v') && b.pref.os != .js {
continue
}
if file.ends_with('_c.v') && b.pref.os == .js {
if b.pref.backend == .js && !b.should_compile_js(file) {
continue
}
if b.pref.compile_defines_all.len > 0 && file.contains('_d_') {
@ -205,6 +184,71 @@ pub fn (b Builder) v_files_from_dir(dir string) []string {
return res
}
[inline]
fn (b Builder) should_compile_c(file string) bool {
if !file.ends_with('.c.v') && file.split('.').len > 2 {
// Probably something like `a.js.v`.
return false
}
// TODO Remove after vc is deployed and files have been moved
if file.ends_with('_js.v') {
return false
}
if (file.ends_with('_win.v') || file.ends_with('_windows.v')) && b.pref.os != .windows {
return false
}
if (file.ends_with('_lin.v') || file.ends_with('_linux.v')) && b.pref.os != .linux {
return false
}
if (file.ends_with('_mac.v') || file.ends_with('_darwin.v')) && b.pref.os != .mac {
return false
}
if file.ends_with('_nix.v') && b.pref.os == .windows {
return false
}
if file.ends_with('_android.v') && b.pref.os != .android {
return false
}
if file.ends_with('_freebsd.v') && b.pref.os != .freebsd {
return false
}
if file.ends_with('_solaris.v') && b.pref.os != .solaris {
return false
}
// End of TODO
if file.ends_with('_windows.c.v') && b.pref.os != .windows {
return false
}
if file.ends_with('_linux.c.v') && b.pref.os != .linux {
return false
}
if file.ends_with('_darwin.c.v') && b.pref.os != .mac {
return false
}
if file.ends_with('_nix.c.v') && b.pref.os == .windows {
return false
}
if file.ends_with('_android.c.v') && b.pref.os != .android {
return false
}
if file.ends_with('_freebsd.c.v') && b.pref.os != .freebsd {
return false
}
if file.ends_with('_solaris.c.v') && b.pref.os != .solaris {
return false
}
return true
}
[inline]
fn (b Builder) should_compile_js(file string) bool {
if !file.ends_with('.js.v') && file.split('.').len > 2 {
// Probably something like `a.c.v`.
return false
}
return true
}
pub fn (b Builder) log(s string) {
if b.pref.is_verbose {
println(s)

5
vlib/v/pref/pref.v
View File

@ -14,7 +14,6 @@ pub enum BuildMode {
pub enum Backend {
c // The (default) C backend
experimental // The experimental v2 backend
js // The JavaScript backend
x64 // The x64 backend
}
@ -91,10 +90,6 @@ pub fn backend_from_string(s string) ?Backend {
'js' {
return .js
}
'experimental', 'v2' {
//TODO Remove in the future once it's considered stable :)
return .experimental
}
'x64' {
return .x64
}