epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

version 20, update for Cygwin

pre-master-46
h_vogt 17 years ago
parent
52722a3a64
commit
1ff1fc5a6c
5 changed files with 21 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      ChangeLog
  2. 2
      configure.in
  3. 25
      src/frontend/com_sysinfo.c
  4. 6
      visualc/include/config.h
  5. 16
      visualc/vngspice.vcproj

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-10-04 Holger Vogt
* configure.in, /visualc/include/config.h, vngspice.vcproj:
version 20
* com_sysinfo.c: update for Cygwin
2009-10-04: Dietmar Warning 2009-10-04: Dietmar Warning
* com_sysinfo.c, ftext.h: sys_memory struct w/o static type, sysinfo w/o void Parameter * com_sysinfo.c, ftext.h: sys_memory struct w/o static type, sysinfo w/o void Parameter
* inpcom.c, gnuplot.c, device.c, inp.c, resource.c, subckt.c, * inpcom.c, gnuplot.c, device.c, inp.c, resource.c, subckt.c,

2
configure.in
View File

@ -12,7 +12,7 @@ dnl Initialisation
dnl --------------- dnl ---------------
dnl Initialisation of configure dnl Initialisation of configure
AC_INIT(ngspice,19,ngspice-bugs@lists.sourceforge.net)
AC_INIT(ngspice,20,ngspice-bugs@lists.sourceforge.net)
dnl Unique file in the source directory dnl Unique file in the source directory
AC_CONFIG_SRCDIR([src/ngspice.c]) AC_CONFIG_SRCDIR([src/ngspice.c])

25
src/frontend/com_sysinfo.c
View File

@ -116,19 +116,6 @@ void com_sysinfo()
#endif #endif
/*
Console.WriteLine("Number of CPUs: {0}", Environment.GetEnvironmentVariable _
("NUMBER_OF_PROCESSORS"))
Console.WriteLine("CPU Architecture: {0}", Environment.GetEnvironmentVariable _
("PROCESSOR_ARCHITECTURE"))
Console.WriteLine("CPU Identifier: {0}", Environment.GetEnvironmentVariable _
("PROCESSOR_IDENTIFIER"))
Console.WriteLine("CPU Level: {0}", Environment.GetEnvironmentVariable _
("PROCESSOR_LEVEL"))
Console.WriteLine("CPU Revision: {0}", Environment.GetEnvironmentVariable _
("PROCESSOR_REVISION"))
*/
tesFreeSystemInfo(info); tesFreeSystemInfo(info);
tfree(info); tfree(info);
} }
@ -297,8 +284,9 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
/* get number of logical processors */ /* get number of logical processors */
while((strPtr = strstr(strPtr, matchStrProc)) != NULL) { while((strPtr = strstr(strPtr, matchStrProc)) != NULL) {
numProcs++;
// numProcs++;
strPtr += strlen(matchStrProc); strPtr += strlen(matchStrProc);
if isblank(*strPtr) numProcs++;
} }
info->numLogicalProcessors = numProcs; info->numLogicalProcessors = numProcs;
physIDs = malloc(numProcs * sizeof(tInt)); physIDs = malloc(numProcs * sizeof(tInt));
@ -340,11 +328,11 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
free(physIDs); free(physIDs);
} }
/* another test to get number of logical processors */
/* another test to get number of logical processors
if (info->numLogicalProcessors == 0) { if (info->numLogicalProcessors == 0) {
char* token; char* token;
char* cpustr = copy(inStr); char* cpustr = copy(inStr);
while (cpustr)
while ((cpustr) && !*cpustr)
if (cieq(gettok(&cpustr), "processor")) { if (cieq(gettok(&cpustr), "processor")) {
gettok(&cpustr); gettok(&cpustr);
token = gettok(&cpustr); token = gettok(&cpustr);
@ -352,7 +340,7 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
info->numLogicalProcessors = atoi(token) + 1; info->numLogicalProcessors = atoi(token) + 1;
tfree(cpustr); tfree(cpustr);
}
}*/
free(inStr); free(inStr);
fclose(file); fclose(file);
@ -438,6 +426,9 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
if(minor == 0) { if(minor == 0) {
versionStr = "Windows Vista"; versionStr = "Windows Vista";
} }
else if(minor == 1) {
versionStr = "Windows 7";
}
break; break;
default: default:
break; break;

6
visualc/include/config.h
View File

@ -469,13 +469,13 @@
#define PACKAGE_NAME "ngspice" #define PACKAGE_NAME "ngspice"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "ngspice 19"
#define PACKAGE_STRING "ngspice 20"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "ngspice" #define PACKAGE_TARNAME "ngspice"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "19"
#define PACKAGE_VERSION "20"
/* Define if we want predictor algorithm */ /* Define if we want predictor algorithm */
/* #undef PREDICTOR */ /* #undef PREDICTOR */
@ -530,7 +530,7 @@
/* #undef TM_IN_SYS_TIME */ /* #undef TM_IN_SYS_TIME */
/* Version number of package */ /* Version number of package */
#define VERSION "19"
#define VERSION "20"
/* Define if we want spice2 sensitivity analysis */ /* Define if we want spice2 sensitivity analysis */
/* #undef WANT_SENSE2 */ /* #undef WANT_SENSE2 */

16
visualc/vngspice.vcproj
View File

@ -819,10 +819,6 @@
RelativePath="..\src\frontend\commands.h" RelativePath="..\src\frontend\commands.h"
> >
</File> </File>
<File
RelativePath="..\src\frontend\compatmode.h"
>
</File>
<File <File
RelativePath="..\src\frontend\parser\complete.h" RelativePath="..\src\frontend\parser\complete.h"
> >
@ -1108,11 +1104,11 @@
> >
</File> </File>
<File <File
RelativePath="..\src\include\grid.h"
RelativePath="..\src\frontend\plotting\grid.h"
> >
</File> </File>
<File <File
RelativePath="..\src\frontend\plotting\grid.h"
RelativePath="..\src\include\grid.h"
> >
</File> </File>
<File <File
@ -1220,11 +1216,11 @@
> >
</File> </File>
<File <File
RelativePath="..\src\frontend\inp.h"
RelativePath="..\src\spicelib\parser\inp.h"
> >
</File> </File>
<File <File
RelativePath="..\src\spicelib\parser\inp.h"
RelativePath="..\src\frontend\inp.h"
> >
</File> </File>
<File <File
@ -4519,10 +4515,6 @@
RelativePath="..\src\frontend\commands.c" RelativePath="..\src\frontend\commands.c"
> >
</File> </File>
<File
RelativePath="..\src\frontend\compatmode.c"
>
</File>
<File <File
RelativePath="..\src\frontend\parser\complete.c" RelativePath="..\src\frontend\parser\complete.c"
> >

Write Preview
Loading…
Cancel
Save