luke
/
OpenSTA
mirror of https://github.com/The-OpenROAD-Project/OpenSTA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sta_latest_from_parallaxsw_tidy_0416

This commit is contained in:
dsengupta0628 2026-04-20 13:36:22 +00:00
parent 133e2d6f99 e71e5d7bf7
commit 63fb0e0550
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD
View File

@ -296,6 +296,7 @@ cc_binary(
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = [ deps = [
":opensta_lib", ":opensta_lib",
"//:tcl_readline_setup",
"//bazel:tcl_library_init", "//bazel:tcl_library_init",
"@rules_cc//cc/runfiles", "@rules_cc//cc/runfiles",
"@tcl_lang//:tcl", "@tcl_lang//:tcl",

14
app/Main.cc
View File

@ -33,6 +33,7 @@
#ifdef BAZEL_CURRENT_REPOSITORY #ifdef BAZEL_CURRENT_REPOSITORY
#include "bazel/tcl_library_init.h" #include "bazel/tcl_library_init.h"
#include "src/tcl_readline_setup.h"
#endif #endif
#if TCL_READLINE #if TCL_READLINE
@ -124,12 +125,18 @@ staTclAppInit(int argc,
if (Tcl_Init(interp) == TCL_ERROR) if (Tcl_Init(interp) == TCL_ERROR)
return TCL_ERROR; return TCL_ERROR;
bool has_readline = false;
#ifdef BAZEL_CURRENT_REPOSITORY
has_readline = (ord::SetupTclReadlineLibrary(interp) == TCL_OK);
#endif
#if TCL_READLINE #if TCL_READLINE
if (Tclreadline_Init(interp) == TCL_ERROR) if (Tclreadline_Init(interp) == TCL_ERROR)
return TCL_ERROR; return TCL_ERROR;
Tcl_StaticPackage(interp, "tclreadline", Tclreadline_Init, Tclreadline_SafeInit); Tcl_StaticPackage(interp, "tclreadline", Tclreadline_Init, Tclreadline_SafeInit);
if (Tcl_EvalFile(interp, TCLRL_LIBRARY "/tclreadlineInit.tcl") != TCL_OK) if (Tcl_EvalFile(interp, TCLRL_LIBRARY "/tclreadlineInit.tcl") != TCL_OK)
printf("Failed to load tclreadline.tcl\n"); printf("Failed to load tclreadline.tcl\n");
else
has_readline = true;
#endif #endif
initStaApp(argc, argv, interp); initStaApp(argc, argv, interp);
@ -167,11 +174,8 @@ staTclAppInit(int argc,
} }
} }
} }
#if TCL_READLINE
return Tcl_Eval(interp, "::tclreadline::Loop"); return has_readline ? Tcl_Eval(interp, "::tclreadline::Loop") : TCL_OK;
#else
return TCL_OK;
#endif
} }
static void static void