From 5f5ec4f49a1adfa5de6b4a0b4bba6cd359414d70 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Sat, 22 Sep 2018 17:42:45 +0200
Subject: [PATCH] Sort out spinit and vngspice.vcxproj: During installation
 into C:\Spice.... a spinit from spinit_all is copied, having relative paths
 to the code models. A local spinit (needed for the running the local
 debugger) is copied from either spinitd or spinitd64, referencing the code
 models stored in C:\Spiced..\lib\ngspice by setting the absolute path.

---
 visualc/make-install-vngspice.bat  |  6 ++++--
 visualc/make-install-vngspiced.bat |  6 ++++--
 visualc/spinit                     | 30 ------------------------------
 visualc/{spinit64 => spinit_all}   |  0
 visualc/spinitd                    | 12 ++++++------
 visualc/spinitd64                  | 12 ++++++------
 6 files changed, 20 insertions(+), 46 deletions(-)
 delete mode 100644 visualc/spinit
 rename visualc/{spinit64 => spinit_all} (100%)

diff --git a/visualc/make-install-vngspice.bat b/visualc/make-install-vngspice.bat
index daa6bab39..5ccbc7063 100644
--- a/visualc/make-install-vngspice.bat
+++ b/visualc/make-install-vngspice.bat
@@ -21,7 +21,8 @@ copy %cmsrc%\table.cm %dst%\lib\ngspice\table.cm
 copy %cmsrc%\xtraevt.cm %dst%\lib\ngspice\xtraevt.cm
 copy %cmsrc%\xtradev.cm %dst%\lib\ngspice\xtradev.cm
 copy %cmsrc%\spice2poly.cm %dst%\lib\ngspice\spice2poly.cm
-copy .\spinit %dst%\share\ngspice\scripts\spinit
+copy .\spinit_all %dst%\share\ngspice\scripts\spinit
+copy .\spinitd .\spinit
 
 if "%2" == "fftw" goto copy2
 if "%3" == "fftw" goto copy2
@@ -50,7 +51,8 @@ copy %cmsrc%\table64.cm %dst%\lib\ngspice\table.cm
 copy %cmsrc%\xtraevt64.cm %dst%\lib\ngspice\xtraevt.cm
 copy %cmsrc%\xtradev64.cm %dst%\lib\ngspice\xtradev.cm
 copy %cmsrc%\spice2poly64.cm %dst%\lib\ngspice\spice2poly.cm
-copy .\spinit64 %dst%\share\ngspice\scripts\spinit
+copy .\spinit_all %dst%\share\ngspice\scripts\spinit
+copy .\spinitd64 .\spinit
 
 if "%2" == "fftw" goto copy2-64
 if "%3" == "fftw" goto copy2-64
diff --git a/visualc/make-install-vngspiced.bat b/visualc/make-install-vngspiced.bat
index a164f34f9..35f4f8fea 100644
--- a/visualc/make-install-vngspiced.bat
+++ b/visualc/make-install-vngspiced.bat
@@ -21,7 +21,8 @@ copy %cmsrc%\table.cm %dst%\lib\ngspice\table.cm
 copy %cmsrc%\xtraevt.cm %dst%\lib\ngspice\xtraevt.cm
 copy %cmsrc%\xtradev.cm %dst%\lib\ngspice\xtradev.cm
 copy %cmsrc%\spice2poly.cm %dst%\lib\ngspice\spice2poly.cm
-copy .\spinitd %dst%\share\ngspice\scripts\spinit
+copy .\spinit_all %dst%\share\ngspice\scripts\spinit
+copy .\spinitd .\spinit
 
 if "%2" == "fftw" goto copy2
 if "%3" == "fftw" goto copy2
@@ -50,7 +51,8 @@ copy %cmsrc%\table64.cm %dst%\lib\ngspice\table.cm
 copy %cmsrc%\xtraevt64.cm %dst%\lib\ngspice\xtraevt.cm
 copy %cmsrc%\xtradev64.cm %dst%\lib\ngspice\xtradev.cm
 copy %cmsrc%\spice2poly64.cm %dst%\lib\ngspice\spice2poly.cm
-copy .\spinitd64 %dst%\share\ngspice\scripts\spinit
+copy .\spinit_all %dst%\share\ngspice\scripts\spinit
+copy .\spinitd64 .\spinit
 
 if "%2" == "fftw" goto copy2-64
 if "%3" == "fftw" goto copy2-64
diff --git a/visualc/spinit b/visualc/spinit
deleted file mode 100644
index d7fd1300c..000000000
--- a/visualc/spinit
+++ /dev/null
@@ -1,30 +0,0 @@
-* Standard ngspice init file
-alias exit quit
-alias acct rusage all
-set x11lineararcs
-*set rndseed=12
-** ascii rawfile **
-set filetype=ascii
-** frontend debug output **
-*set ngdebug
-** asking after quit **
-*set askquit
-** set the number of threads in openmp
-** default (if compiled with --enable-openmp) is: 2
-set num_threads=4
-set interactive
-
-strcmp __flag $program "ngspice"
-if $__flag = 0
-
-* Load the codemodels
- codemodel ../lib/ngspice/spice2poly.cm
- codemodel ../lib/ngspice/analog.cm
- codemodel ../lib/ngspice/digital.cm
- codemodel ../lib/ngspice/xtradev.cm
- codemodel ../lib/ngspice/xtraevt.cm
- codemodel ../lib/ngspice/table.cm
-
-
-end
-unset __flag
diff --git a/visualc/spinit64 b/visualc/spinit_all
similarity index 100%
rename from visualc/spinit64
rename to visualc/spinit_all
diff --git a/visualc/spinitd b/visualc/spinitd
index d7fd1300c..18e34ecef 100644
--- a/visualc/spinitd
+++ b/visualc/spinitd
@@ -18,12 +18,12 @@ strcmp __flag $program "ngspice"
 if $__flag = 0
 
 * Load the codemodels
- codemodel ../lib/ngspice/spice2poly.cm
- codemodel ../lib/ngspice/analog.cm
- codemodel ../lib/ngspice/digital.cm
- codemodel ../lib/ngspice/xtradev.cm
- codemodel ../lib/ngspice/xtraevt.cm
- codemodel ../lib/ngspice/table.cm
+ codemodel C:/Spiced/lib/ngspice/spice2poly.cm
+ codemodel C:/Spiced/lib/ngspice/analog.cm
+ codemodel C:/Spiced/lib/ngspice/digital.cm
+ codemodel C:/Spiced/lib/ngspice/xtradev.cm
+ codemodel C:/Spiced/lib/ngspice/xtraevt.cm
+ codemodel C:/Spiced/lib/ngspice/table.cm
 
 
 end
diff --git a/visualc/spinitd64 b/visualc/spinitd64
index d7fd1300c..24454aa92 100644
--- a/visualc/spinitd64
+++ b/visualc/spinitd64
@@ -18,12 +18,12 @@ strcmp __flag $program "ngspice"
 if $__flag = 0
 
 * Load the codemodels
- codemodel ../lib/ngspice/spice2poly.cm
- codemodel ../lib/ngspice/analog.cm
- codemodel ../lib/ngspice/digital.cm
- codemodel ../lib/ngspice/xtradev.cm
- codemodel ../lib/ngspice/xtraevt.cm
- codemodel ../lib/ngspice/table.cm
+ codemodel C:/Spice64d/lib/ngspice/spice2poly.cm
+ codemodel C:/Spice64d/lib/ngspice/analog.cm
+ codemodel C:/Spice64d/lib/ngspice/digital.cm
+ codemodel C:/Spice64d/lib/ngspice/xtradev.cm
+ codemodel C:/Spice64d/lib/ngspice/xtraevt.cm
+ codemodel C:/Spice64d/lib/ngspice/table.cm
 
 
 end