Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package asco for openSUSE:Factory checked in at 2022-05-01 18:54:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/asco (Old) and /work/SRC/openSUSE:Factory/.asco.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "asco" Sun May 1 18:54:08 2022 rev:4 rq:974189 version:0.4.11 Changes: -------- --- /work/SRC/openSUSE:Factory/asco/asco.changes 2020-09-01 20:08:53.332635082 +0200 +++ /work/SRC/openSUSE:Factory/.asco.new.1538/asco.changes 2022-05-01 18:54:14.695199500 +0200 @@ -1,0 +2,10 @@ +Sat Apr 30 12:30:33 UTC 2022 - Ferdinand Thiessen <[email protected]> + +- Update to version 0.4.11 + * Minor improvements to work/warn about changes in simulators + output format. + * Improvements in Spectre support. + * Bug fixes. +- Drop upstream fixed asco-0.4.10-fix-implicit-declaration.patch + +------------------------------------------------------------------- @@ -9 +19 @@ -- Update to version 0.9.10: +- Update to version 0.4.10: Old: ---- ASCO-0.4.10.tar.gz asco-0.4.10-fix-implicit-declaration.patch New: ---- ASCO-0.4.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asco.spec ++++++ --- /var/tmp/diff_new_pack.b2w3cP/_old 2022-05-01 18:54:15.119199893 +0200 +++ /var/tmp/diff_new_pack.b2w3cP/_new 2022-05-01 18:54:15.123199897 +0200 @@ -1,7 +1,7 @@ # # spec file for package asco # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,15 @@ Name: asco -Version: 0.4.10 +Version: 0.4.11 Release: 0 Summary: A SPICE Circuit Optimizer License: GPL-2.0-only Group: Productivity/Scientific/Electronics URL: http://asco.sourceforge.net/ Source0: http://downloads.sourceforge.net/asco/ASCO-%{version}.tar.gz -# PATCH-FIX-UPSTREAM asco-0.4.10-fix-implicit-declaration.patch -Patch0: asco-0.4.10-fix-implicit-declaration.patch # PATCH-FIX-OPENSUSE asco_unbuffered.patch -- patch from QUCS team -Patch1: asco_unbuffered.patch +Patch0: asco_unbuffered.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -54,17 +52,15 @@ %prep %setup -qn ASCO-%{version} %patch0 -p1 -%patch1 -p1 tar -zxf Autotools.tar.gz -touch NEWS %build # workaround for GCC10 build failure -export CFLAGS="%(echo %{optflags}) -fcommon" +export CFLAGS="%{optflags} -fcommon" export CXXFLAGS="$CFLAGS" autoreconf -fi %configure -make %{?_smp_mflags} +%make_build %install %make_install @@ -72,8 +68,8 @@ %files %defattr(-,root,root) -%doc ChangeLog README %license LICENSE +%doc ChangeLog README %exclude %{_docdir}/%{name}/ASCO.pdf %{_bindir}/alter %{_bindir}/asco ++++++ ASCO-0.4.10.tar.gz -> ASCO-0.4.11.tar.gz ++++++ Binary files old/ASCO-0.4.10/Autotools.tar.gz and new/ASCO-0.4.11/Autotools.tar.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/ChangeLog new/ASCO-0.4.11/ChangeLog --- old/ASCO-0.4.10/ChangeLog 2016-08-13 11:29:16.020731538 +0200 +++ new/ASCO-0.4.11/ChangeLog 2022-01-19 11:57:57.350388774 +0100 @@ -1,3 +1,16 @@ +ASCO 0.4.11: January 19, 2022 + * As result of SPICE simulators continuously changing output format, a warning + of a possible failed measure is given when using 'asco-test' + * Improvements in Spectre support + * Compiles with recent GCC versions (-fcommon) + * Minor bug fixes + + Manual: + * New section detailing recent Spectre versions interfering with recent MPICH + + + + ASCO 0.4.10: August 13, 2016 * Simulation re-runs are now supported in Spectre during an optimization * Minor enhancements in the RF module diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/Makefile new/ASCO-0.4.11/Makefile --- old/ASCO-0.4.10/Makefile 2006-10-07 16:17:52.000000000 +0200 +++ new/ASCO-0.4.11/Makefile 2021-10-19 14:40:53.522670455 +0200 @@ -1,7 +1,7 @@ # CC = gcc CC_MPI = <FULL_PATH_TO_MPICH>/bin/mpicc -CFLAGS = -Os -I. -I/usr/include +CFLAGS = -Os -fcommon -I. -I/usr/include # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/README new/ASCO-0.4.11/README --- old/ASCO-0.4.10/README 2016-08-13 11:29:16.252733860 +0200 +++ new/ASCO-0.4.11/README 2022-01-19 11:57:57.598392805 +0100 @@ -1,4 +1,4 @@ -ASCO-0.4.10 +ASCO-0.4.11 ------------------------------------------------------------------------ 1. INSTALLING ASCO @@ -24,4 +24,4 @@ ------------------------------------------------------------------------ -Copyright (C) 1999-2016 Joao Ramos +Copyright (C) 1999-2022 Joao Ramos diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/asco.c new/ASCO-0.4.11/asco.c --- old/ASCO-0.4.10/asco.c 2016-08-13 11:29:16.016731497 +0200 +++ new/ASCO-0.4.11/asco.c 2022-01-19 11:57:57.310388123 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2016 Joao Ramos + * Copyright (C) 2004-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/auxfunc.c new/ASCO-0.4.11/auxfunc.c --- old/ASCO-0.4.10/auxfunc.c 2016-08-13 11:29:16.008731418 +0200 +++ new/ASCO-0.4.11/auxfunc.c 2022-01-19 11:57:57.370389099 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos + * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/auxfunc.h new/ASCO-0.4.11/auxfunc.h --- old/ASCO-0.4.10/auxfunc.h 2016-08-13 11:29:16.040731737 +0200 +++ new/ASCO-0.4.11/auxfunc.h 2022-01-19 11:57:57.578392480 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos + * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -12,7 +12,7 @@ * global variable declarations */ -#define COPYRIGHT "Copyright (c) 1999-2016 Joao Ramos" +#define COPYRIGHT "Copyright (c) 1999-2022 Joao Ramos" #define GPL_INFO "This program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details." #define LONGSTRINGSIZE 4096 /* */ #define SHORTSTRINGSIZE 64 /* */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/auxfunc_alter.c new/ASCO-0.4.11/auxfunc_alter.c --- old/ASCO-0.4.10/auxfunc_alter.c 2016-08-13 11:29:16.100732338 +0200 +++ new/ASCO-0.4.11/auxfunc_alter.c 2022-01-19 11:57:57.494391114 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos + * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -437,9 +437,9 @@ gethostname(data, sizeof(data)); l = strpos2(data, ".", 1); if (l) { - data[l]=0; + data[l-1]=0; } - strcat(data, "mdl"); + strcat(data, ".mdl"); if ((falterINC=fopen(data,"r+t")) == 0) { /*create an empty file for writing*/ printf("auxfunc_alter.c - CreateALTERinc -- Cannot write to output file: %s\n", data); exit(EXIT_FAILURE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/auxfunc_measurefromlis.c new/ASCO-0.4.11/auxfunc_measurefromlis.c --- old/ASCO-0.4.10/auxfunc_measurefromlis.c 2016-08-13 11:29:16.240733739 +0200 +++ new/ASCO-0.4.11/auxfunc_measurefromlis.c 2022-01-19 11:57:57.326388383 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos +// * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -1360,6 +1360,38 @@ /*Step lkk1/2*/ if (!strcmp(lkk1, measure[k].search) || !strcmp(lkk2, measure[k].search)) { measure_p_line[k] = measure[k].line; /*data to read has been found at measure[k].line from the current line of text!*/ + #ifdef ASCO + #ifdef DEBUG + /* + * For the situations where the output is changing, this code will at least warn about it + */ + } else { + switch(spice) { + case 1: /*Eldo*/ + case 2: /*HSPICE*/ + case 3: /*LTspice*/ + case 4: /*Spectre*/ + if (k>0) { + strcpy(lkk2, measure[k].search); + StripSpaces(lkk2); + if (strpos2(lkk2, " ", 1)) { + lkk2[strpos2(lkk2, " ", 1)-1]='\0'; + } + if (strpos2(lkk, lkk2, 1)) { + printf("INFO: auxfunc_measurefromlis.c - ProcessOutputFile -- Measurement '%s' possibly found but with format different than the expected. Double check!\n", lkk2); + } + } + break; + case 50: /*Qucs*/ + case 51: /*ngspice*/ + case 100: /*general*/ + break; + default: + printf("auxfunc_measurefromlis.c - ProcessOutputFile -- Something unexpected has happened!\n"); + exit(EXIT_FAILURE); + } + #endif + #endif } } /*1*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/de36.c new/ASCO-0.4.11/de36.c --- old/ASCO-0.4.10/de36.c 2016-08-13 11:29:16.224733580 +0200 +++ new/ASCO-0.4.11/de36.c 2022-01-19 11:57:57.382389294 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2016 Joao Ramos + * Copyright (C) 2005-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html Binary files old/ASCO-0.4.10/doc/ASCO.pdf and new/ASCO-0.4.11/doc/ASCO.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/errfunc.c new/ASCO-0.4.11/errfunc.c --- old/ASCO-0.4.10/errfunc.c 2016-08-13 11:29:16.080732138 +0200 +++ new/ASCO-0.4.11/errfunc.c 2022-01-19 11:57:57.642393520 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2016 Joao Ramos + * Copyright (C) 2004-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -214,7 +214,7 @@ sprintf(laux, "%s.log.log", hostname); /*hostname is "longmorn"*/ break; case 4: /*Spectre*/ - sprintf(laux, "%s.log", hostname); /*hostname is "longmorn"*/ + sprintf(laux, "%s.log.log", hostname); /*hostname is "longmorn"*/ break; case 50: /*Qucs*/ sprintf(laux, "%s.log", hostname); /*hostname is "longmorn"*/ @@ -373,7 +373,7 @@ measurements[j].measured_value=asc2real(laux, 1, (int)strlen(laux)); /*4- convert it to double */ if (!fcmp(measurements[j].measured_value, 0)) { /*5- check NaN and other text strings */ - if ((laux[0] < 43) || (laux[0] > 57) ) /*if its text*/ + if ((laux[0] < 43) || (laux[0] > 57) ) { /*if it is text*/ if (measurements[j].objective_constraint == 1) /*1=MIN*/ measurements[j].measured_value=+1e+30; /*so that a large cost is later assigned*/ if (measurements[j].objective_constraint == 2) /*2=MAX*/ @@ -382,6 +382,7 @@ measurements[j].measured_value=+1e+30; /*so that a large cost is later assigned*/ if (measurements[j].objective_constraint > 4) /*5=GE, 6=EQ*/ measurements[j].measured_value=-1e+30; /*so that a large cost is later assigned*/ + } } } i++; @@ -432,16 +433,17 @@ /*Step1: scale input parameters from [-10, +10] to fit within desired range values*/ #ifdef DEBUG printf("DEBUG: errfunc.c - Step1\n"); - #endif + #else for (i = 0; i < MAXPARAMETERS; i++) { if (parameters[i].format) { parameters[i].value = scaleto(x[i], -10, +10, parameters[i].minimum, parameters[i].maximum, parameters[i].format); - if (parameters[i].value<0) { - ii=1; - /*printf("INFO: errfunc.c - Step1 -- Negative values\n");*/ - } +// if (parameters[i].value<0) { +// ii=1; +// /*printf("INFO: errfunc.c - Step1 -- Negative values\n");*/ +// } } } + #endif /**/ @@ -637,7 +639,7 @@ #ifndef __MINGW32__ sprintf(lkk, "nice -n 19 ./general.sh %s %s", hostname, hostname); #else - sprintf(lkk, "./general.sh %s %s", hostname, hostname); + sprintf(lkk, ".\\general.bat %s %s", hostname, hostname); #endif break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/errfunc.h new/ASCO-0.4.11/errfunc.h --- old/ASCO-0.4.10/errfunc.h 2016-08-13 11:29:16.096732299 +0200 +++ new/ASCO-0.4.11/errfunc.h 2022-01-19 11:57:57.590392675 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2016 Joao Ramos + * Copyright (C) 2004-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/evaluate.c new/ASCO-0.4.11/evaluate.c --- old/ASCO-0.4.10/evaluate.c 2016-08-13 11:29:16.068732018 +0200 +++ new/ASCO-0.4.11/evaluate.c 2022-01-19 11:57:57.566392285 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2016 Joao Ramos + * Copyright (C) 2004-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -66,11 +66,11 @@ /**/ /*Step3: In DEBUG mode, use initial values from the <inputfile>.cfg file*/ - #ifdef DEBUG - for (ii = 0; ii < D; ii++) { - x[ii] = scaleto(parameters[ii].value, parameters[ii].minimum, parameters[ii].maximum, -10, +10, parameters[ii].format); - } - #endif +// #ifdef DEBUG +// for (ii = 0; ii < D; ii++) { +// x[ii] = scaleto(parameters[ii].value, parameters[ii].minimum, parameters[ii].maximum, -10, +10, parameters[ii].format); +// } +// #endif /**/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/initialize.c new/ASCO-0.4.11/initialize.c --- old/ASCO-0.4.10/initialize.c 2016-08-13 11:29:16.196733299 +0200 +++ new/ASCO-0.4.11/initialize.c 2022-01-19 11:57:57.498391179 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2016 Joao Ramos + * Copyright (C) 2004-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -149,22 +149,26 @@ exit(EXIT_FAILURE); } + #ifndef DEBUG if (result < outa) { - #ifdef DEBUG - printf("INFO: initialize.c - scaleto -- Initial value in *.cfg is lower than the minimum value. Double check!\n"); - #else - printf("initialize.c - scaleto -- Initial value in *.cfg is lower than the minimum value\n"); +// #ifdef DEBUG +// printf("INFO: initialize.c - scaleto -- Initial value in *.cfg is lower than the minimum value. Double check!\n"); +// #else +// printf("initialize.c - scaleto -- Initial value in *.cfg is lower than the minimum value\n"); + printf("initialize.c - scaleto -- 'result' is is lower than the minimum value\n"); /*if it fails, something unexpected has happened*/ exit(EXIT_FAILURE); - #endif +// #endif } if (result > outb) { - #ifdef DEBUG - printf("INFO: initialize.c - scaleto -- Initial value in *.cfg is larger than the maximum value. Double check!\n"); - #else - printf("initialize.c - scaleto -- Initial value in *.cfg is larger than the maximum value\n"); +// #ifdef DEBUG +// printf("INFO: initialize.c - scaleto -- Initial value in *.cfg is larger than the maximum value. Double check!\n"); +// #else +// printf("initialize.c - scaleto -- Initial value in *.cfg is larger than the maximum value\n"); + printf("initialize.c - scaleto -- 'result' is larger than the maximum value\n"); /*if it fails, something unexpected has happened*/ exit(EXIT_FAILURE); - #endif +// #endif } + #endif return(result); } @@ -209,17 +213,26 @@ if (optimize==0) { /*optimize=0 : we are initializing*/ if (parameters[i].optimize==0) - sprintf(laux, "%E", parameters[i].value); /*writes the value*/ + if ((parameters[i].format % 2)==0) { + sprintf(laux, "%d", (int)parameters[i].value); /*writes the value as integer*/ + } else { + sprintf(laux, "%E", parameters[i].value); /*writes the value*/ + } else sprintf(laux, "#%s#",parameters[i].symbol); /*writes the #<symbol># back again*/ } else { /*optimize=1 : we are optimizing*/ - sprintf(laux, "%E", parameters[i].value); /*writes the value*/ + if ((parameters[i].format % 2)==0) { + sprintf(laux, "%d", (int)parameters[i].value); /*writes the value as integer*/ + } else { + sprintf(laux, "%E", parameters[i].value); /*writes the value*/ + } } InsertString(ret, laux, (ii-(int)strlen(parameters[i].symbol)-1), ii+1); // strcat(ret, lxp); // strcat(ret, laux); + ii=ii - ( (int)strlen(parameters[i].symbol) - ((int)strlen(laux) - 2) ); //to account for size difference if a 'symbol' is replaced (optimize=1) by its numerical value, and 'symbol' initially has a larger string size than its numerical value size (in string format) ii++; /*because 'ReadSubKey' starts at [ii-1] instead of [ii]*/ ReadSubKey(laux, ret, &ii, '#', '#', 0); } @@ -400,6 +413,15 @@ exit(EXIT_FAILURE); } + #ifdef DEBUG + if (parameters[i].value < parameters[i].minimum) { + printf("INFO: initialize.c - Step2 -- Initial value in *.cfg is less than the minimum value. Double check!\n"); + } + if (parameters[i].value > parameters[i].maximum) { + printf("INFO: initialize.c - Step2 -- Initial value in *.cfg is greater than the maximum value. Double check!\n"); + } + #endif + ReadSubKey(laux, lkk, &ii, ':', ':', 5); /*format */ if (laux[0] == 'E') { char IEC60063[] = " 3 6 12 24 48 96 192 "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/initialize.h new/ASCO-0.4.11/initialize.h --- old/ASCO-0.4.10/initialize.h 2016-08-13 11:29:16.208733419 +0200 +++ new/ASCO-0.4.11/initialize.h 2022-01-19 11:57:57.550392025 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2016 Joao Ramos + * Copyright (C) 2004-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/rfmodule.c new/ASCO-0.4.11/rfmodule.c --- old/ASCO-0.4.10/rfmodule.c 2016-08-13 11:29:16.056731898 +0200 +++ new/ASCO-0.4.11/rfmodule.c 2022-01-19 11:57:57.342388643 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2016 Joao Ramos + * Copyright (C) 2005-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/rfmodule.h new/ASCO-0.4.11/rfmodule.h --- old/ASCO-0.4.10/rfmodule.h 2016-08-13 11:29:15.992731257 +0200 +++ new/ASCO-0.4.11/rfmodule.h 2022-01-19 11:57:57.534391765 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2016 Joao Ramos + * Copyright (C) 2005-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/alter/Makefile new/ASCO-0.4.11/tools/alter/Makefile --- old/ASCO-0.4.10/tools/alter/Makefile 2006-09-12 22:35:26.000000000 +0200 +++ new/ASCO-0.4.11/tools/alter/Makefile 2021-10-19 14:40:54.254684046 +0200 @@ -1,6 +1,6 @@ # CC = gcc -CFLAGS = -Os -I. -I/usr/include +CFLAGS = -Os -fcommon -I. -I/usr/include # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/alter/auxfunc_alter.c new/ASCO-0.4.11/tools/alter/auxfunc_alter.c --- old/ASCO-0.4.10/tools/alter/auxfunc_alter.c 2016-08-13 11:29:16.128732618 +0200 +++ new/ASCO-0.4.11/tools/alter/auxfunc_alter.c 2022-01-19 11:57:57.394389489 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos + * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -437,9 +437,9 @@ gethostname(data, sizeof(data)); l = strpos2(data, ".", 1); if (l) { - data[l]=0; + data[l-1]=0; } - strcat(data, "mdl"); + strcat(data, ".mdl"); if ((falterINC=fopen(data,"r+t")) == 0) { /*create an empty file for writing*/ printf("auxfunc_alter.c - CreateALTERinc -- Cannot write to output file: %s\n", data); exit(EXIT_FAILURE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/auxfunc/auxfunc.c new/ASCO-0.4.11/tools/auxfunc/auxfunc.c --- old/ASCO-0.4.10/tools/auxfunc/auxfunc.c 2016-08-13 11:29:16.144732779 +0200 +++ new/ASCO-0.4.11/tools/auxfunc/auxfunc.c 2022-01-19 11:57:57.462390594 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos + * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -537,7 +537,7 @@ void InsertString(char *ret, char *data, int a, int b) { char begin[LONGSTRINGSIZE], end[LONGSTRINGSIZE]; - + strsub(begin, ret, 1, a-1); strsub(end, ret, b, (int)strlen(ret)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/auxfunc/auxfunc.h new/ASCO-0.4.11/tools/auxfunc/auxfunc.h --- old/ASCO-0.4.10/tools/auxfunc/auxfunc.h 2016-08-13 11:29:16.152732859 +0200 +++ new/ASCO-0.4.11/tools/auxfunc/auxfunc.h 2022-01-19 11:57:57.478390854 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos + * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -12,7 +12,7 @@ * global variable declarations */ -#define COPYRIGHT "Copyright (c) 1999-2016 Joao Ramos" +#define COPYRIGHT "Copyright (c) 1999-2022 Joao Ramos" #define GPL_INFO "This program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details." #define LONGSTRINGSIZE 4096 /* */ #define SHORTSTRINGSIZE 64 /* */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/log/Makefile new/ASCO-0.4.11/tools/log/Makefile --- old/ASCO-0.4.10/tools/log/Makefile 2006-09-12 22:35:25.000000000 +0200 +++ new/ASCO-0.4.11/tools/log/Makefile 2021-10-19 14:40:54.950696968 +0200 @@ -1,6 +1,6 @@ # CC = gcc -CFLAGS = -Os -I. -I/usr/include +CFLAGS = -Os -fcommon -I. -I/usr/include # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/log/auxfunc_log.c new/ASCO-0.4.11/tools/log/auxfunc_log.c --- old/ASCO-0.4.10/tools/log/auxfunc_log.c 2016-08-13 11:29:16.180733139 +0200 +++ new/ASCO-0.4.11/tools/log/auxfunc_log.c 2022-01-19 11:57:57.410389749 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos + * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/monte/Makefile new/ASCO-0.4.11/tools/monte/Makefile --- old/ASCO-0.4.10/tools/monte/Makefile 2006-09-12 22:35:24.000000000 +0200 +++ new/ASCO-0.4.11/tools/monte/Makefile 2021-10-19 14:40:55.630709594 +0200 @@ -1,6 +1,6 @@ # CC = gcc -CFLAGS = -Os -I. -I/usr/include +CFLAGS = -Os -fcommon -I. -I/usr/include # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/postp/Makefile new/ASCO-0.4.11/tools/postp/Makefile --- old/ASCO-0.4.10/tools/postp/Makefile 2006-09-12 22:35:26.000000000 +0200 +++ new/ASCO-0.4.11/tools/postp/Makefile 2021-10-19 14:40:56.818731652 +0200 @@ -1,6 +1,6 @@ # CC = gcc -CFLAGS = -Os -I. -I/usr/include +CFLAGS = -Os -fcommon -I. -I/usr/include # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/postp/auxfunc_measurefromlis.c new/ASCO-0.4.11/tools/postp/auxfunc_measurefromlis.c --- old/ASCO-0.4.10/tools/postp/auxfunc_measurefromlis.c 2016-08-13 11:29:16.124732579 +0200 +++ new/ASCO-0.4.11/tools/postp/auxfunc_measurefromlis.c 2022-01-19 11:57:57.442390269 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos +// * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -1360,6 +1360,38 @@ /*Step lkk1/2*/ if (!strcmp(lkk1, measure[k].search) || !strcmp(lkk2, measure[k].search)) { measure_p_line[k] = measure[k].line; /*data to read has been found at measure[k].line from the current line of text!*/ + #ifdef ASCO + #ifdef DEBUG + /* + * For the situations where the output is changing, this code will at least warn about it + */ + } else { + switch(spice) { + case 1: /*Eldo*/ + case 2: /*HSPICE*/ + case 3: /*LTspice*/ + case 4: /*Spectre*/ + if (k>0) { + strcpy(lkk2, measure[k].search); + StripSpaces(lkk2); + if (strpos2(lkk2, " ", 1)) { + lkk2[strpos2(lkk2, " ", 1)-1]='\0'; + } + if (strpos2(lkk, lkk2, 1)) { + printf("INFO: auxfunc_measurefromlis.c - ProcessOutputFile -- Measurement '%s' possibly found but with format different than the expected. Double check!\n", lkk2); + } + } + break; + case 50: /*Qucs*/ + case 51: /*ngspice*/ + case 100: /*general*/ + break; + default: + printf("auxfunc_measurefromlis.c - ProcessOutputFile -- Something unexpected has happened!\n"); + exit(EXIT_FAILURE); + } + #endif + #endif } } /*1*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/tools/postp/auxfunc_updatelis.c new/ASCO-0.4.11/tools/postp/auxfunc_updatelis.c --- old/ASCO-0.4.10/tools/postp/auxfunc_updatelis.c 2016-08-13 11:29:16.108732418 +0200 +++ new/ASCO-0.4.11/tools/postp/auxfunc_updatelis.c 2022-01-19 11:57:57.426390009 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1999-2016 Joao Ramos + * Copyright (C) 1999-2022 Joao Ramos * Your use of this code is subject to the terms and conditions of the * GNU general public license version 2. See "COPYING" or * http://www.gnu.org/licenses/gpl.html @@ -59,7 +59,7 @@ void ReadKeyPrintLine(char *Result, char *key, FILE *streamIn, FILE *streamOut) { char lkk1[LONGSTRINGSIZE]; - char STR1[LONGSTRINGSIZE]; + /*char STR1[LONGSTRINGSIZE];*/ while ((strpos2(lkk1, key, 1) == 0) & (!P_eof(streamIn))) { fgets2(lkk1, LONGSTRINGSIZE, streamIn); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ASCO-0.4.10/version.h new/ASCO-0.4.11/version.h --- old/ASCO-0.4.10/version.h 2016-08-13 11:29:16.252733860 +0200 +++ new/ASCO-0.4.11/version.h 2022-01-19 11:57:57.598392805 +0100 @@ -1 +1 @@ -#define VERSION "ASCO-0.4.10" +#define VERSION "ASCO-0.4.11"
