From cc14fbbd0e7d96a15af1e95d1c0d5f7feda2137b Mon Sep 17 00:00:00 2001
From: Ricardo Barbedo <ricardo@barbedo.me>
Date: Tue, 28 Nov 2017 21:10:18 +0100
Subject: [PATCH] Rename vivado_proj to vivado_project

---
 README.md                         | 4 ++--
 scripts/alias.tcl                 | 2 +-
 scripts/git_wrapper.tcl           | 4 ++--
 scripts/write_project_tcl_git.tcl | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 3d907e0..ae8afa8 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Vivado is a pain in the ass to source control decently, so these scripts provide
 
 ### Workflow
 
- 1. When first starting with a project, create it in a folder called `vivado_proj` (e.g. `PROJECT_NAME/vivado_proj`) . All the untracked files will be under this directory.
+ 1. When first starting with a project, create it in a folder called `vivado_project` (e.g. `PROJECT_NAME/vivado_project`) . All the untracked files will be under this directory.
 
  2. Place your source files anywhere you want in your project folder (usually in the `PROJECT_NAME/src`).
 
@@ -50,7 +50,7 @@ Vivado is a pain in the ass to source control decently, so these scripts provide
         │   │    ├── *.v
         │   │    └── *.vhd
         │   └── ...
-        └── vivado_proj/             # Untracked generated files
+        └── vivado_project/          # Untracked generated files
             ├── project_name.xpr
             ├── project_name.cache/
             ├── project_name.hw/
diff --git a/scripts/alias.tcl b/scripts/alias.tcl
index 9cafea3..23f8f8a 100755
--- a/scripts/alias.tcl
+++ b/scripts/alias.tcl
@@ -13,7 +13,7 @@ namespace eval ::alias {
     proc wproj {} {
 
         # Change directory project directory if not in it yet
-        set proj_dir [regsub {\/vivado_proj$} [get_property DIRECTORY [current_project]] {}]
+        set proj_dir [regsub {\/vivado_project$} [get_property DIRECTORY [current_project]] {}]
         set current_dir [pwd]
         if {
             [string compare -nocase $proj_dir $current_dir]
diff --git a/scripts/git_wrapper.tcl b/scripts/git_wrapper.tcl
index 158a2c2..8373b8b 100644
--- a/scripts/git_wrapper.tcl
+++ b/scripts/git_wrapper.tcl
@@ -19,7 +19,7 @@ namespace eval ::git_wrapper {
         set command [lindex $args 0]
 
         # Change directory project directory if not in it yet
-        set proj_dir [regsub {\/vivado_proj$} [get_property DIRECTORY [current_project]] {}]
+        set proj_dir [regsub {\/vivado_project$} [get_property DIRECTORY [current_project]] {}]
         set current_dir [pwd]
         if {
             [string compare -nocase $proj_dir $current_dir]
@@ -39,7 +39,7 @@ namespace eval ::git_wrapper {
     proc git_init {args} {
         # Generate gitignore file
         set file [open ".gitignore" "w"]
-        puts $file "vivado_proj/*"
+        puts $file "vivado_project/*"
         close $file
 
         # Initialize the repo
diff --git a/scripts/write_project_tcl_git.tcl b/scripts/write_project_tcl_git.tcl
index 26a872c..64d1aff 100644
--- a/scripts/write_project_tcl_git.tcl
+++ b/scripts/write_project_tcl_git.tcl
@@ -29,8 +29,8 @@
 #   1. The project directory is now relative to the scripts location.
 #	   Project directory was relative to the tcl console current directory.
 #
-#   2. When recreating a project, the generated files will be put in a "vivado_proj" directory
-#      under the project directory. If "vivado_proj" exists already, it will be rewritten.
+#   2. When recreating a project, the generated files will be put in a "vivado_project" directory
+#      under the top directory. If "vivado_project" exists already, it will be rewritten.
 #
 #   3. After recreating a project, the tcl console will change directory to the project directory.
 #
@@ -475,7 +475,7 @@ proc wr_create_project { proj_dir name part_name } {
   # set target project directory path if specified. If not, create project dir in current dir.
   set target_dir $a_global_vars(s_target_proj_dir)
   if { {} == $target_dir } {
-    set tcl_cmd "create_project \$\{project_name\} \$origin_dir/vivado_proj -part $part_name -quiet -force"
+    set tcl_cmd "create_project \$\{project_name\} \$origin_dir/vivado_project -part $part_name -quiet -force"
   } else {
     # is specified target proj dir == current dir? 
     set cwd [file normalize [string map {\\ /} [pwd]]]