From 1ff1fc5a6cd62a526f7507a32fd65b9b44cfd578 Mon Sep 17 00:00:00 2001
From: h_vogt <h_vogt>
Date: Sun, 4 Oct 2009 15:57:10 +0000
Subject: [PATCH] version 20, update for Cygwin

---
 ChangeLog                  |  5 +++++
 configure.in               |  2 +-
 src/frontend/com_sysinfo.c | 25 ++++++++-----------------
 visualc/include/config.h   |  6 +++---
 visualc/vngspice.vcproj    | 16 ++++------------
 5 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5db1beedf..bfbb48b03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
  * 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, 
diff --git a/configure.in b/configure.in
index ff96f549e..f53e8166d 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ dnl Initialisation
 dnl ---------------
 
 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
 AC_CONFIG_SRCDIR([src/ngspice.c])
diff --git a/src/frontend/com_sysinfo.c b/src/frontend/com_sysinfo.c
index 0a504a4fa..c84286573 100644
--- a/src/frontend/com_sysinfo.c
+++ b/src/frontend/com_sysinfo.c
@@ -116,19 +116,6 @@ void com_sysinfo()
 
 #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);
    tfree(info);
 }
@@ -297,8 +284,9 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
 			
 			/* get number of logical processors */
 			while((strPtr = strstr(strPtr, matchStrProc)) != NULL) {
-				numProcs++;
+//				numProcs++;
 				strPtr += strlen(matchStrProc);
+				if isblank(*strPtr) numProcs++;
 			}
 			info->numLogicalProcessors = numProcs;
 			physIDs = malloc(numProcs * sizeof(tInt));
@@ -340,11 +328,11 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
 			free(physIDs);		
 		}
 
-      /* another test to get number of logical processors */
+      /* another test to get number of logical processors 
       if (info->numLogicalProcessors == 0) {
          char* token;
          char* cpustr = copy(inStr);
-         while (cpustr)
+         while ((cpustr) && !*cpustr)
             if (cieq(gettok(&cpustr), "processor")) {
                gettok(&cpustr);
                token = gettok(&cpustr);
@@ -352,7 +340,7 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
             
          info->numLogicalProcessors = atoi(token) + 1;
          tfree(cpustr);
-      }
+      }*/
 		
 		free(inStr);
 		fclose(file);
@@ -438,6 +426,9 @@ TesError tesCreateSystemInfo(TesSystemInfo *info) {
 		if(minor == 0) {
 			versionStr = "Windows Vista";
 		}
+		else if(minor == 1) {
+			versionStr = "Windows 7";
+		}		
 		break;
 	default:
 		break;
diff --git a/visualc/include/config.h b/visualc/include/config.h
index a6787804b..f0fbcb043 100644
--- a/visualc/include/config.h
+++ b/visualc/include/config.h
@@ -469,13 +469,13 @@
 #define PACKAGE_NAME "ngspice"
 
 /* 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 PACKAGE_TARNAME "ngspice"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "19"
+#define PACKAGE_VERSION "20"
 
 /* Define if we want predictor algorithm */
 /* #undef PREDICTOR */
@@ -530,7 +530,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "19"
+#define VERSION "20"
 
 /* Define if we want spice2 sensitivity analysis */
 /* #undef WANT_SENSE2 */
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index 9d3d71f61..00ddeadad 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -819,10 +819,6 @@
 				RelativePath="..\src\frontend\commands.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\compatmode.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parser\complete.h"
 				>
@@ -1108,11 +1104,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\grid.h"
+				RelativePath="..\src\frontend\plotting\grid.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\frontend\plotting\grid.h"
+				RelativePath="..\src\include\grid.h"
 				>
 			</File>
 			<File
@@ -1220,11 +1216,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\frontend\inp.h"
+				RelativePath="..\src\spicelib\parser\inp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\spicelib\parser\inp.h"
+				RelativePath="..\src\frontend\inp.h"
 				>
 			</File>
 			<File
@@ -4519,10 +4515,6 @@
 				RelativePath="..\src\frontend\commands.c"
 				>
 			</File>
-			<File
-				RelativePath="..\src\frontend\compatmode.c"
-				>
-			</File>
 			<File
 				RelativePath="..\src\frontend\parser\complete.c"
 				>