luke
/
netgen
mirror of https://github.com/RTimothyEdwards/netgen.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Corrected Tcl list output (and, by consequence, the JSON file 

output) to include pin information (missing "-list" argument to
the "equate pins" command).
This commit is contained in:
Tim Edwards 2017-12-07 08:45:37 -05:00
parent 4098b7d5fd
commit 77e5d70626
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netgen/Makefile
View File

@ -22,8 +22,8 @@ tclnetgen${SHDLIB_EXT}: ${EXTRA_LIBS}
@echo --- making netgen Tcl library \(tclnetgen${SHDLIB_EXT}\) @echo --- making netgen Tcl library \(tclnetgen${SHDLIB_EXT}\)
${RM} tclnetgen${SHDLIB_EXT} ${RM} tclnetgen${SHDLIB_EXT}
${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} \ ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} \
${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} \ ${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} \
${LIB_SPECS} ${LDFLAGS} -lc ${LIBS} ${LIB_SPECS} ${LDFLAGS}
$(DESTDIR)${BINDIR}/netgen: $(DESTDIR)${BINDIR}/netgen:
${RM} $@ ${RM} $@

1
scripts/configure.in
View File

@ -868,7 +868,6 @@ case $target in
AC_DEFINE(i386) AC_DEFINE(i386)
;; ;;
*darwin*) *darwin*)
AC_DEFINE(macosx)
if test "$CPP" = "cc -E" ; then if test "$CPP" = "cc -E" ; then
CPPFLAGS="$CPPFLAGS -no-cpp-precomp" CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
fi fi

9
tcltk/netgen.tcl.in
View File

@ -529,8 +529,13 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
} else { } else {
# Match pins # Match pins
netgen::log echo off netgen::log echo off
set result [equate pins "$fnum1 [lindex $endval 0]" \ if {$dolist == 1} {
"$fnum2 [lindex $endval 1]"] set result [equate pins "$fnum1 [lindex $endval 0]" \
"$fnum2 [lindex $endval 1]"]
} else {
set result [equate -list pins "$fnum1 [lindex $endval 0]" \
"$fnum2 [lindex $endval 1]"]
}
if {$result != 0} { if {$result != 0} {
equate classes "$fnum1 [lindex $endval 0]" \ equate classes "$fnum1 [lindex $endval 0]" \
"$fnum2 [lindex $endval 1]" "$fnum2 [lindex $endval 1]"

2
tcltk/tclnetgen.c
View File

@ -4071,7 +4071,7 @@ int Tclnetgen_Init(Tcl_Interp *interp)
if (cadroot == NULL) cadroot = CAD_DIR; if (cadroot == NULL) cadroot = CAD_DIR;
Tcl_SetVar(interp, "CAD_ROOT", cadroot, TCL_GLOBAL_ONLY); Tcl_SetVar(interp, "CAD_ROOT", cadroot, TCL_GLOBAL_ONLY);
Tcl_PkgProvide(interp, "Tclnetgen", "1.1"); Tcl_PkgProvide(interp, "Tclnetgen", NETGEN_VERSION);
if ((consoleinterp = Tcl_GetMaster(interp)) == NULL) if ((consoleinterp = Tcl_GetMaster(interp)) == NULL)
consoleinterp = interp; consoleinterp = interp;