mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 06:52:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

tools: improve windows support in oldv (it now can run in cmd.exe, not just in a Git Bash shell)

Browse source
This commit is contained in:
Delyan Angelov 2023-08-26 09:07:14 +03:00
parent 570a12da8d
commit 636aae243c
3 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmd/tools/modules/scripting/scripting.v
View file

@ -165,7 +165,8 @@ pub fn exit_0_status(cmd string) bool {
pub fn tool_must_exist(toolcmd string) { pub fn tool_must_exist(toolcmd string) {
verbose_trace(modfn(@MOD, @FN), toolcmd) verbose_trace(modfn(@MOD, @FN), toolcmd)
if exit_0_status('type ${toolcmd}') { where_is_cmd := if os.user_os() == 'windows' { 'where' } else { 'type' }
if exit_0_status('${where_is_cmd} ${toolcmd}') {
return return
} }
eprintln('Missing tool: ${toolcmd}') eprintln('Missing tool: ${toolcmd}')

36
cmd/tools/modules/vgit/vgit.v
View file

@ -22,7 +22,7 @@ pub fn validate_commit_exists(commit string) {
if commit.len == 0 { if commit.len == 0 {
return return
} }
cmd := "git cat-file -t '${commit}' " cmd := 'git cat-file -t "${commit}" ' // windows's cmd.exe does not support ' for quoting
if !scripting.exit_0_status(cmd) { if !scripting.exit_0_status(cmd) {
eprintln('Commit: "${commit}" does not exist in the current repository.') eprintln('Commit: "${commit}" does not exist in the current repository.')
exit(3) exit(3)
@ -111,7 +111,8 @@ pub fn clone_or_pull(remote_git_url string, local_worktree_path string) {
// 3) => instead of cloning, it is much faster, and *bug free*, to just rsync the local repo directly, // 3) => instead of cloning, it is much faster, and *bug free*, to just rsync the local repo directly,
// at the expense of a little more space usage, which will make the new tree in local_worktree_path, // at the expense of a little more space usage, which will make the new tree in local_worktree_path,
// exactly 1:1 the same, as the one in remote_git_url, just independent from it . // exactly 1:1 the same, as the one in remote_git_url, just independent from it .
scripting.run('rsync -a "${remote_git_url}/" "${local_worktree_path}/"') copy_cmd := if os.user_os() == 'windows' { 'robocopy /MIR' } else { 'rsync -a' }
scripting.run('${copy_cmd} "${remote_git_url}/" "${local_worktree_path}/"')
return return
} }
scripting.run('git clone --quiet "${remote_git_url}" "${local_worktree_path}" ') scripting.run('git clone --quiet "${remote_git_url}" "${local_worktree_path}" ')
@ -145,15 +146,6 @@ pub fn (mut vgit_context VGitContext) compile_oldv_if_needed() {
vgit_context.commit_v__hash = get_current_folder_commit_hash() vgit_context.commit_v__hash = get_current_folder_commit_hash()
return return
} }
mut command_for_building_v_from_c_source := ''
mut command_for_selfbuilding := ''
if 'windows' == os.user_os() {
command_for_building_v_from_c_source = '${vgit_context.cc} -std=c99 -I ./thirdparty/stdatomic/win -municode -w -o cv.exe "${vgit_context.path_vc}/v_win.c" '
command_for_selfbuilding = './cv.exe -o ${vgit_context.vexename} {SOURCE}'
} else {
command_for_building_v_from_c_source = '${vgit_context.cc} -std=gnu11 -I ./thirdparty/stdatomic/nix -w -o cv "${vgit_context.path_vc}/v.c" -lm -lpthread'
command_for_selfbuilding = './cv -o ${vgit_context.vexename} {SOURCE}'
}
scripting.chdir(vgit_context.workdir) scripting.chdir(vgit_context.workdir)
clone_or_pull(vgit_context.v_repo_url, vgit_context.path_v) clone_or_pull(vgit_context.v_repo_url, vgit_context.path_v)
clone_or_pull(vgit_context.vc_repo_url, vgit_context.path_vc) clone_or_pull(vgit_context.vc_repo_url, vgit_context.path_vc)
@ -177,11 +169,33 @@ pub fn (mut vgit_context VGitContext) compile_oldv_if_needed() {
// already compiled, so no need to compile v again // already compiled, so no need to compile v again
return return
} }
scripting.chdir(vgit_context.path_v)
// Recompilation is needed. Just to be sure, clean up everything first. // Recompilation is needed. Just to be sure, clean up everything first.
scripting.run('git clean -xf') scripting.run('git clean -xf')
if vgit_context.make_fresh_tcc { if vgit_context.make_fresh_tcc {
scripting.run('make fresh_tcc') scripting.run('make fresh_tcc')
} }
// compiling the C sources with a C compiler:
mut command_for_building_v_from_c_source := ''
mut command_for_selfbuilding := ''
mut vc_source_file_location := os.join_path_single(vgit_context.path_vc, 'v.c')
if 'windows' == os.user_os() {
v_win_c_location := os.join_path_single(vgit_context.path_vc, 'v_win.c')
if os.exists(v_win_c_location) {
vc_source_file_location = v_win_c_location
}
}
dump(vc_source_file_location)
if 'windows' == os.user_os() {
command_for_building_v_from_c_source = '${vgit_context.cc} -std=c99 -I ./thirdparty/stdatomic/win -w -o cv.exe "${vc_source_file_location}" '
command_for_selfbuilding = '.\\cv.exe -o ${vgit_context.vexename} {SOURCE}'
} else {
command_for_building_v_from_c_source = '${vgit_context.cc} -std=gnu11 -I ./thirdparty/stdatomic/nix -w -o cv "${vc_source_file_location}" -lm -lpthread'
command_for_selfbuilding = './cv -o ${vgit_context.vexename} {SOURCE}'
}
scripting.run(command_for_building_v_from_c_source) scripting.run(command_for_building_v_from_c_source)
build_cmd := command_for_selfbuilding.replace('{SOURCE}', vgit_context.vvlocation) build_cmd := command_for_selfbuilding.replace('{SOURCE}', vgit_context.vvlocation)
scripting.run(build_cmd) scripting.run(build_cmd)

2
cmd/tools/oldv.v
View file

@ -103,7 +103,7 @@ fn sync_cache() {
} }
fn main() { fn main() {
scripting.used_tools_must_exist(['git', 'cc']) scripting.used_tools_must_exist(['git'])
// //
// Resetting VEXE here allows for `v run cmd/tools/oldv.v'. // Resetting VEXE here allows for `v run cmd/tools/oldv.v'.
// the parent V would have set VEXE, which later will // the parent V would have set VEXE, which later will