mirror of
https://github.com/RTimothyEdwards/netgen.git
synced 2026-08-22 14:07:07 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Tim Edwards
|
cbb2f78ee9 | ||
 Tim Edwards
|
99c942eb2b | ||
|
Tim Edwards
|
4306562a1a | ||
|
Tim Edwards
|
2f8d50159f | ||
|
Tim Edwards
|
bbc9110431 | ||
|
Tim Edwards
|
f9c4fc86a0 | ||
|
Tim Edwards
|
e0527a0a89 | ||
|
Tim Edwards
|
be6a5a87ce | ||
|
Tim Edwards
|
317eb8ff0f | ||
|
Tim Edwards
|
6bf29235bc | ||
|
Tim Edwards
|
6428d5995c | ||
|
Tim Edwards
|
acd9a0e846 | ||
|
Tim Edwards
|
7edeb2e37d | ||
|
Tim Edwards
|
06d772edd0 | ||
|
Tim Edwards
|
9ae51e0150 | ||
|
Tim Edwards
|
f7cbae9efe | ||
|
Tim Edwards
|
086495bc28 | ||
|
Tim Edwards
|
846ab5369a | ||
|
Tim Edwards
|
8667bf0799 | ||
|
Tim Edwards
|
0caf47006c | ||
|
Tim Edwards
|
a7a94ab2be | ||
|
Tim Edwards
|
d612485a9b | ||
|
Tim Edwards
|
b245b79c20 | ||
|
Tim Edwards
|
c11252f196 | ||
|
Tim Edwards
|
5735181f88 | ||
|
Tim Edwards
|
6e144bf5fe |
@@ -3,6 +3,8 @@
|
||||
.inca.db.*
|
||||
inca.*.pak
|
||||
*.swp
|
||||
*.log
|
||||
*.so
|
||||
*~
|
||||
*/av_extracted*/
|
||||
.nfs*
|
||||
|
||||
+361
-24
@@ -249,6 +249,7 @@ void flattenCell(char *name, int file)
|
||||
int flattenInstancesOf(char *name, int fnum, char *instance)
|
||||
{
|
||||
struct objlist *ParentParams;
|
||||
struct objlist *ParentProps;
|
||||
struct objlist *NextObj;
|
||||
struct objlist *ChildObjList;
|
||||
struct nlist *ThisCell;
|
||||
@@ -308,6 +309,14 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
|
||||
if (ChildCell->class != CLASS_SUBCKT) continue;
|
||||
if (ChildCell == ThisCell) continue; // Avoid infinite loop
|
||||
|
||||
/* Does the parent cell have properties? If so, save a pointer to them */
|
||||
for (ParentProps = ParentParams->next; ParentProps &&
|
||||
ParentProps->type != FIRSTPIN;
|
||||
ParentProps = ParentProps->next) {
|
||||
if (ParentProps->type == PROPERTY) break;
|
||||
}
|
||||
if (ParentProps && (ParentProps->type != PROPERTY)) ParentProps = NULL;
|
||||
|
||||
/* not primitive, so need to flatten this instance */
|
||||
notdone = 1;
|
||||
/* if this is a new instance, flatten it */
|
||||
@@ -381,7 +390,8 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
|
||||
/* delete all ports at beginning of list */
|
||||
if (Debug) Printf("deleting leading port from child\n");
|
||||
tmp = ChildObjList->next;
|
||||
FreeObjectAndHash(ChildObjList, ChildCell);
|
||||
// FreeObjectAndHash(ChildObjList, ChildCell);
|
||||
FreeObject(ChildObjList);
|
||||
ChildObjList = tmp;
|
||||
}
|
||||
tmp = ChildObjList;
|
||||
@@ -389,7 +399,8 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
|
||||
if (IsPort(tmp->next)) {
|
||||
ob2 = (tmp->next)->next;
|
||||
if (Debug) Printf("deleting a port from child\n");
|
||||
FreeObjectAndHash(tmp->next, ChildCell);
|
||||
// FreeObjectAndHash(tmp->next, ChildCell);
|
||||
FreeObject(tmp->next);
|
||||
tmp->next = ob2;
|
||||
}
|
||||
else tmp = tmp->next;
|
||||
@@ -404,7 +415,9 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
|
||||
prefixlength = strlen(tmpstr);
|
||||
#endif
|
||||
for (tmp = ChildObjList; tmp != NULL; tmp = tmp->next) {
|
||||
if (tmp->type == PROPERTY) continue;
|
||||
if (tmp->type == PROPERTY)
|
||||
continue;
|
||||
|
||||
else if (IsGlobal(tmp)) {
|
||||
/* Keep the name but search for node of same name in parent */
|
||||
/* and replace the node number, if found. */
|
||||
@@ -453,6 +466,31 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
|
||||
HashPtrInstall(tmp->instance.name, tmp, ThisCell->insttab, OBJHASHSIZE);
|
||||
}
|
||||
|
||||
/* do property inheritance */
|
||||
if (ParentProps) {
|
||||
for (ob2 = ChildObjList; ob2 != NULL; ob2=ob2->next) {
|
||||
|
||||
/* If the parent cell has properties to declare, then */
|
||||
/* pass them on to children. */
|
||||
|
||||
if (ob2->type == PROPERTY) {
|
||||
struct valuelist *vl;
|
||||
int i;
|
||||
for (i == 0;; i++) {
|
||||
vl = &(ob2->instance.props[i]);
|
||||
if (vl->type == PROP_ENDLIST) break;
|
||||
else if (vl->type == PROP_EXPRESSION) {
|
||||
/* Only expressions take substitutions */
|
||||
struct tokstack *token;
|
||||
for (token = vl->value.stack; token; token = token->next) {
|
||||
/* WIP */
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* splice instance out of parent */
|
||||
if (ParentParams == ThisCell->cell) {
|
||||
/* ParentParams are the very first thing in the list */
|
||||
@@ -466,6 +504,7 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
|
||||
for (ob2->next = ChildObjList; ob2->next != NULL; ob2 = ob2->next) ;
|
||||
}
|
||||
/* now, ob2 is last element in child list, so skip and reclaim parent */
|
||||
|
||||
tmp = ParentParams;
|
||||
do {
|
||||
tmp = tmp->next;
|
||||
@@ -499,9 +538,22 @@ int flattenoneentry(struct hashlist *p, int file)
|
||||
struct nlist *ptr;
|
||||
|
||||
ptr = (struct nlist *)(p->ptr);
|
||||
if (file == ptr->file)
|
||||
if (file == ptr->file) {
|
||||
if (!(*matchfunc)(ptr->name, model_to_flatten) && (ptr->class == CLASS_SUBCKT))
|
||||
flattenInstancesOf(ptr->name, file, model_to_flatten);
|
||||
else if (ptr->flags & CELL_DUPLICATE) {
|
||||
char *bptr = strstr(ptr->name, "[[");
|
||||
if (bptr != NULL) {
|
||||
*bptr = '\0';
|
||||
if (!(*matchfunc)(ptr->name, model_to_flatten)
|
||||
&& (ptr->class == CLASS_SUBCKT)) {
|
||||
*bptr = '[';
|
||||
flattenInstancesOf(ptr->name, file, model_to_flatten);
|
||||
}
|
||||
*bptr = '[';
|
||||
}
|
||||
}
|
||||
}
|
||||
return(1);
|
||||
}
|
||||
|
||||
@@ -915,7 +967,7 @@ struct nlist *uniquepins(struct hashlist *p, void *clientdata)
|
||||
}
|
||||
}
|
||||
tob = tob->next;
|
||||
if (tob->type != PORT && tob->type != UNKNOWN) break;
|
||||
if (tob == NULL || (tob->type != PORT && tob->type != UNKNOWN)) break;
|
||||
}
|
||||
|
||||
/* 2nd pass---remove the pins */
|
||||
@@ -941,7 +993,7 @@ struct nlist *uniquepins(struct hashlist *p, void *clientdata)
|
||||
ob = ob->next;
|
||||
}
|
||||
tob = tob->next;
|
||||
if (tob->type != PORT && tob->type != UNKNOWN) break;
|
||||
if (tob == NULL || (tob->type != PORT && tob->type != UNKNOWN)) break;
|
||||
}
|
||||
|
||||
// Renumber the pins in order. Since when removing duplicates, the
|
||||
@@ -1204,7 +1256,11 @@ int CleanupPins(char *name, int filenum)
|
||||
|
||||
lob = NULL;
|
||||
for (ob = ThisCell->cell; ob != NULL; ) {
|
||||
if (ob->type == UNKNOWN) continue;
|
||||
if (ob->type == UNKNOWN) {
|
||||
lob = ob;
|
||||
ob = ob->next;
|
||||
continue;
|
||||
}
|
||||
else if (ob->type != PORT) break;
|
||||
nob = ob->next;
|
||||
if (ob->node == -1) {
|
||||
@@ -1243,6 +1299,13 @@ typedef struct ecompare {
|
||||
char refcount;
|
||||
} ECompare;
|
||||
|
||||
typedef struct ecomplist *ECompListPtr;
|
||||
|
||||
typedef struct ecomplist {
|
||||
ECompare *ecomp;
|
||||
ECompListPtr next;
|
||||
} ECompList;
|
||||
|
||||
/*------------------------------------------------------*/
|
||||
/* Survey the contents of a cell and
|
||||
/*------------------------------------------------------*/
|
||||
@@ -1253,38 +1316,58 @@ SurveyCell(struct nlist *tc, struct hashlist **comptab, int file1, int file2, in
|
||||
struct objlist *ob;
|
||||
struct nlist *tsub, *teq;
|
||||
ECompare *ecomp, *qcomp, *ncomp;
|
||||
int file = (which == 0) ? file1 : file2;
|
||||
int ofile = (which == 0) ? file2 : file1;
|
||||
char *dstr;
|
||||
|
||||
for (ob = tc->cell; ob; ob = ob->next) {
|
||||
if (ob->type == FIRSTPIN) {
|
||||
tsub = LookupCellFile(ob->model.class, (which == 0) ? file1 : file2);
|
||||
ecomp = (ECompare *)HashLookup(ob->model.class, comptab, OBJHASHSIZE);
|
||||
tsub = LookupCellFile(ob->model.class, file);
|
||||
if (tsub->flags & CELL_DUPLICATE) {
|
||||
// Always register a duplicate under the original name
|
||||
dstr = strstr(ob->model.class, "[[");
|
||||
if (dstr) *dstr = '\0';
|
||||
}
|
||||
else dstr = NULL;
|
||||
|
||||
teq = LookupClassEquivalent(ob->model.class, file, ofile);
|
||||
ecomp = (ECompare *)HashInt2Lookup(ob->model.class, file,
|
||||
comptab, OBJHASHSIZE);
|
||||
|
||||
if (ecomp == NULL) {
|
||||
ncomp = (ECompare *)MALLOC(sizeof(ECompare));
|
||||
if (which == 0) {
|
||||
ncomp->num1 = 1;
|
||||
ncomp->num2 = 0;
|
||||
ncomp->cell1 = tsub;
|
||||
teq = LookupClassEquivalent(ob->model.class, file1, file2);
|
||||
ncomp->cell2 = teq;
|
||||
}
|
||||
else {
|
||||
ncomp->num1 = 0;
|
||||
ncomp->num2 = 1;
|
||||
ncomp->cell2 = tsub;
|
||||
teq = LookupClassEquivalent(ob->model.class, file2, file1);
|
||||
ncomp->cell1 = teq;
|
||||
}
|
||||
ncomp->add1 = 0;
|
||||
ncomp->add2 = 0;
|
||||
ncomp->refcount = (char)1;
|
||||
|
||||
HashPtrInstall(ob->model.class, ncomp, comptab, OBJHASHSIZE);
|
||||
HashInt2PtrInstall(ob->model.class, file, ncomp, comptab,
|
||||
OBJHASHSIZE);
|
||||
if (teq != NULL) {
|
||||
qcomp = (ECompare *)HashLookup(teq->name, comptab, OBJHASHSIZE);
|
||||
char *bstr = NULL;
|
||||
if (teq->flags & CELL_DUPLICATE) {
|
||||
bstr = strstr(teq->name, "[[");
|
||||
if (bstr) *bstr = '\0';
|
||||
}
|
||||
qcomp = (ECompare *)HashInt2Lookup(teq->name, ofile,
|
||||
comptab, OBJHASHSIZE);
|
||||
if (qcomp == NULL) {
|
||||
HashPtrInstall(teq->name, ncomp, comptab, OBJHASHSIZE);
|
||||
HashInt2PtrInstall(teq->name, ofile, ncomp, comptab,
|
||||
OBJHASHSIZE);
|
||||
ncomp->refcount++;
|
||||
}
|
||||
if (bstr) *bstr = '[';
|
||||
}
|
||||
}
|
||||
else {
|
||||
@@ -1293,6 +1376,7 @@ SurveyCell(struct nlist *tc, struct hashlist **comptab, int file1, int file2, in
|
||||
else
|
||||
ecomp->num2++;
|
||||
}
|
||||
if (dstr) *dstr = '[';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1318,10 +1402,11 @@ SurveyCell(struct nlist *tc, struct hashlist **comptab, int file1, int file2, in
|
||||
int
|
||||
PrematchLists(char *name1, int file1, char *name2, int file2)
|
||||
{
|
||||
struct nlist *tc1, *tc2, *teq, *tsub1, *tsub2;
|
||||
struct nlist *tc1, *tc2, *tsub1, *tsub2;
|
||||
struct objlist *ob1, *ob2, *lob;
|
||||
struct hashlist **comptab;
|
||||
ECompare *ecomp, *ncomp;
|
||||
ECompList *list0X, *listX0;
|
||||
int match, modified = 0;
|
||||
|
||||
if (file1 == -1)
|
||||
@@ -1348,19 +1433,26 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
|
||||
// Find all instances of one cell that have fewer in
|
||||
// the compared circuit. Check whether subcircuits
|
||||
// in the hierarchy of each instance contain devices
|
||||
// or subcircuits that more in the compared circuit.
|
||||
// or subcircuits that have more in the compared circuit.
|
||||
|
||||
listX0 = list0X = NULL;
|
||||
ecomp = (ECompare *)HashFirst(comptab, OBJHASHSIZE);
|
||||
while (ecomp != NULL) {
|
||||
|
||||
/* Case 1: Both cell1 and cell2 classes are subcircuits, */
|
||||
/* and flattening both of them improves the matching. */
|
||||
|
||||
if ((ecomp->num1 != ecomp->num2) && (ecomp->cell2 != NULL) &&
|
||||
(ecomp->cell2->class == CLASS_SUBCKT)) {
|
||||
(ecomp->cell1 != NULL) &&
|
||||
(ecomp->cell2->class == CLASS_SUBCKT) &&
|
||||
(ecomp->cell1->class == CLASS_SUBCKT)) {
|
||||
ecomp->add2 = -ecomp->num2;
|
||||
ecomp->add1 = -ecomp->num1;
|
||||
match = 1;
|
||||
for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
|
||||
if (ob2->type == FIRSTPIN) {
|
||||
ncomp = (ECompare *)HashLookup(ob2->model.class,
|
||||
comptab, OBJHASHSIZE);
|
||||
ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
|
||||
ecomp->cell2->file, comptab, OBJHASHSIZE);
|
||||
if (ncomp != NULL) {
|
||||
if ((ncomp->num1 > ncomp->num2) &&
|
||||
((ncomp->add2 + ecomp->num2) >=
|
||||
@@ -1386,16 +1478,28 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
|
||||
}
|
||||
}
|
||||
if (match) {
|
||||
flattenInstancesOf(name2, file2, ecomp->cell2->name);
|
||||
flattenInstancesOf(name1, file1, ecomp->cell1->name);
|
||||
if (ecomp->cell1) {
|
||||
Fprintf(stdout, "Flattening instances of %s in cell %s"
|
||||
" makes a better match\n", ecomp->cell1->name,
|
||||
name1);
|
||||
flattenInstancesOf(name1, file1, ecomp->cell1->name);
|
||||
}
|
||||
if (ecomp->cell2) {
|
||||
Fprintf(stdout, "Flattening instances of %s in cell %s"
|
||||
" makes a better match\n", ecomp->cell2->name,
|
||||
name2);
|
||||
flattenInstancesOf(name2, file2, ecomp->cell2->name);
|
||||
}
|
||||
modified++;
|
||||
}
|
||||
|
||||
/* Reset or apply the count adjustments */
|
||||
if (ecomp->cell2)
|
||||
for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
|
||||
if (ob2->type == FIRSTPIN) {
|
||||
ncomp = (ECompare *)HashLookup(ob2->model.class,
|
||||
comptab, OBJHASHSIZE);
|
||||
ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
|
||||
ecomp->cell2->file, comptab,
|
||||
OBJHASHSIZE);
|
||||
if (ncomp != NULL) {
|
||||
if (match) {
|
||||
ncomp->num1 += ncomp->add1;
|
||||
@@ -1412,6 +1516,145 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
|
||||
}
|
||||
ecomp->add1 = 0;
|
||||
ecomp->add2 = 0;
|
||||
|
||||
/* If the pair was unresolved, and the number of */
|
||||
/* instances is either N:0 or 0:M, add to a list so */
|
||||
/* they can be cross-checked at the end. */
|
||||
|
||||
if ((ecomp->num1 != 0) && (ecomp->num2 == 0)) {
|
||||
ECompList *newcomplist;
|
||||
|
||||
newcomplist = (ECompList *)MALLOC(sizeof(ECompList));
|
||||
newcomplist->ecomp = ecomp;
|
||||
newcomplist->next = listX0;
|
||||
listX0 = newcomplist;
|
||||
}
|
||||
else if ((ecomp->num1 == 0) && (ecomp->num2 != 0)) {
|
||||
ECompList *newcomplist;
|
||||
|
||||
newcomplist = (ECompList *)MALLOC(sizeof(ECompList));
|
||||
newcomplist->ecomp = ecomp;
|
||||
newcomplist->next = list0X;
|
||||
list0X = newcomplist;
|
||||
}
|
||||
}
|
||||
|
||||
/* Case 2: Cell2 class is a subcircuit, and flattening */
|
||||
/* (it without regard to cell1) improves the matching. */
|
||||
|
||||
else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell2 != NULL) &&
|
||||
(ecomp->cell2->class == CLASS_SUBCKT)) {
|
||||
ecomp->add2 = -ecomp->num2;
|
||||
match = 1;
|
||||
for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
|
||||
if (ob2->type == FIRSTPIN) {
|
||||
ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
|
||||
ecomp->cell2->file, comptab, OBJHASHSIZE);
|
||||
if (ncomp != NULL) {
|
||||
if ((ncomp->num1 > ncomp->num2) &&
|
||||
((ncomp->add2 + ecomp->num2) <=
|
||||
ncomp->num1)) {
|
||||
ncomp->add2 += ecomp->num2;
|
||||
}
|
||||
else {
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (match) {
|
||||
if (ecomp->cell2) {
|
||||
Fprintf(stdout, "Flattening instances of %s in cell %s"
|
||||
" makes a better match\n", ecomp->cell2->name,
|
||||
name2);
|
||||
flattenInstancesOf(name2, file2, ecomp->cell2->name);
|
||||
}
|
||||
modified++;
|
||||
}
|
||||
|
||||
/* Reset or apply the count adjustments */
|
||||
if (ecomp->cell2)
|
||||
for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
|
||||
if (ob2->type == FIRSTPIN) {
|
||||
ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
|
||||
ecomp->cell2->file, comptab,
|
||||
OBJHASHSIZE);
|
||||
if (ncomp != NULL) {
|
||||
if (match) {
|
||||
ncomp->num2 += ncomp->add2;
|
||||
}
|
||||
ncomp->add2 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (match) {
|
||||
ecomp->num2 = 0;
|
||||
}
|
||||
ecomp->add2 = 0;
|
||||
}
|
||||
|
||||
/* Case 3: Cell1 class is a subcircuit, and flattening */
|
||||
/* (it without regard to cell1) improves the matching. */
|
||||
|
||||
else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell1 != NULL) &&
|
||||
(ecomp->cell1->class == CLASS_SUBCKT)) {
|
||||
ecomp->add1 = -ecomp->num1;
|
||||
match = 1;
|
||||
for (ob2 = ecomp->cell1->cell; ob2; ob2 = ob2->next) {
|
||||
if (ob2->type == FIRSTPIN) {
|
||||
ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
|
||||
ecomp->cell1->file, comptab, OBJHASHSIZE);
|
||||
if (ncomp != NULL) {
|
||||
if ((ncomp->num2 > ncomp->num1) &&
|
||||
((ncomp->add1 + ecomp->num1) <=
|
||||
ncomp->num2)) {
|
||||
ncomp->add1 += ecomp->num1;
|
||||
}
|
||||
else {
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else {
|
||||
match = 0;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (match) {
|
||||
if (ecomp->cell1) {
|
||||
Fprintf(stdout, "Flattening instances of %s in cell %s"
|
||||
" makes a better match\n", ecomp->cell1->name,
|
||||
name1);
|
||||
flattenInstancesOf(name1, file1, ecomp->cell1->name);
|
||||
}
|
||||
modified++;
|
||||
}
|
||||
|
||||
/* Reset or apply the count adjustments */
|
||||
if (ecomp->cell1)
|
||||
for (ob2 = ecomp->cell1->cell; ob2; ob2 = ob2->next) {
|
||||
if (ob2->type == FIRSTPIN) {
|
||||
ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
|
||||
ecomp->cell1->file, comptab,
|
||||
OBJHASHSIZE);
|
||||
if (ncomp != NULL) {
|
||||
if (match) {
|
||||
ncomp->num1 += ncomp->add1;
|
||||
}
|
||||
ncomp->add1 = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (match) {
|
||||
ecomp->num1 = 0;
|
||||
}
|
||||
ecomp->add1 = 0;
|
||||
}
|
||||
ecomp = (ECompare *)HashNext(comptab, OBJHASHSIZE);
|
||||
}
|
||||
@@ -1466,6 +1709,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
|
||||
if (found) break;
|
||||
}
|
||||
if (found) {
|
||||
Fprintf(stdout, "Removing zero-valued device"
|
||||
"%s from cell %s makes a better match\n",
|
||||
tsub1->name,
|
||||
tc1->name);
|
||||
|
||||
/* merge node of endpoints */
|
||||
for (ob2 = tc1->cell; ob2; ob2 = ob2->next) {
|
||||
if (ob2->node == node2)
|
||||
@@ -1565,6 +1813,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
|
||||
if (found) break;
|
||||
}
|
||||
if (found) {
|
||||
Fprintf(stdout, "Removing zero-valued device"
|
||||
"%s from cell %s makes a better match\n",
|
||||
tsub2->name,
|
||||
tc2->name);
|
||||
|
||||
/* merge node of endpoints */
|
||||
for (ob1 = tc2->cell; ob1; ob1 = ob1->next) {
|
||||
if (ob1->node == node2)
|
||||
@@ -1616,10 +1869,83 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ecomp = (ECompare *)HashNext(comptab, OBJHASHSIZE);
|
||||
}
|
||||
|
||||
// Finally, check all entries in listX0 vs. all entries in list0X to see
|
||||
// if flattening one side will improve the matching. Ignore entries
|
||||
// that are duplicates (already matched). Also do this only if there
|
||||
// are no other modifications, as this rule is relaxed compared to other
|
||||
// rules, and the other rules should be exhaustively applied first.
|
||||
|
||||
if ((listX0 != NULL) && (list0X != NULL) && (modified == 0)) {
|
||||
ECompare *ecomp0X, *ecompX0;
|
||||
ECompList *elist0X, *elistX0;
|
||||
for (elistX0 = listX0; elistX0; elistX0 = elistX0->next) {
|
||||
ecompX0 = elistX0->ecomp;
|
||||
|
||||
for (elist0X = list0X; elist0X; elist0X = elist0X->next) {
|
||||
ecomp0X = elist0X->ecomp;
|
||||
|
||||
// Check that this has not already been processed and flattened
|
||||
if (ecompX0->num1 > 0 && ecomp0X->num2 > 0) {
|
||||
|
||||
// Are any components of ecompX0->cell1 in the ecomp0X list?
|
||||
|
||||
for (ob1 = ecompX0->cell1->cell; ob1; ob1 = ob1->next) {
|
||||
if (ob1->type == FIRSTPIN) {
|
||||
char *dstr = NULL;
|
||||
tc1 = LookupCellFile(ob1->model.class, ecompX0->cell1->file);
|
||||
if (tc1->flags & CELL_DUPLICATE) {
|
||||
dstr = strstr(ob1->model.class, "[[");
|
||||
if (dstr) *dstr = '\0';
|
||||
}
|
||||
ncomp = (ECompare *)HashInt2Lookup(ob1->model.class,
|
||||
ecompX0->cell1->file, comptab, OBJHASHSIZE);
|
||||
if (dstr) *dstr = '[';
|
||||
if ((ncomp == ecomp0X) && (ecomp0X->num2 <= ecompX0->num1)) {
|
||||
Fprintf(stdout, "Flattening instances of %s in cell %s"
|
||||
" makes a better match\n", ecompX0->cell1->name,
|
||||
name1);
|
||||
flattenInstancesOf(name1, file1, ecompX0->cell1->name);
|
||||
ecompX0->num1 = 0;
|
||||
ecomp0X->num1 += ecompX0->num1;
|
||||
modified++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Are any components of ecomp0X->cell2 in the ecompX0 list?
|
||||
|
||||
for (ob2 = ecomp0X->cell2->cell; ob2; ob2 = ob2->next) {
|
||||
if (ob2->type == FIRSTPIN) {
|
||||
char *dstr = NULL;
|
||||
tc2 = LookupCellFile(ob2->model.class, ecomp0X->cell2->file);
|
||||
if (tc2->flags & CELL_DUPLICATE) {
|
||||
dstr = strstr(ob1->model.class, "[[");
|
||||
if (dstr) *dstr = '\0';
|
||||
}
|
||||
ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
|
||||
ecomp0X->cell2->file, comptab, OBJHASHSIZE);
|
||||
if (dstr) *dstr = '[';
|
||||
if ((ncomp == ecompX0) && (ecompX0->num1 <= ecomp0X->num2)) {
|
||||
Fprintf(stdout, "Flattening instances of %s in cell %s"
|
||||
" makes a better match\n", ecomp0X->cell2->name,
|
||||
name2);
|
||||
flattenInstancesOf(name2, file2, ecomp0X->cell2->name);
|
||||
ecomp0X->num2 = 0;
|
||||
ecompX0->num2 += ecomp0X->num2;
|
||||
modified++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Free the hash table and its contents.
|
||||
|
||||
ecomp = (ECompare *)HashFirst(comptab, OBJHASHSIZE);
|
||||
@@ -1630,5 +1956,16 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
|
||||
HashKill(comptab, OBJHASHSIZE);
|
||||
FREE(comptab);
|
||||
|
||||
// Free the 0:X and X:0 lists
|
||||
while (listX0 != NULL) {
|
||||
ECompList *nextptr = listX0->next;
|
||||
FREE(listX0);
|
||||
listX0 = nextptr;
|
||||
}
|
||||
while (list0X != NULL) {
|
||||
ECompList *nextptr = list0X->next;
|
||||
FREE(list0X);
|
||||
list0X = nextptr;
|
||||
}
|
||||
return modified;
|
||||
}
|
||||
|
||||
+56
@@ -150,6 +150,15 @@ unsigned long hash(char *s, int hashsize)
|
||||
return (hashsize == 0) ? hashval : (hashval % hashsize);
|
||||
}
|
||||
|
||||
unsigned long genhash(char *s, int c, int hashsize)
|
||||
{
|
||||
unsigned long hashval;
|
||||
|
||||
for (hashval = (unsigned long)c; *s != '\0'; )
|
||||
hashval = (*s++) + (hashval << 6) + (hashval << 16) - hashval;
|
||||
return (hashsize == 0) ? hashval : (hashval % hashsize);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/* HashLookup -- */
|
||||
/* return the 'ptr' field of the hash table entry, or NULL if not found */
|
||||
@@ -194,6 +203,27 @@ void *HashIntLookup(char *s, int i, struct hashlist **hashtab, int hashsize)
|
||||
return (NULL); /* not found */
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/* Similar to HashIntLookup, but HashInt2Lookup adds the integer c as */
|
||||
/* part of the hash, using a special hash function to hash the char */
|
||||
/* first, then the character string. */
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
void *HashInt2Lookup(char *s, int c, struct hashlist **hashtab, int hashsize)
|
||||
{
|
||||
struct hashlist *np;
|
||||
unsigned long hashval;
|
||||
|
||||
hashval = genhash(s, c, hashsize);
|
||||
|
||||
for (np = hashtab[hashval]; np != NULL; np = np->next)
|
||||
if (!strcmp(s, np->name))
|
||||
return (np->ptr); /* correct match */
|
||||
|
||||
return (NULL); /* not found */
|
||||
}
|
||||
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/* return the hashlist entry, after (re)initializing its 'ptr' field */
|
||||
/*----------------------------------------------------------------------*/
|
||||
@@ -247,6 +277,32 @@ struct hashlist *HashIntPtrInstall(char *name, int value, void *ptr,
|
||||
return(hashtab[hashval] = np);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/* And the following is used with HashInt2. */
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr,
|
||||
struct hashlist **hashtab, int hashsize)
|
||||
{
|
||||
struct hashlist *np;
|
||||
unsigned long hashval;
|
||||
|
||||
hashval = genhash(name, c, hashsize);
|
||||
for (np = hashtab[hashval]; np != NULL; np = np->next)
|
||||
if (!strcmp(name, np->name)) {
|
||||
np->ptr = ptr;
|
||||
return (np); /* match found in hash table */
|
||||
}
|
||||
|
||||
/* not in table, so install it */
|
||||
if ((np = (struct hashlist *) CALLOC(1,sizeof(struct hashlist))) == NULL)
|
||||
return (NULL);
|
||||
if ((np->name = strsave(name)) == NULL) return (NULL);
|
||||
np->ptr = ptr;
|
||||
np->next = hashtab[hashval];
|
||||
return(hashtab[hashval] = np);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/* destroy a hash table, freeing associated memory */
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
@@ -30,10 +30,13 @@ extern struct hashlist *HashPtrInstall(char *name, void *ptr,
|
||||
struct hashlist **hashtab, int hashsize);
|
||||
extern struct hashlist *HashIntPtrInstall(char *name, int value, void *ptr,
|
||||
struct hashlist **hashtab, int hashsize);
|
||||
extern struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr,
|
||||
struct hashlist **hashtab, int hashsize);
|
||||
|
||||
/* these functions return the ->ptr field of a struct hashlist */
|
||||
extern void *HashLookup(char *s, struct hashlist **hashtab, int hashsize);
|
||||
extern void *HashIntLookup(char *s, int i, struct hashlist **hashtab, int hashsize);
|
||||
extern void *HashInt2Lookup(char *s, int c, struct hashlist **hashtab, int hashsize);
|
||||
extern void *HashFirst(struct hashlist **hashtab, int hashsize);
|
||||
extern void *HashNext(struct hashlist **hashtab, int hashsize);
|
||||
|
||||
|
||||
+175
-42
@@ -2486,14 +2486,16 @@ int FirstElementPass(struct Element *E, int noflat)
|
||||
if (Ecorr->hashval == 0) {
|
||||
if (Ecorr->graph == Circuit2->file) {
|
||||
tp = LookupCellFile(Ecorr->object->model.class, Circuit2->file);
|
||||
if (tp == tp2) {
|
||||
// if (tp == tp2) {
|
||||
if (tp && tp2 && (tp->classhash == tp2->classhash)) {
|
||||
Ecorr->hashval = 1;
|
||||
C2++;
|
||||
}
|
||||
}
|
||||
else if (Ecorr->graph == Circuit1->file) {
|
||||
tp = LookupCellFile(Ecorr->object->model.class, Circuit1->file);
|
||||
if (tp == tp1) {
|
||||
// if (tp == tp1) {
|
||||
if (tp && tp1 && (tp->classhash == tp1->classhash)) {
|
||||
Ecorr->hashval = 1;
|
||||
C1++;
|
||||
}
|
||||
@@ -2535,7 +2537,8 @@ int FirstElementPass(struct Element *E, int noflat)
|
||||
if (Ecorr->hashval == 0) {
|
||||
if (Ecorr->graph == Circuit2->file) {
|
||||
tp = LookupCellFile(Ecorr->object->model.class, Circuit2->file);
|
||||
if (tp == tp2) {
|
||||
// if (tp == tp2) {
|
||||
if (tp->classhash == tp2->classhash) {
|
||||
Ecorr->hashval = 1;
|
||||
C2++;
|
||||
}
|
||||
@@ -2648,8 +2651,14 @@ void MatchFail(char *name1, char *name2)
|
||||
tc1 = LookupCell(name1);
|
||||
tc2 = LookupCell(name2);
|
||||
|
||||
tc1->flags &= ~CELL_MATCHED;
|
||||
tc2->flags &= ~CELL_MATCHED;
|
||||
if (!(tc1->flags & CELL_DUPLICATE) && !(tc2->flags & CELL_DUPLICATE)) {
|
||||
tc1->flags &= ~CELL_MATCHED;
|
||||
tc2->flags &= ~CELL_MATCHED;
|
||||
}
|
||||
else if (tc1->flags & CELL_DUPLICATE)
|
||||
tc1->flags &= ~CELL_MATCHED;
|
||||
else if (tc2->flags & CELL_DUPLICATE)
|
||||
tc2->flags &= ~CELL_MATCHED;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------*/
|
||||
@@ -2666,7 +2675,7 @@ int FlattenUnmatched(struct nlist *tc, char *parent, int stoplevel, int loclevel
|
||||
Fprintf(stdout, "Flattening unmatched subcell %s in circuit %s ",
|
||||
tc->name, parent);
|
||||
changed = flattenInstancesOf(parent, tc->file, tc->name);
|
||||
Fprintf(stdout, "(%d instances)\n", changed);
|
||||
Fprintf(stdout, "(%d instance%s)\n", changed, ((changed == 1) ? "" : "s"));
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -2674,8 +2683,8 @@ int FlattenUnmatched(struct nlist *tc, char *parent, int stoplevel, int loclevel
|
||||
|
||||
changed = 1;
|
||||
while (changed) {
|
||||
changed = 0;
|
||||
for (ob = tc->cell; ob != NULL; ob = ob->next) {
|
||||
changed = 0;
|
||||
tcsub = NULL;
|
||||
if (ob->type == FIRSTPIN) {
|
||||
/* First check if there is a class equivalent */
|
||||
@@ -2722,9 +2731,16 @@ void DescendCompareQueue(struct nlist *tc, struct nlist *tctop, int stoplevel,
|
||||
struct nlist *tcsub, *tc2, *tctest;
|
||||
struct objlist *ob;
|
||||
struct Correspond *scomp, *newcomp;
|
||||
char *sdup = NULL;
|
||||
|
||||
if (loclevel == stoplevel && !(tc->flags & CELL_MATCHED)) {
|
||||
|
||||
// Any duplicate cell should be name-matched against a non-duplicate
|
||||
if (tc->flags & CELL_DUPLICATE) {
|
||||
sdup = strstr(tc->name, "[[");
|
||||
if (sdup) *sdup = '\0';
|
||||
}
|
||||
|
||||
// Find exact-name equivalents or cells that have been specified
|
||||
// as equivalent using the "equate class" command.
|
||||
|
||||
@@ -2742,10 +2758,15 @@ void DescendCompareQueue(struct nlist *tc, struct nlist *tctop, int stoplevel,
|
||||
|
||||
if (tc2 != NULL) {
|
||||
tctest = LookupPrematchedClass(tc2, tc->file);
|
||||
if (tctest != NULL && tctest != tc) return;
|
||||
if (tctest != NULL && tctest != tc) {
|
||||
if (sdup) *sdup = '[';
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (sdup) *sdup = '[';
|
||||
|
||||
if (tc2 != NULL) {
|
||||
newcomp = (struct Correspond *)CALLOC(1, sizeof(struct Correspond));
|
||||
newcomp->next = NULL;
|
||||
@@ -3243,6 +3264,10 @@ int Iterate(void)
|
||||
/* return the number of mismatched properties (0 = perfect */
|
||||
/* match of all properties, or there were no properties to */
|
||||
/* compare). */
|
||||
/* */
|
||||
/* NOTE: ob1 must belong to Circuit1, and ob2 must belong to */
|
||||
/* Circuit2. The calling procedure is responsble for ensuring */
|
||||
/* that this is true. */
|
||||
/*--------------------------------------------------------------*/
|
||||
|
||||
int PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print)
|
||||
@@ -3268,8 +3293,8 @@ int PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print)
|
||||
/* Check if there are any properties to match */
|
||||
|
||||
if ((tp1 == NULL) && (tp2 == NULL)) return 0;
|
||||
if (tp1 != NULL) t1type = tp1->type;
|
||||
if (tp2 != NULL) t2type = tp2->type;
|
||||
t1type = (tp1 != NULL) ? tp1->type : 0;
|
||||
t2type = (tp2 != NULL) ? tp2->type : 0;
|
||||
|
||||
if (tp1 == NULL)
|
||||
if (t2type != PROPERTY) return 0;
|
||||
@@ -3278,8 +3303,10 @@ int PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print)
|
||||
if (t1type != PROPERTY) return 0;
|
||||
|
||||
// Sanity check---shouldn't happen
|
||||
if ((t1type == PROPERTY) && (tp1->instance.props == NULL)) t1type = UNKNOWN;
|
||||
if ((t2type == PROPERTY) && (tp2->instance.props == NULL)) t2type = UNKNOWN;
|
||||
if (tp1 && (t1type == PROPERTY) && (tp1->instance.props == NULL))
|
||||
t1type = UNKNOWN;
|
||||
if (tp2 && (t2type == PROPERTY) && (tp2->instance.props == NULL))
|
||||
t2type = UNKNOWN;
|
||||
|
||||
if ((t1type != PROPERTY) && (t2type != PROPERTY)) return 0;
|
||||
|
||||
@@ -3300,8 +3327,8 @@ int PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print)
|
||||
}
|
||||
}
|
||||
if (vl2->type != PROP_ENDLIST) {
|
||||
if (do_print) Fprintf(stdout, "Circuit 2 %s instance %s does not"
|
||||
" define required properties.\n",
|
||||
if (do_print) Fprintf(stdout, "Circuit 2 %s instance %s missing"
|
||||
" required properties.\n",
|
||||
Circuit2->name, ob2->instance.name);
|
||||
return -1;
|
||||
}
|
||||
@@ -3325,8 +3352,8 @@ int PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print)
|
||||
}
|
||||
}
|
||||
if (vl1->type != PROP_ENDLIST) {
|
||||
if (do_print) Fprintf(stdout, "Circuit 1 %s instance %s does not"
|
||||
" define required properties.\n",
|
||||
if (do_print) Fprintf(stdout, "Circuit 1 %s instance %s missing"
|
||||
" required properties.\n",
|
||||
Circuit1->name, ob1->instance.name);
|
||||
return -1;
|
||||
}
|
||||
@@ -3362,6 +3389,14 @@ int PropertyMatch(struct objlist *ob1, struct objlist *ob2, int do_print)
|
||||
kl2 = (struct property *)HashLookup(vl2->key, tc2->proptab, OBJHASHSIZE);
|
||||
if (kl2 == NULL) continue;
|
||||
|
||||
/* Watch out for uninitialized entries in cell def */
|
||||
if (vl1->type == vl2->type) {
|
||||
if (kl1->type == PROP_STRING && kl1->pdefault.string == NULL)
|
||||
SetPropertyDefault(kl1, vl1);
|
||||
if (kl2->type == PROP_STRING && kl2->pdefault.string == NULL)
|
||||
SetPropertyDefault(kl2, vl2);
|
||||
}
|
||||
|
||||
if (vl1->type != vl2->type) {
|
||||
if (kl1->type != vl1->type) PromoteProperty(kl1, vl1);
|
||||
if (kl2->type != vl2->type) PromoteProperty(kl2, vl2);
|
||||
@@ -3737,7 +3772,11 @@ int ResolveAutomorphsByProperty()
|
||||
badmatch = FALSE;
|
||||
for (E2 = E1->next; E2 != NULL; E2 = E2->next) {
|
||||
if (E2->hashval != orighash) continue;
|
||||
result = PropertyMatch(E1->object, E2->object, FALSE);
|
||||
if (E2->graph == E1->graph) continue;
|
||||
if (E1->graph == Circuit1->file)
|
||||
result = PropertyMatch(E1->object, E2->object, FALSE);
|
||||
else
|
||||
result = PropertyMatch(E2->object, E1->object, FALSE);
|
||||
if (result == 0) {
|
||||
E2->hashval = newhash;
|
||||
if (E2->graph == E1->graph)
|
||||
@@ -4309,7 +4348,9 @@ int EquivalenceClasses(char *name1, int file1, char *name2, int file2)
|
||||
{
|
||||
char *class1, *class2;
|
||||
struct Correspond *newc;
|
||||
struct nlist *tp, *tp2;
|
||||
struct nlist *tp, *tp2, *tpx;
|
||||
unsigned char need_new_seed = 0;
|
||||
int reverse = 0;
|
||||
|
||||
if (file1 != -1 && file2 != -1) {
|
||||
|
||||
@@ -4319,7 +4360,49 @@ int EquivalenceClasses(char *name1, int file1, char *name2, int file2)
|
||||
|
||||
tp = LookupCellFile(name1, file1);
|
||||
tp2 = LookupCellFile(name2, file2);
|
||||
tp2->classhash = tp->classhash;
|
||||
if (tp->classhash == tp2->classhash)
|
||||
return 1; /* Already equivalent */
|
||||
|
||||
/* Where cells with duplicate cell names have been checked and */
|
||||
/* found to be equivalent, the original keeps the hash value. */
|
||||
|
||||
if (tp->flags & CELL_DUPLICATE)
|
||||
reverse = 1;
|
||||
|
||||
/* Do a cross-check for each name in the other netlist. If */
|
||||
/* conflicting names exist, then alter the classhash to make it */
|
||||
/* unique. In the case of duplicate cells, don't do this. */
|
||||
|
||||
if (!(tp->flags & CELL_DUPLICATE) && !(tp2->flags & CELL_DUPLICATE)) {
|
||||
tpx = LookupCellFile(name1, file2);
|
||||
if (tpx != NULL) need_new_seed = 1;
|
||||
tpx = LookupCellFile(name2, file1);
|
||||
if (tpx != NULL) need_new_seed = 1;
|
||||
}
|
||||
|
||||
/* Now make the classhash values the same so that these cells */
|
||||
/* are indistinguishable by the netlist comparator. */
|
||||
|
||||
if (need_new_seed == 1) {
|
||||
char *altname;
|
||||
while (need_new_seed == 1) {
|
||||
altname = (char *)MALLOC(strlen(name1) + 2);
|
||||
sprintf(altname, "%s%c", name1, (char)(65 + Random(26)));
|
||||
tp->classhash = (*hashfunc)(altname, 0);
|
||||
|
||||
/* Make sure randomly-altered name is not in any netlist */
|
||||
if ((LookupCellFile(altname, file1) == NULL) &&
|
||||
(LookupCellFile(altname, file2) == NULL))
|
||||
need_new_seed = 0;
|
||||
|
||||
FREE(altname);
|
||||
}
|
||||
}
|
||||
|
||||
if (reverse)
|
||||
tp->classhash = tp2->classhash;
|
||||
else
|
||||
tp2->classhash = tp->classhash;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -4383,8 +4466,14 @@ int reorderpins(struct hashlist *p, int file)
|
||||
firstpin = ob;
|
||||
ob2 = tc2->cell;
|
||||
for (i = 0; i < numports; i++) {
|
||||
nodes[ob2->model.port] = ob->node;
|
||||
names[ob2->model.port] = ob->name;
|
||||
if (ob2->model.port >= numports) {
|
||||
Fprintf(stderr, "Port number %d greater than number "
|
||||
"of ports %d\n", ob2->model.port + 1, numports);
|
||||
}
|
||||
else {
|
||||
nodes[ob2->model.port] = ob->node;
|
||||
names[ob2->model.port] = ob->name;
|
||||
}
|
||||
ob = ob->next;
|
||||
ob2 = ob2->next;
|
||||
}
|
||||
@@ -4697,7 +4786,42 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2)
|
||||
}
|
||||
}
|
||||
|
||||
/* Find the end of the pin list in tc1 */
|
||||
/* Do any unmatched pins have the same name? */
|
||||
/* (This should not happen if unconnected pins are eliminated) */
|
||||
|
||||
ob1 = tc1->cell;
|
||||
for (i = 0; i < numorig; i++) {
|
||||
if (*(cover + i) == (char)0) {
|
||||
j = 0;
|
||||
for (ob2 = tc2->cell; ob2 != NULL; ob2 = ob2->next) {
|
||||
if (!IsPort(ob2)) break;
|
||||
if ((*matchfunc)(ob1->name, ob2->name)) {
|
||||
ob2->model.port = i; /* save order */
|
||||
*(cover + i) = (char)1;
|
||||
|
||||
if (Debug == 0) {
|
||||
for (m = 0; m < 43; m++) *(ostr + m) = ' ';
|
||||
for (m = 44; m < 87; m++) *(ostr + m) = ' ';
|
||||
sprintf(ostr, "%s", ob1->name);
|
||||
sprintf(ostr + 44, "%s", ob2->name);
|
||||
for (m = 0; m < 88; m++)
|
||||
if (*(ostr + m) == '\0') *(ostr + m) = ' ';
|
||||
Fprintf(stdout, ostr);
|
||||
}
|
||||
else {
|
||||
Fprintf(stdout, "Circuit %s port %d \"%s\""
|
||||
" = cell %s port %d \"%s\"\n",
|
||||
tc1->name, i, ob1->name,
|
||||
tc2->name, j, ob2->name);
|
||||
}
|
||||
}
|
||||
j++;
|
||||
}
|
||||
}
|
||||
ob1 = ob1->next;
|
||||
}
|
||||
|
||||
/* Find the end of the pin list in tc1, for adding proxy pins */
|
||||
|
||||
for (ob1 = tc1->cell; ob1 != NULL; ob1 = ob1->next) {
|
||||
if (ob1 && ob1->next && ob1->next->type != PORT)
|
||||
@@ -4768,29 +4892,21 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2)
|
||||
}
|
||||
}
|
||||
|
||||
/* Find the end of the pin list in tc2, for adding proxy pins */
|
||||
|
||||
for (ob2 = tc2->cell; ob2 != NULL; ob2 = ob2->next) {
|
||||
if (ob2 && ob2->next && ob2->next->type != PORT)
|
||||
break;
|
||||
}
|
||||
|
||||
/* If cell 2 has fewer nodes than cell 1, then add dummy (unconnected) */
|
||||
/* pins to cell 2. If these correspond to numbers missing in the match */
|
||||
/* sequence, then fill in the missing numbers. Otherwise, add the */
|
||||
/* extra nodes to the end. */
|
||||
|
||||
j = 0;
|
||||
for (ob2 = tc2->cell; ob2 != NULL; ob2 = ob2->next) {
|
||||
j++;
|
||||
if (ob2->next->type != PORT) break;
|
||||
}
|
||||
|
||||
if (numnodes > numorig) {
|
||||
ctemp = (char *)CALLOC(numnodes, sizeof(char));
|
||||
for (i = 0; i < numorig; i++)
|
||||
ctemp[i] = cover[i];
|
||||
FREE(cover);
|
||||
cover = ctemp;
|
||||
}
|
||||
|
||||
i = 0;
|
||||
while (j < numnodes) {
|
||||
while (*(cover + i) != (char)0) i++;
|
||||
if (i >= numnodes) break;
|
||||
for (i = 0; i < numorig; i++) {
|
||||
if (*(cover + i) == (char)1) continue;
|
||||
|
||||
/* If the equivalent node in tc1 is not disconnected */
|
||||
/* (node != -1) then we should report a match error, */
|
||||
@@ -4801,6 +4917,14 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2)
|
||||
for (k = i; k > 0 && ob1 != NULL; k--)
|
||||
ob1 = ob1->next;
|
||||
|
||||
if (ob1 == NULL || ob1->type != PORT || ob1->node >= 0) {
|
||||
/* Check if ob1->node might really be disconnected */
|
||||
for (obn = ob1->next; obn; obn = obn->next) {
|
||||
if (obn->node == ob1->node) break;
|
||||
}
|
||||
if (obn == NULL) ob1->node = -1; /* Make disconnected */
|
||||
}
|
||||
|
||||
if (ob1 == NULL || ob1->type != PORT || ob1->node >= 0) {
|
||||
|
||||
/* Add a proxy pin to tc2 */
|
||||
@@ -4814,7 +4938,7 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2)
|
||||
sprintf(obn->name, "proxy%s", ob1->name);
|
||||
}
|
||||
obn->type = UNKNOWN;
|
||||
obn->model.port = i;
|
||||
obn->model.port = (i - j);
|
||||
obn->instance.name = NULL;
|
||||
obn->node = -1;
|
||||
obn->next = ob2->next;
|
||||
@@ -4823,9 +4947,18 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2)
|
||||
hasproxy2 = 1;
|
||||
|
||||
HashPtrInstall(obn->name, obn, tc2->objtab, OBJHASHSIZE);
|
||||
}
|
||||
|
||||
j++;
|
||||
i++;
|
||||
else if (ob1 != NULL && ob1->type == PORT) {
|
||||
/* Disconnected node was not meaningful, has no pin match in */
|
||||
/* the compared circuit, and so should be discarded. */
|
||||
needclean1 = 1;
|
||||
|
||||
/* Adjust numbering around removed node */
|
||||
for (ob2s = tc2->cell; ob2s != NULL && ob2s->type == PORT; ob2s = ob2s->next) {
|
||||
if (ob2s->model.port > (i - j)) ob2s->model.port--;
|
||||
}
|
||||
j++;
|
||||
}
|
||||
}
|
||||
FREE(cover);
|
||||
|
||||
+78
-27
@@ -193,28 +193,27 @@ int TokGetValue(char *estr, struct nlist *parent, int glob, double *dval)
|
||||
spiceparams, OBJHASHSIZE);
|
||||
if (kl != NULL) {
|
||||
result = ConvertStringToFloat(kl->pdefault.string, dval);
|
||||
return ((result == 0) ? -1 : 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
/* Check local parameters */
|
||||
kl = (struct property *)HashLookup(estr,
|
||||
parent->proptab, OBJHASHSIZE);
|
||||
if (kl != NULL) {
|
||||
switch(kl->type) {
|
||||
case PROP_STRING:
|
||||
result = ConvertStringToFloat(kl->pdefault.string, dval);
|
||||
break;
|
||||
case PROP_DOUBLE:
|
||||
case PROP_VALUE:
|
||||
*dval = kl->pdefault.dval;
|
||||
result = 1;
|
||||
break;
|
||||
case PROP_INTEGER:
|
||||
*dval = (double)kl->pdefault.ival;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Check local parameters */
|
||||
kl = (struct property *)HashLookup(estr, parent->proptab, OBJHASHSIZE);
|
||||
if (kl != NULL) {
|
||||
switch(kl->type) {
|
||||
case PROP_STRING:
|
||||
result = ConvertStringToFloat(kl->pdefault.string, dval);
|
||||
break;
|
||||
case PROP_DOUBLE:
|
||||
case PROP_VALUE:
|
||||
*dval = kl->pdefault.dval;
|
||||
result = 1;
|
||||
break;
|
||||
case PROP_INTEGER:
|
||||
*dval = (double)kl->pdefault.ival;
|
||||
result = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return ((result == 0) ? -1 : 1);
|
||||
@@ -1924,10 +1923,6 @@ void DeleteProperties(struct keyvalue **topptr)
|
||||
/* to relate them to the cell that is being instanced. Because this */
|
||||
/* is used to link the same properties multiple times for parallel */
|
||||
/* devices, copy the list (a refcount would work better. . .) */
|
||||
/* */
|
||||
/* If "isdefault" is "true", then the record is installed in the */
|
||||
/* object hash under the name "defaults"; otherwise, it gets the */
|
||||
/* name "properties" and is not added to the object hash. */
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
struct objlist *LinkProperties(char *model, struct keyvalue *topptr)
|
||||
@@ -1953,10 +1948,6 @@ struct objlist *LinkProperties(char *model, struct keyvalue *topptr)
|
||||
return NULL;
|
||||
}
|
||||
cell = LookupCellFile(model, filenum);
|
||||
if (cell == NULL) {
|
||||
Printf("No cell '%s' found to link properties to.\n", model);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
tp = GetObject();
|
||||
tp->type = PROPERTY;
|
||||
@@ -1977,6 +1968,32 @@ struct objlist *LinkProperties(char *model, struct keyvalue *topptr)
|
||||
/* No promotion to types other than string at this point */
|
||||
newkv->type = PROP_STRING;
|
||||
newkv->value.string = strsave(kv->value);
|
||||
|
||||
if (cell != NULL) {
|
||||
struct property *kl = NULL;
|
||||
|
||||
/* If there is a matching cell, make sure that the property */
|
||||
/* key exists. If not, create it and flag a warning. */
|
||||
|
||||
kl = (struct property *)HashLookup(newkv->key, cell->proptab, OBJHASHSIZE);
|
||||
if (kl == NULL) {
|
||||
/* Ideally, for devices, one should check against all */
|
||||
/* known standard properties. That's a pain, so */
|
||||
/* instead just assume that the property is correct. */
|
||||
|
||||
if (cell->class == CLASS_SUBCKT)
|
||||
Fprintf(stderr, "Warning: Property %s passed to cell %s which "
|
||||
"does not define a default.\n",
|
||||
newkv->key, cell->name);
|
||||
kl = NewProperty();
|
||||
kl->key = strsave(newkv->key);
|
||||
kl->idx = 0;
|
||||
kl->type = PROP_STRING;
|
||||
kl->slop.ival = 0;
|
||||
kl->pdefault.string = NULL;
|
||||
HashPtrInstall(kl->key, kl, cell->proptab, OBJHASHSIZE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Final entry marks the end of the list */
|
||||
@@ -1989,6 +2006,40 @@ struct objlist *LinkProperties(char *model, struct keyvalue *topptr)
|
||||
return tp;
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/* SetPropertyDefault() --- */
|
||||
/* */
|
||||
/* If a cell does not set property defaults, but an instance of that */
|
||||
/* cell passes a property to it, then there will be a default value */
|
||||
/* with a string type and a NULL value. Set the default to be equal */
|
||||
/* to the instance type and value. */
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
int SetPropertyDefault(struct property *prop, struct valuelist *vl)
|
||||
{
|
||||
if (prop == NULL || vl == NULL) return -1;
|
||||
if (prop->type != PROP_STRING || prop->pdefault.string != NULL) return 1;
|
||||
|
||||
prop->type = vl->type;
|
||||
|
||||
switch (vl->type) {
|
||||
case PROP_STRING:
|
||||
prop->pdefault.string = strsave(vl->value.string);
|
||||
break;
|
||||
case PROP_INTEGER:
|
||||
prop->pdefault.ival = vl->value.ival;
|
||||
break;
|
||||
case PROP_DOUBLE:
|
||||
case PROP_VALUE:
|
||||
prop->pdefault.dval = vl->value.dval;
|
||||
break;
|
||||
case PROP_EXPRESSION:
|
||||
prop->pdefault.stack = CopyTokStack(vl->value.stack);
|
||||
break;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
/* PromoteProperty() --- */
|
||||
/* */
|
||||
|
||||
@@ -40,6 +40,7 @@ extern int PropertyTolerance(char *name, int fnum, char *key, int ival,
|
||||
extern void ResolveProperties(char *name1, int file1, char *name2, int file2);
|
||||
extern void CopyProperties(struct objlist *obj_to, struct objlist *obj_from);
|
||||
extern int PromoteProperty(struct property *, struct valuelist *);
|
||||
extern int SetPropertyDefault(struct property *, struct valuelist *);
|
||||
extern struct objlist *LinkProperties(char *model, struct keyvalue *topptr);
|
||||
extern int ReduceExpressions(struct objlist *instprop, struct nlist *parent,
|
||||
int glob);
|
||||
|
||||
@@ -188,6 +188,7 @@ struct nlist {
|
||||
#define CELL_TOP 0x04 /* cell is a top-level cell */
|
||||
#define CELL_PLACEHOLDER 0x08 /* cell is a placeholder cell */
|
||||
#define CELL_PROPSMATCHED 0x10 /* properties matched to matching cell */
|
||||
#define CELL_DUPLICATE 0x20 /* cell has a duplicate */
|
||||
|
||||
/* Flags for combination allowances */
|
||||
|
||||
|
||||
+2
-1
@@ -797,8 +797,9 @@ void DescribeInstance(char *name, int file)
|
||||
{
|
||||
if (ob->node > nodemax) nodemax = ob->node;
|
||||
else if ((ob->node == -1) && (ob->model.port != PROXY)) {
|
||||
if (disconnectednodes == 0) Fprintf(stderr, "\n");
|
||||
disconnectednodes++;
|
||||
Fprintf(stderr, " disconnected node: %s\n", ob->name);
|
||||
Fprintf(stderr, "Cell %s disconnected node: %s\n", tp->name, ob->name);
|
||||
}
|
||||
}
|
||||
instlist = (unsigned char *) CALLOC((nodemax + 1), sizeof(unsigned char));
|
||||
|
||||
+7
-2
@@ -520,6 +520,10 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
|
||||
int n;
|
||||
char *ds;
|
||||
|
||||
// NOTE: Use this to ignore the new definition---should be
|
||||
// an option to netgen.
|
||||
/* goto skip_ends; */
|
||||
|
||||
ds = strrchr(model, '[');
|
||||
if ((ds != NULL) && (*(ds + 1) == '['))
|
||||
sscanf(ds + 2, "%d", &n);
|
||||
@@ -530,6 +534,7 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
|
||||
}
|
||||
|
||||
Printf("Duplicate cell %s in file\n", nexttok);
|
||||
tp->flags |= CELL_DUPLICATE;
|
||||
while (tp != NULL) {
|
||||
n++;
|
||||
/* Append "[[n]]" to the preexisting model name to force uniqueness */
|
||||
@@ -898,9 +903,9 @@ skip_ends:
|
||||
if (!strcasecmp(nexttok, "M"))
|
||||
sscanf(eqptr + 1, "%d", &ndev);
|
||||
else if (!strcasecmp(nexttok, "L"))
|
||||
AddProperty(&kvlist, "length", eqptr + 1);
|
||||
AddProperty(&kvlist, "L", eqptr + 1);
|
||||
else if (!strcasecmp(nexttok, "W"))
|
||||
AddProperty(&kvlist, "width", eqptr + 1);
|
||||
AddProperty(&kvlist, "W", eqptr + 1);
|
||||
else
|
||||
AddProperty(&kvlist, nexttok, eqptr + 1);
|
||||
}
|
||||
|
||||
@@ -24,8 +24,8 @@ INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
# Override standard "make" target when compiling under TCL
|
||||
ALL_TARGET = standard
|
||||
INSTALL_TARGET = install-netgen
|
||||
ALL_TARGET = tcl
|
||||
INSTALL_TARGET = install-tcl
|
||||
|
||||
# Change CADDIR to install in a different place
|
||||
BINDIR = ${bindir}
|
||||
@@ -34,16 +34,16 @@ LIBDIR = ${libdir}
|
||||
DOCDIR = ${libdir}/netgen/doc
|
||||
TCLDIR = ${libdir}/netgen/tcl
|
||||
|
||||
MAIN_EXTRA_LIBS =
|
||||
MAIN_EXTRA_LIBS = ${NETGENDIR}/tcltk/libtcltk.o
|
||||
LD_EXTRA_LIBS =
|
||||
LD_SHARED =
|
||||
TOP_EXTRA_LIBS =
|
||||
SUB_EXTRA_LIBS =
|
||||
|
||||
MODULES +=
|
||||
UNUSED_MODULES += tcltk
|
||||
PROGRAMS += netgen
|
||||
INSTALL_CAD_DIRS +=
|
||||
MODULES += tcltk
|
||||
UNUSED_MODULES +=
|
||||
PROGRAMS += tcltk
|
||||
INSTALL_CAD_DIRS += tcltk
|
||||
|
||||
RM = rm -f
|
||||
CP = cp
|
||||
@@ -53,29 +53,29 @@ LINK = /bin/ld -r
|
||||
LD = /bin/ld
|
||||
M4 = /bin/m4
|
||||
RANLIB = ranlib
|
||||
SHDLIB_EXT =
|
||||
LDDL_FLAGS =
|
||||
SHDLIB_EXT = .so
|
||||
LDDL_FLAGS = -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map
|
||||
LD_RUN_PATH =
|
||||
LIB_SPECS =
|
||||
WISH_EXE =
|
||||
TCL_LIB_DIR =
|
||||
LIB_SPECS = -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
|
||||
WISH_EXE = /usr/bin/wish
|
||||
TCL_LIB_DIR = /usr/lib
|
||||
|
||||
CC = gcc
|
||||
CPP = gcc -E -x c
|
||||
CXX = @CXX@
|
||||
|
||||
CPPFLAGS = -I. -I${NETGENDIR}
|
||||
DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"47\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\"\" -DNDEBUG
|
||||
CFLAGS = -g -m64 -fPIC
|
||||
DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"50\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
|
||||
CFLAGS = -g -m64 -fPIC -fPIC
|
||||
|
||||
DEPEND_FILE = Depend
|
||||
DEPEND_FLAG = -MM
|
||||
EXEEXT =
|
||||
|
||||
GR_CFLAGS =
|
||||
GR_DFLAGS = -DNDEBUG
|
||||
GR_LIBS =
|
||||
GR_SRCS =
|
||||
GR_DFLAGS = -DX11 -DXLIB -DNDEBUG
|
||||
GR_LIBS = -lX11
|
||||
GR_SRCS = ${TK_SRCS}
|
||||
|
||||
OBJS = ${SRCS:.c=.o}
|
||||
LIB_OBJS = ${LIB_SRCS:.c=.o}
|
||||
|
||||
-668
@@ -1,668 +0,0 @@
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
|
||||
./scripts/mkdirs /usr/local/bin /usr/local/share/man \
|
||||
/usr/local/lib/netgen/tcl
|
||||
for dir in lib doc tcltk netgen tcltk; do \
|
||||
(cd $dir && make install-tcl); done
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Nothing to be done for 'install-tcl'.
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
|
||||
../scripts/mkdirs /usr/local/lib/netgen/doc
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
|
||||
make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
|
||||
cp netgen.sh /usr/local/bin/netgen
|
||||
(cd /usr/local/bin; chmod 0755 netgen)
|
||||
rm -f /usr/local/lib/netgen/tcl/netgenexec
|
||||
cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
|
||||
make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
|
||||
make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
|
||||
Binary file not shown.
+37
-28
@@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake.
|
||||
It was created by netgen configure 1.3, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ ./configure --without-tcl
|
||||
$ ./configure
|
||||
|
||||
## --------- ##
|
||||
## Platform. ##
|
||||
@@ -125,7 +125,7 @@ configure: failed program was:
|
||||
| #define PACKAGE_BUGREPORT "[email protected]"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define NETGEN_VERSION "1.5"
|
||||
| #define NETGEN_REVISION "47"
|
||||
| #define NETGEN_REVISION "50"
|
||||
| /* end confdefs.h. */
|
||||
| #include <ac_nonexistent.h>
|
||||
configure:3382: result: gcc -E
|
||||
@@ -146,7 +146,7 @@ configure: failed program was:
|
||||
| #define PACKAGE_BUGREPORT "[email protected]"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define NETGEN_VERSION "1.5"
|
||||
| #define NETGEN_REVISION "47"
|
||||
| #define NETGEN_REVISION "50"
|
||||
| /* end confdefs.h. */
|
||||
| #include <ac_nonexistent.h>
|
||||
configure:3445: checking for library containing strerror
|
||||
@@ -261,7 +261,7 @@ configure: failed program was:
|
||||
| #define PACKAGE_BUGREPORT "[email protected]"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define NETGEN_VERSION "1.5"
|
||||
| #define NETGEN_REVISION "47"
|
||||
| #define NETGEN_REVISION "50"
|
||||
| #define STDC_HEADERS 1
|
||||
| #define HAVE_SYS_TYPES_H 1
|
||||
| #define HAVE_SYS_STAT_H 1
|
||||
@@ -302,7 +302,7 @@ configure: failed program was:
|
||||
| #define PACKAGE_BUGREPORT "[email protected]"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define NETGEN_VERSION "1.5"
|
||||
| #define NETGEN_REVISION "47"
|
||||
| #define NETGEN_REVISION "50"
|
||||
| #define STDC_HEADERS 1
|
||||
| #define HAVE_SYS_TYPES_H 1
|
||||
| #define HAVE_SYS_STAT_H 1
|
||||
@@ -382,7 +382,7 @@ configure: failed program was:
|
||||
| #define PACKAGE_BUGREPORT "[email protected]"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define NETGEN_VERSION "1.5"
|
||||
| #define NETGEN_REVISION "47"
|
||||
| #define NETGEN_REVISION "50"
|
||||
| #define STDC_HEADERS 1
|
||||
| #define HAVE_SYS_TYPES_H 1
|
||||
| #define HAVE_SYS_STAT_H 1
|
||||
@@ -454,7 +454,7 @@ configure: failed program was:
|
||||
| #define PACKAGE_BUGREPORT "[email protected]"
|
||||
| #define PACKAGE_URL ""
|
||||
| #define NETGEN_VERSION "1.5"
|
||||
| #define NETGEN_REVISION "47"
|
||||
| #define NETGEN_REVISION "50"
|
||||
| #define STDC_HEADERS 1
|
||||
| #define HAVE_SYS_TYPES_H 1
|
||||
| #define HAVE_SYS_STAT_H 1
|
||||
@@ -487,6 +487,14 @@ configure:4674: checking for __va_copy
|
||||
configure:4692: gcc -o conftest -g conftest.c >&5
|
||||
configure:4692: $? = 0
|
||||
configure:4701: result: yes
|
||||
configure:4831: checking for tclConfig.sh
|
||||
configure:4903: result: /usr/lib64/tclConfig.sh
|
||||
configure:4919: checking for tkConfig.sh
|
||||
configure:4992: result: /usr/lib64/tkConfig.sh
|
||||
configure:5106: checking for wish executable
|
||||
configure:5133: result: /usr/bin/wish
|
||||
configure:5139: checking for tclsh executable
|
||||
configure:5165: result: /usr/bin/tclsh
|
||||
configure:5288: checking for X
|
||||
configure:5427: gcc -o conftest -g conftest.c -lX11 >&5
|
||||
configure:5427: $? = 0
|
||||
@@ -608,32 +616,32 @@ ac_cv_target=x86_64-unknown-linux-gnu
|
||||
## Output variables. ##
|
||||
## ----------------- ##
|
||||
|
||||
ALL_TARGET='standard'
|
||||
ALL_TARGET='tcl'
|
||||
CC='gcc'
|
||||
CFLAGS='-g -m64 -fPIC'
|
||||
CPP='gcc -E -x c'
|
||||
CPPFLAGS=''
|
||||
DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"47\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -Dlinux=1 -DSYSV=1 -DISC=1'
|
||||
DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"50\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
|
||||
DEPEND_FLAG='-MM'
|
||||
ECHO_C=''
|
||||
ECHO_N='printf'
|
||||
ECHO_T=''
|
||||
EGREP='/bin/grep -E'
|
||||
EXEEXT=''
|
||||
EXTRA_LIB_SPECS=''
|
||||
EXTRA_LIB_SPECS='-ldl'
|
||||
GREP='/bin/grep'
|
||||
INC_SPECS=''
|
||||
INSTALL_DATA='${INSTALL} -m 644'
|
||||
INSTALL_PROGRAM='${INSTALL}'
|
||||
INSTALL_SCRIPT='${INSTALL}'
|
||||
INSTALL_TARGET='install-netgen'
|
||||
INSTALL_TARGET='install-tcl'
|
||||
LD='/bin/ld'
|
||||
LDDL_FLAGS=''
|
||||
LDDL_FLAGS=' -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map'
|
||||
LDFLAGS=''
|
||||
LD_RUN_PATH=''
|
||||
LIBOBJS=''
|
||||
LIBS=''
|
||||
LIB_SPECS=''
|
||||
LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
|
||||
LTLIBOBJS=''
|
||||
M4='/bin/m4'
|
||||
OBJEXT='o'
|
||||
@@ -647,15 +655,15 @@ PACKAGE_VERSION='1.3'
|
||||
PATH_SEPARATOR=':'
|
||||
RANLIB='ranlib'
|
||||
SCRIPTS=''
|
||||
SHDLIB_EXT=''
|
||||
SHDLIB_EXT='.so'
|
||||
SHELL='/bin/sh'
|
||||
SHLIB_CFLAGS=''
|
||||
SHLIB_CFLAGS='-fPIC'
|
||||
SHLIB_LD=''
|
||||
SHLIB_LIB_SPECS=''
|
||||
TCLSH_EXE=''
|
||||
TCL_LIB_DIR=''
|
||||
TCLSH_EXE='/usr/bin/tclsh'
|
||||
TCL_LIB_DIR='/usr/lib'
|
||||
VERSION=''
|
||||
WISH_EXE=''
|
||||
WISH_EXE='/usr/bin/wish'
|
||||
XMKMF=''
|
||||
X_CFLAGS=''
|
||||
X_EXTRA_LIBS=''
|
||||
@@ -668,18 +676,18 @@ build_alias=''
|
||||
build_cpu='x86_64'
|
||||
build_os='linux-gnu'
|
||||
build_vendor='unknown'
|
||||
cadinstall=''
|
||||
cadinstall=' tcltk'
|
||||
datadir='${datarootdir}'
|
||||
datarootdir='${prefix}/share'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
dvidir='${docdir}'
|
||||
exec_prefix='${prefix}'
|
||||
extra_defs=' -DCAD_DIR=\"${LIBDIR}\"'
|
||||
extra_libs=''
|
||||
extra_defs=' -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"'
|
||||
extra_libs=' ${NETGENDIR}/tcltk/libtcltk.o'
|
||||
gr_cflags=''
|
||||
gr_dflags=''
|
||||
gr_libs=''
|
||||
gr_srcs=''
|
||||
gr_dflags=' -DX11 -DXLIB'
|
||||
gr_libs=' -lX11'
|
||||
gr_srcs=' ${TK_SRCS}'
|
||||
host='x86_64-unknown-linux-gnu'
|
||||
host_alias=''
|
||||
host_cpu='x86_64'
|
||||
@@ -695,12 +703,12 @@ libexecdir='${exec_prefix}/libexec'
|
||||
localedir='${datarootdir}/locale'
|
||||
localstatedir='${prefix}/var'
|
||||
mandir='${datarootdir}/man'
|
||||
modules=''
|
||||
modules=' tcltk'
|
||||
oldincludedir='/usr/include'
|
||||
pdfdir='${docdir}'
|
||||
prefix='/usr/local'
|
||||
program_transform_name='s,x,x,'
|
||||
programs=' netgen'
|
||||
programs=' tcltk'
|
||||
psdir='${docdir}'
|
||||
sbindir='${exec_prefix}/sbin'
|
||||
sharedstatedir='${prefix}/com'
|
||||
@@ -712,7 +720,7 @@ target_cpu='x86_64'
|
||||
target_os='linux-gnu'
|
||||
target_vendor='unknown'
|
||||
top_extra_libs=''
|
||||
unused=' tcltk'
|
||||
unused=''
|
||||
|
||||
## ----------- ##
|
||||
## confdefs.h. ##
|
||||
@@ -726,7 +734,7 @@ unused=' tcltk'
|
||||
#define PACKAGE_BUGREPORT "[email protected]"
|
||||
#define PACKAGE_URL ""
|
||||
#define NETGEN_VERSION "1.5"
|
||||
#define NETGEN_REVISION "47"
|
||||
#define NETGEN_REVISION "50"
|
||||
#define STDC_HEADERS 1
|
||||
#define HAVE_SYS_TYPES_H 1
|
||||
#define HAVE_SYS_STAT_H 1
|
||||
@@ -749,6 +757,7 @@ unused=' tcltk'
|
||||
#define HAVE_VA_COPY 1
|
||||
#define HAVE___VA_COPY 1
|
||||
#define DBUG_OFF 1
|
||||
#define TCL_NETGEN 1
|
||||
#define linux 1
|
||||
#define SYSV 1
|
||||
#define ISC 1
|
||||
|
||||
+23
-23
@@ -417,7 +417,7 @@ $config_files
|
||||
|
||||
Report bugs to <[email protected]>."
|
||||
|
||||
ac_cs_config="'--without-tcl' 'CFLAGS=-g'"
|
||||
ac_cs_config="'CFLAGS=-g'"
|
||||
ac_cs_version="\
|
||||
netgen config.status 1.3
|
||||
configured by ./configure, generated by GNU Autoconf 2.69,
|
||||
@@ -496,7 +496,7 @@ if $ac_cs_silent; then
|
||||
fi
|
||||
|
||||
if $ac_cs_recheck; then
|
||||
set X /bin/sh './configure' '--without-tcl' 'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
|
||||
set X /bin/sh './configure' 'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
|
||||
shift
|
||||
$as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
|
||||
CONFIG_SHELL='/bin/sh'
|
||||
@@ -584,39 +584,39 @@ echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
|
||||
cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
|
||||
S["LTLIBOBJS"]=""
|
||||
S["LIBOBJS"]=""
|
||||
S["INSTALL_TARGET"]="install-netgen"
|
||||
S["ALL_TARGET"]="standard"
|
||||
S["INSTALL_TARGET"]="install-tcl"
|
||||
S["ALL_TARGET"]="tcl"
|
||||
S["LD_RUN_PATH"]=""
|
||||
S["SHLIB_CFLAGS"]=""
|
||||
S["SHLIB_CFLAGS"]="-fPIC"
|
||||
S["DEPEND_FLAG"]="-MM"
|
||||
S["gr_srcs"]=""
|
||||
S["gr_libs"]=""
|
||||
S["gr_dflags"]=""
|
||||
S["gr_srcs"]=" ${TK_SRCS}"
|
||||
S["gr_libs"]=" -lX11"
|
||||
S["gr_dflags"]=" -DX11 -DXLIB"
|
||||
S["gr_cflags"]=""
|
||||
S["cadinstall"]=""
|
||||
S["programs"]=" netgen"
|
||||
S["unused"]=" tcltk"
|
||||
S["modules"]=""
|
||||
S["cadinstall"]=" tcltk"
|
||||
S["programs"]=" tcltk"
|
||||
S["unused"]=""
|
||||
S["modules"]=" tcltk"
|
||||
S["sub_extra_libs"]=""
|
||||
S["top_extra_libs"]=""
|
||||
S["ld_extra_objs"]=""
|
||||
S["ld_extra_libs"]=""
|
||||
S["extra_defs"]=" -DCAD_DIR=\\\"${LIBDIR}\\\""
|
||||
S["extra_libs"]=""
|
||||
S["extra_defs"]=" -DCAD_DIR=\\\"${LIBDIR}\\\" -DTCL_DIR=\\\"${TCLDIR}\\\""
|
||||
S["extra_libs"]=" ${NETGENDIR}/tcltk/libtcltk.o"
|
||||
S["SCRIPTS"]=""
|
||||
S["PACKAGE"]="netgen"
|
||||
S["VERSION"]=""
|
||||
S["TCL_LIB_DIR"]=""
|
||||
S["TCLSH_EXE"]=""
|
||||
S["WISH_EXE"]=""
|
||||
S["LIB_SPECS"]=""
|
||||
S["TCL_LIB_DIR"]="/usr/lib"
|
||||
S["TCLSH_EXE"]="/usr/bin/tclsh"
|
||||
S["WISH_EXE"]="/usr/bin/wish"
|
||||
S["LIB_SPECS"]=" -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6"
|
||||
S["INC_SPECS"]=""
|
||||
S["EXTRA_LIB_SPECS"]=""
|
||||
S["EXTRA_LIB_SPECS"]="-ldl"
|
||||
S["SHLIB_LIB_SPECS"]=""
|
||||
S["LDDL_FLAGS"]=""
|
||||
S["LDDL_FLAGS"]=" -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map"
|
||||
S["LD"]="/bin/ld"
|
||||
S["SHLIB_LD"]=""
|
||||
S["SHDLIB_EXT"]=""
|
||||
S["SHDLIB_EXT"]=".so"
|
||||
S["X_EXTRA_LIBS"]=""
|
||||
S["X_LIBS"]=""
|
||||
S["X_PRE_LIBS"]=" -lSM -lICE"
|
||||
@@ -657,10 +657,10 @@ S["ECHO_T"]=""
|
||||
S["ECHO_N"]="-n"
|
||||
S["ECHO_C"]=""
|
||||
S["DEFS"]="-DPACKAGE_NAME=\\\"netgen\\\" -DPACKAGE_TARNAME=\\\"netgen\\\" -DPACKAGE_VERSION=\\\"1.3\\\" -DPACKAGE_STRING=\\\"netgen\\ 1.3\\\" -DPACKAGE_BUGREPORT=\\\"eda-dev@open"\
|
||||
"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"47\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
|
||||
"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"50\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
|
||||
"DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -D"\
|
||||
"SIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHA"\
|
||||
"VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -Dlinux=1 -DSYSV=1 -DISC=1"
|
||||
"VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1"
|
||||
S["mandir"]="${datarootdir}/man"
|
||||
S["localedir"]="${datarootdir}/locale"
|
||||
S["libdir"]="${exec_prefix}/lib"
|
||||
|
||||
+17
-17
@@ -24,8 +24,8 @@ INSTALL_DATA = ${INSTALL} -m 644
|
||||
INSTALL_SCRIPT = ${INSTALL}
|
||||
|
||||
# Override standard "make" target when compiling under TCL
|
||||
ALL_TARGET = standard
|
||||
INSTALL_TARGET = install-netgen
|
||||
ALL_TARGET = tcl
|
||||
INSTALL_TARGET = install-tcl
|
||||
|
||||
# Change CADDIR to install in a different place
|
||||
BINDIR = ${bindir}
|
||||
@@ -34,16 +34,16 @@ LIBDIR = ${libdir}
|
||||
DOCDIR = ${libdir}/netgen/doc
|
||||
TCLDIR = ${libdir}/netgen/tcl
|
||||
|
||||
MAIN_EXTRA_LIBS =
|
||||
MAIN_EXTRA_LIBS = ${NETGENDIR}/tcltk/libtcltk.o
|
||||
LD_EXTRA_LIBS =
|
||||
LD_SHARED =
|
||||
TOP_EXTRA_LIBS =
|
||||
SUB_EXTRA_LIBS =
|
||||
|
||||
MODULES +=
|
||||
UNUSED_MODULES += tcltk
|
||||
PROGRAMS += netgen
|
||||
INSTALL_CAD_DIRS +=
|
||||
MODULES += tcltk
|
||||
UNUSED_MODULES +=
|
||||
PROGRAMS += tcltk
|
||||
INSTALL_CAD_DIRS += tcltk
|
||||
|
||||
RM = rm -f
|
||||
CP = cp
|
||||
@@ -53,29 +53,29 @@ LINK = /bin/ld -r
|
||||
LD = /bin/ld
|
||||
M4 = /bin/m4
|
||||
RANLIB = ranlib
|
||||
SHDLIB_EXT =
|
||||
LDDL_FLAGS =
|
||||
SHDLIB_EXT = .so
|
||||
LDDL_FLAGS = -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map
|
||||
LD_RUN_PATH =
|
||||
LIB_SPECS =
|
||||
WISH_EXE =
|
||||
TCL_LIB_DIR =
|
||||
LIB_SPECS = -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
|
||||
WISH_EXE = /usr/bin/wish
|
||||
TCL_LIB_DIR = /usr/lib
|
||||
|
||||
CC = gcc
|
||||
CPP = gcc -E -x c
|
||||
CXX = @CXX@
|
||||
|
||||
CPPFLAGS = -I. -I${NETGENDIR}
|
||||
DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"47\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\"\" -DNDEBUG
|
||||
CFLAGS = -g -m64 -fPIC
|
||||
DFLAGS = -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"50\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
|
||||
CFLAGS = -g -m64 -fPIC -fPIC
|
||||
|
||||
DEPEND_FILE = Depend
|
||||
DEPEND_FLAG = -MM
|
||||
EXEEXT =
|
||||
|
||||
GR_CFLAGS =
|
||||
GR_DFLAGS = -DNDEBUG
|
||||
GR_LIBS =
|
||||
GR_SRCS =
|
||||
GR_DFLAGS = -DX11 -DXLIB -DNDEBUG
|
||||
GR_LIBS = -lX11
|
||||
GR_SRCS = ${TK_SRCS}
|
||||
|
||||
OBJS = ${SRCS:.c=.o}
|
||||
LIB_OBJS = ${LIB_SRCS:.c=.o}
|
||||
|
||||
+9
-4
@@ -145,8 +145,8 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
|
||||
if {[verify equivalent]} {
|
||||
# Resolve automorphisms by pin and property
|
||||
netgen::run resolve
|
||||
set result [verify unique]
|
||||
if {$result == 0} {
|
||||
set uresult [verify unique]
|
||||
if {$uresult == 0} {
|
||||
netgen::log put " Networks match locally but not globally.\n"
|
||||
netgen::log put " Probably connections are swapped.\n"
|
||||
netgen::log put " Check the end of logfile ${logfile} for implicated nodes.\n"
|
||||
@@ -161,10 +161,15 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
|
||||
} else {
|
||||
# Match pins
|
||||
netgen::log echo off
|
||||
equate pins "$fnum1 [lindex $endval 0]" "$fnum2 [lindex $endval 1]"
|
||||
set result [equate pins "$fnum1 [lindex $endval 0]" \
|
||||
"$fnum2 [lindex $endval 1]"]
|
||||
if {$result != 0} {
|
||||
equate classes "$fnum1 [lindex $endval 0]" \
|
||||
"$fnum2 [lindex $endval 1]"
|
||||
}
|
||||
netgen::log echo on
|
||||
}
|
||||
if {$result == 2} {lappend properr [lindex $endval 0]}
|
||||
if {$uresult == 2} {lappend properr [lindex $endval 0]}
|
||||
} else {
|
||||
# Flatten the non-matching subcircuit (but not the top-level cells)
|
||||
if {[netgen::print queue] != {}} {
|
||||
|
||||
+54
-18
@@ -122,7 +122,7 @@ Command netgen_cmds[] = {
|
||||
"<format> <file>\n "
|
||||
"write a netlist file"},
|
||||
{"flatten", _netgen_flatten,
|
||||
"[class] <cell>\n "
|
||||
"[class] [<parent>] <cell>\n "
|
||||
"flatten a hierarchical cell"},
|
||||
{"nodes", _netgen_nodes,
|
||||
"[<element>] <cell> <file>\n "
|
||||
@@ -1005,9 +1005,9 @@ _netgen_flatten(ClientData clientData,
|
||||
{
|
||||
char *repstr, *file;
|
||||
int result, llen, filenum;
|
||||
struct nlist *tp;
|
||||
struct nlist *tp, *tp2;
|
||||
|
||||
if ((objc < 2) || (objc > 3)) {
|
||||
if ((objc < 2) || (objc > 4)) {
|
||||
Tcl_WrongNumArgs(interp, 1, objv, "?class? valid_cellname");
|
||||
return TCL_ERROR;
|
||||
}
|
||||
@@ -1016,12 +1016,32 @@ _netgen_flatten(ClientData clientData,
|
||||
if (result != TCL_OK) return result;
|
||||
repstr = tp->name;
|
||||
|
||||
if (objc == 3) {
|
||||
if (objc >= 3) {
|
||||
char *argv = Tcl_GetString(objv[1]);
|
||||
if (!strcmp(argv, "class")) {
|
||||
tp = GetTopCell(filenum);
|
||||
Printf("Flattening instances of %s in file %s\n", repstr, tp->name);
|
||||
FlattenInstancesOf(repstr, filenum);
|
||||
|
||||
if (objc == 4) {
|
||||
int numflat;
|
||||
tp2 = LookupCellFile(Tcl_GetString(objv[2]), filenum);
|
||||
if (tp2 == NULL) {
|
||||
Tcl_SetResult(interp, "No such cell.", NULL);
|
||||
return TCL_ERROR;
|
||||
}
|
||||
else {
|
||||
Printf("Flattening instances of %s in cell %s within file %s\n",
|
||||
repstr, tp2->name, tp->name);
|
||||
numflat = flattenInstancesOf(tp2->name, filenum, repstr);
|
||||
if (numflat == 0) {
|
||||
Tcl_SetResult(interp, "No instances found to flatten.", NULL);
|
||||
return TCL_ERROR;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
Printf("Flattening instances of %s in file %s\n", repstr, tp->name);
|
||||
FlattenInstancesOf(repstr, filenum);
|
||||
}
|
||||
}
|
||||
else {
|
||||
Tcl_WrongNumArgs(interp, 1, objv, "class valid_cellname");
|
||||
@@ -2009,8 +2029,9 @@ _netcmp_compare(ClientData clientData,
|
||||
return TCL_ERROR;
|
||||
}
|
||||
|
||||
CleanupPins(name1, fnum1); // Remove unconnected pins
|
||||
CleanupPins(name2, fnum2); // Remove unconnected pins
|
||||
// WIP!
|
||||
// CleanupPins(name1, fnum1); // Remove unconnected pins
|
||||
// CleanupPins(name2, fnum2); // Remove unconnected pins
|
||||
|
||||
UniquePins(name1, fnum1); // Check for and remove duplicate pins
|
||||
UniquePins(name2, fnum2); // Check for and remove duplicate pins
|
||||
@@ -2025,8 +2046,9 @@ _netcmp_compare(ClientData clientData,
|
||||
// but define global nodes that are brought out as ports by
|
||||
// ConvertGlobals().
|
||||
|
||||
CleanupPins(name1, fnum1);
|
||||
CleanupPins(name2, fnum2);
|
||||
// WIP!
|
||||
// CleanupPins(name1, fnum1);
|
||||
// CleanupPins(name2, fnum2);
|
||||
|
||||
CreateTwoLists(name1, fnum1, name2, fnum2);
|
||||
while (PrematchLists(name1, fnum1, name2, fnum2) > 0) {
|
||||
@@ -2342,8 +2364,11 @@ _netcmp_verify(ClientData clientData,
|
||||
if (ElementClasses == NULL || NodeClasses == NULL) {
|
||||
if (index == EQUIV_IDX || index == UNIQUE_IDX)
|
||||
Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
|
||||
else if (CurrentCell != NULL)
|
||||
Fprintf(stdout, "Verify: cell %s has no elements and/or nodes."
|
||||
" Not checked.\n", CurrentCell->name);
|
||||
else
|
||||
Fprintf(stdout, "Cell has no elements and/or nodes. Not checked.\n");
|
||||
Fprintf(stdout, "Verify: no current cell to verify.\n");
|
||||
return TCL_OK;
|
||||
}
|
||||
else {
|
||||
@@ -2691,7 +2716,10 @@ _netcmp_equate(ClientData clientData,
|
||||
|
||||
case ELEM_IDX:
|
||||
if (ElementClasses == NULL) {
|
||||
Fprintf(stderr, "Cell has no elements.\n");
|
||||
if (CurrentCell == NULL)
|
||||
Fprintf(stderr, "Equate elements: no current cell.\n");
|
||||
Fprintf(stderr, "Equate elements: cell %s and/or %s has no elements.\n",
|
||||
name1, name2);
|
||||
Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
|
||||
return TCL_OK;
|
||||
}
|
||||
@@ -2707,7 +2735,10 @@ _netcmp_equate(ClientData clientData,
|
||||
|
||||
case PINS_IDX:
|
||||
if (ElementClasses == NULL) {
|
||||
Fprintf(stderr, "Cell has no elements.\n");
|
||||
if (CurrentCell == NULL)
|
||||
Fprintf(stderr, "Equate elements: no current cell.\n");
|
||||
Fprintf(stderr, "Equate pins: cell %s and/or %s has no elements.\n",
|
||||
name1, name2);
|
||||
Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
|
||||
return TCL_OK;
|
||||
}
|
||||
@@ -3175,11 +3206,16 @@ _netcmp_property(ClientData clientData,
|
||||
if (result != TCL_OK) return result;
|
||||
|
||||
result = Tcl_GetIntFromObj(interp, tobj2, &ival);
|
||||
if (result != TCL_OK) Tcl_ResetResult(interp);
|
||||
if ((result = Tcl_GetDoubleFromObj(interp, tobj2, &dval))
|
||||
!= TCL_OK)
|
||||
return result;
|
||||
|
||||
if (result != TCL_OK) {
|
||||
Tcl_ResetResult(interp);
|
||||
if (!strncasecmp(Tcl_GetString(tobj2), "inf", 3)) {
|
||||
ival = 1<<30;
|
||||
dval = 1.0E+300;
|
||||
}
|
||||
else if ((result = Tcl_GetDoubleFromObj(interp, tobj2, &dval))
|
||||
!= TCL_OK)
|
||||
return result;
|
||||
}
|
||||
PropertyTolerance(tp->name, fnum, Tcl_GetString(tobj1),
|
||||
ival, dval);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user