Bump version to 1.1 + fix merge conflict leftover

The-OpenROAD-Project · Sep 22, 2024 · 46ca4e5 · 46ca4e5
1 parent a2eec53
commit 46ca4e5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/flow.tcl b/flow.tcl
@@ -17,7 +17,11 @@ set ::env(OPENLANE_ROOT) [file dirname [file normalize [info script]]]
 if { ! [info exists ::env(OPENROAD_BIN) ] } {
     set ::env(OPENROAD_BIN) openroad
 }
-set ::env(TCL8_5_TM_PATH) "$::env(OPENLANE_ROOT)/scripts:$::env(TCL8_5_TM_PATH)"
+if { [info exists ::env(TCL8_5_TM_PATH)] } {
+    set ::env(TCL8_5_TM_PATH) "$::env(OPENLANE_ROOT)/scripts:$::env(TCL_8_5_TM_PATH)"
+} else {
+    set ::env(TCL8_5_TM_PATH) "$::env(OPENLANE_ROOT)/scripts"
+}
 package require openlane; # provides the utils as well
 
 proc run_placement_step {args} {

diff --git a/scripts/openlane-1.0.0.tm → scripts/openlane-1.1.0.tm b/scripts/openlane-1.0.0.tm → scripts/openlane-1.1.0.tm
diff --git a/scripts/openlane_utils-1.0.0.tm → scripts/openlane_utils-1.1.0.tm b/scripts/openlane_utils-1.0.0.tm → scripts/openlane_utils-1.1.0.tm
diff --git a/scripts/tcl_commands/checkers.tcl b/scripts/tcl_commands/checkers.tcl
@@ -386,7 +386,6 @@ proc quit_on_unconnected_pdn_nodes {args} {
         throw_error
     }
 }
-<<<<<<< HEAD
 
 proc quit_on_klayout_drc {report_file} {
     set violations_dict [json::json2dict [cat $report_file]]
@@ -402,7 +401,3 @@ proc quit_on_klayout_drc {report_file} {
         puts_info "No KLayout DRC violations after GDS streaming out."
     }
 }
-
-package provide openlane 0.9
-=======
->>>>>>> c043bc27 (Change Versioning Strategy)