Updated NGHDL simulator executable for Verilog and Ngspice

3 files changed, 16 insertions, 16 deletions

diff --git a/Windows/nghdl-setup-script.nsi b/Windows/nghdl-setup-script.nsi
index f9e4c57..d5c56b1 100644
--- a/Windows/nghdl-setup-script.nsi
+++ b/Windows/nghdl-setup-script.nsi
@@ -80,19 +80,19 @@ Section "nghdl-loadsource"
     File "verilator.7z"
     File "mingw64.7z"
     File "MSYS.7z"
-    File "nghdl-src.7z"
-    File "ngspice-nghdl.7z"
+    File "nghdl.7z"
+    File "nghdl-simulator.7z"
 SectionEnd
 
-Section "nghdl-src"
+Section "nghdl"
     SetOutPath $INSTDIR
-    Nsis7z::ExtractWithDetails "$EXEDIR\nghdl-src.7z" "Extracting NGHDL %s..."
+    Nsis7z::ExtractWithDetails "$EXEDIR\nghdl.7z" "Extracting NGHDL %s..."
     EnVar::SetHKLM
     DetailPrint "EnVar::SetHKLM"
     EnVar::AddValue "Path" "$INSTDIR\eSim\nghdl\src"
     Pop $0
     DetailPrint "EnVar::AddValue returned=|$0|"
-    Delete "$EXEDIR\nghdl-src.7z"
+    Delete "$EXEDIR\nghdl.7z"
 SectionEnd
 
 Section "msys2"
@@ -150,17 +150,17 @@ Section "envar-refresh"
 SectionEnd
 
 
-Section "nghdl-installNgspice"
+Section "install-nghdl-simulator"
     SetOutPath $INSTDIR
-    Nsis7z::ExtractWithDetails "$EXEDIR\ngspice-nghdl.7z" "Extracting Ngspice %s..."
+    Nsis7z::ExtractWithDetails "$EXEDIR\nghdl-simulator.7z" "Extracting NGHDL Simulator %s..."
 
-    ;CopyFiles $INSTDIR\eSim\nghdl\src\outitf.c $INSTDIR\ngspice-nghdl\src\frontend
+    ;CopyFiles $INSTDIR\eSim\nghdl\src\outitf.c $INSTDIR\nghdl-simulator\src\frontend
 
     CopyFiles "$INSTDIR\MSYS\mingw64\x86_64-w64-mingw32\lib\libws2_32.a" "$INSTDIR\eSim\nghdl\src\ghdlserver"
 
-    SetOutPath $INSTDIR\ngspice-nghdl
-    CreateDirectory $INSTDIR\ngspice-nghdl\release
-    SetOutPath $INSTDIR\ngspice-nghdl\release
+    SetOutPath $INSTDIR\nghdl-simulator
+    CreateDirectory $INSTDIR\nghdl-simulator\release
+    SetOutPath $INSTDIR\nghdl-simulator\release
 
     Var /GLOBAL shellpath
     Var /GLOBAL shellpath1
@@ -172,20 +172,20 @@ Section "nghdl-installNgspice"
 
     ${StrRep} '$shellpath1' '$shellpath' '\' '/'
 
-    ;FileOpen $0  "$INSTDIR\ngspice-nghdl\release\installngspice.sh" w
-    ;FileWrite $0 `../configure --with-wingui --enable-xspice --disable-debug --prefix=$shellpath1/ngspice-nghdl/install_dir --exec-prefix=$shellpath1/ngspice-nghdl/install_dir &&$\n`
+    ;FileOpen $0  "$INSTDIR\nghdl-simulator\release\installngspice.sh" w
+    ;FileWrite $0 `../configure --with-wingui --enable-xspice --disable-debug --prefix=$shellpath1/nghdl-simulator/install_dir --exec-prefix=$shellpath1/nghdl-simulator/install_dir &&$\n`
     ;FileWrite $0 `make -j$cpucores &&$\n`
     ;FileWrite $0 `make install$\n`
     ;FileClose $0
 
     ;nsExec::ExecToLog "$INSTDIR\mingw64\msys\bin\bash.exe installngspice.sh"
-    ;Delete $INSTDIR\ngspice-nghdl\release\installngspice.sh
-    Delete "$EXEDIR\ngspice-nghdl.7z"
+    ;Delete $INSTDIR\nghdl-simulator\release\installngspice.sh
+    Delete "$EXEDIR\nghdl-simulator.7z"
 
     SetOutPath $INSTDIR
 
     EnVar::SetHKLM
-    EnVar::AddValue "Path" "$INSTDIR\ngspice-nghdl\bin"
+    EnVar::AddValue "Path" "$INSTDIR\nghdl-simulator\bin"
     Pop $0
     DetailPrint "EnVar::AddValue returned=|$0|"
 
diff --git a/Windows/sources/nghdl-simulator.7z b/Windows/sources/nghdl-simulator.7z
new file mode 100644
index 0000000..c4c6e6e
--- /dev/null
+++ b/Windows/sources/nghdl-simulator.7z
diff --git a/Windows/sources/ngspice-nghdl.7z b/Windows/sources/ngspice-nghdl.7z
deleted file mode 100644
index b396af1..0000000
--- a/Windows/sources/ngspice-nghdl.7z
+++ /dev/null