Merge pull request #55 from ARC-Lab-UF/dev

Fixed weird windows issues

Author: benjamin051000

.vscode/launch.json

@@ -43,15 +43,15 @@ There are two methods to select students to grade: By section number, or via a l
 
 <details><summary>Select by Section Number</summary>
 
-To use the `--section` flag, a file named `students.csv` must be downloaded to the project directory. This file contains information about students in the course, including each students' section number.
+To use the `--section` flag, a file named `all_students.csv` must be downloaded to the project directory. This file contains information about students in the course, including each students' section number.
 ### Download Student Data
 
 1. Navigate to the course gradebook on Canvas.
 2. Click "Actions > Export" as shown in the below image.
 
 ![Image showing the highlighted export button the user should press in the Canvas gradebook to download a CSV of students in the course](images/export-students.png)
 
-Save this file as `students.csv` in the root directory (the same directory as this README file). It should be structured similarly to `all_students_example.csv`, but may include additional information, like assignment grades.
+Save this file as `all_students.csv` in the root directory (the same directory as this README file). It should be structured similarly to `all_students_example.csv`, but may include additional information, like assignment grades.
 
 When running the grader, use `--section <section number>` to specify a section number you wish to grade. Section numbers are 5-digit numbers seen in the parentheses on a students' section ID string. For example, in the class/section identifier `EEL4712C-0001(11624)`, `11624` is the section number.
 </details>

README.md

@@ -6,7 +6,7 @@
 
 def get_testbench_paths(lab_name: str) -> List[str]:
     lab_tb_dir = Path("lab-testbenches") / lab_name
-    tb_paths = [str(path.resolve()) for path in lab_tb_dir.glob("*.vhd")]
+    tb_paths = [str(path.resolve().as_posix()) for path in lab_tb_dir.glob("*.vhd")]
     return tb_paths
 
 def generate_tcl(
@@ -49,7 +49,7 @@ def generate_tcl(
         tcl = ( 
             ORIGINAL_TCL
             .replace("<PY_LAB_TESTBENCHES>", LAB_TCL) 
-            .replace("<PY_PROJ_HOMEDIR>", str(SIM_DIR)) 
+            .replace("<PY_PROJ_HOMEDIR>", SIM_DIR.resolve().as_posix())
             .replace("<PY_PROJ_NAME>", f"{student.name}_{lab_name}")
             .replace("<PY_STUDENT_SRC_FILES>", file_add_cmds)
             .replace("<PY_STUDENT_NAME>", tcl_name)

scripts/generate_tcl.py

@@ -9,7 +9,9 @@ set proj_name "<PY_PROJ_NAME>"
 
 # make the directory first, so that GUI mode (if used)
 # doesn't prompt you asking to create it.
-mkdir -p $proj_homedir
+if {[catch {mkdir $proj_homedir}]} {
+    puts "Dir already exists. Moving on..."
+}
 
 # Create a new project
 project new $proj_homedir $proj_name 
@@ -52,6 +54,10 @@ proc currStudent {student} {
 
         project calculateorder
 
+        puts "==============================================================="
+        puts "Running simulations..."
+        puts "==============================================================="
+
         # Beginning of lab-specific tcl
         <PY_LAB_TESTBENCHES>
         # End of lab-specific tcl