From c3d6858bf318e8d2aba11666ef3382ee164c2e26 Mon Sep 17 00:00:00 2001 From: JalonSolov Date: Tue, 15 Apr 2025 23:37:51 -0400 Subject: [PATCH] tools: remove the `src` subdir from projects, created by `v new` (#24236) --- cmd/tools/vcreate/project_model_bin.v | 2 +- cmd/tools/vcreate/project_model_lib.v | 2 +- cmd/tools/vcreate/project_model_web.v | 42 +++++++++++++-------------- cmd/tools/vcreate/vcreate_init_test.v | 8 ++--- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cmd/tools/vcreate/project_model_bin.v b/cmd/tools/vcreate/project_model_bin.v index 679dea6fcb..689705508e 100644 --- a/cmd/tools/vcreate/project_model_bin.v +++ b/cmd/tools/vcreate/project_model_bin.v @@ -5,7 +5,7 @@ import os fn (mut c Create) set_bin_project_files() { base := if c.new_dir { c.name } else { '' } c.files << ProjectFiles{ - path: os.join_path(base, 'src', 'main.v') + path: os.join_path(base, 'main.v') content: "module main fn main() { diff --git a/cmd/tools/vcreate/project_model_lib.v b/cmd/tools/vcreate/project_model_lib.v index 3aa1ac5598..1801d50ac3 100644 --- a/cmd/tools/vcreate/project_model_lib.v +++ b/cmd/tools/vcreate/project_model_lib.v @@ -5,7 +5,7 @@ import os fn (mut c Create) set_lib_project_files() { base := if c.new_dir { c.name } else { '' } c.files << ProjectFiles{ - path: os.join_path(base, 'src', c.name + '.v') + path: os.join_path(base, c.name + '.v') content: 'module ${c.name} // square calculates the second power of `x` diff --git a/cmd/tools/vcreate/project_model_web.v b/cmd/tools/vcreate/project_model_web.v index e00fd48b04..11c15cccb8 100644 --- a/cmd/tools/vcreate/project_model_web.v +++ b/cmd/tools/vcreate/project_model_web.v @@ -5,7 +5,7 @@ import os { join_path } fn (mut c Create) set_web_project_files() { base := if c.new_dir { c.name } else { '' } c.files << ProjectFiles{ - path: join_path(base, 'src', 'databases', 'config_databases_sqlite.v') + path: join_path(base, 'databases', 'config_databases_sqlite.v') content: "module databases import db.sqlite // can change to 'db.mysql', 'db.pg' @@ -17,14 +17,14 @@ pub fn create_db_connection() !sqlite.DB { " } c.files << ProjectFiles{ - path: join_path(base, 'src', 'templates', 'header_component.html') + path: join_path(base, 'templates', 'header_component.html') content: "