From 27dd0446334de2cd4d7cedde4db02ec9c289e65c Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 16 Jul 2020 22:48:15 +0530
Subject: Create Windows

---
 Windows | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Windows

(limited to 'Windows')

diff --git a/Windows b/Windows
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/Windows
@@ -0,0 +1 @@
+
-- 
cgit 


From d23b921cc098e1ebe625d5a7da146529a5bd6c4d Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 16 Jul 2020 22:48:34 +0530
Subject: Delete Windows

---
 Windows | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 Windows

(limited to 'Windows')

diff --git a/Windows b/Windows
deleted file mode 100644
index 8b13789..0000000
--- a/Windows
+++ /dev/null
@@ -1 +0,0 @@
-
-- 
cgit 


From 060b27b4427c604861d66da8fb565c1aff0585c7 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 16 Jul 2020 22:54:37 +0530
Subject: include in esim-setup-script.nsi

---
 Windows/installnghdl.nsi | 190 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 190 insertions(+)
 create mode 100644 Windows/installnghdl.nsi

(limited to 'Windows')

diff --git a/Windows/installnghdl.nsi b/Windows/installnghdl.nsi
new file mode 100644
index 0000000..0ab7da4
--- /dev/null
+++ b/Windows/installnghdl.nsi
@@ -0,0 +1,190 @@
+!include "CPUFeatures.nsh" 
+!include "zipdll.nsh"
+
+;-----------------------------------------------------------------------------------------
+; String replacement function
+!define StrRep "!insertmacro StrRep"
+!macro StrRep output string old new
+    Push `${string}`
+    Push `${old}`
+    Push `${new}`
+    !ifdef __UNINSTALL__
+        Call un.StrRep
+    !else
+        Call StrRep
+    !endif
+    Pop ${output}
+!macroend
+ 
+!macro Func_StrRep un
+    Function ${un}StrRep
+        Exch $R2 ;new
+        Exch 1
+        Exch $R1 ;old
+        Exch 2
+        Exch $R0 ;string
+        Push $R3
+        Push $R4
+        Push $R5
+        Push $R6
+        Push $R7
+        Push $R8
+        Push $R9
+ 
+        StrCpy $R3 0
+        StrLen $R4 $R1
+        StrLen $R6 $R0
+        StrLen $R9 $R2
+        loop:
+            StrCpy $R5 $R0 $R4 $R3
+            StrCmp $R5 $R1 found
+            StrCmp $R3 $R6 done
+            IntOp $R3 $R3 + 1 ;move offset by 1 to check the next character
+            Goto loop
+        found:
+            StrCpy $R5 $R0 $R3
+            IntOp $R8 $R3 + $R4
+            StrCpy $R7 $R0 "" $R8
+            StrCpy $R0 $R5$R2$R7
+            StrLen $R6 $R0
+            IntOp $R3 $R3 + $R9 ;move offset by length of the replacement string
+            Goto loop
+        done:
+ 
+        Pop $R9
+        Pop $R8
+        Pop $R7
+        Pop $R6
+        Pop $R5
+        Pop $R4
+        Pop $R3
+        Push $R0
+        Push $R1
+        Pop $R0
+        Pop $R1
+        Pop $R0
+        Pop $R2
+        Exch $R1
+    FunctionEnd
+!macroend
+!insertmacro Func_StrRep ""
+!insertmacro Func_StrRep "un."
+;-----------------------------------------------------------------------------------------
+
+;-----------------------------------------------------------------------------------------
+; NGHDL installation macro 
+Section "nghdl-loadsource"
+    SetOutPath $EXEDIR
+    
+    File "ghdl.zip"
+    File "mingw.7z"
+    File "MSYS.zip"
+    File "nghdl-src.zip"
+    File "ngspice-nghdl.zip"
+SectionEnd
+
+Section "nghdl-src"
+    SetOutPath $INSTDIR
+    ZipDLL::extractall "$EXEDIR\nghdl-src.zip" "$INSTDIR\"
+    EnVar::SetHKLM
+    DetailPrint "EnVar::SetHKLM"
+    EnVar::AddValue "Path" "$INSTDIR\eSim\nghdl\src"
+    Pop $0
+    DetailPrint "EnVar::AddValue returned=|$0|"
+    Delete "$EXEDIR\nghdl-src.zip"
+SectionEnd
+
+Section "nghdl-mingw"
+    SetOutPath $INSTDIR
+    Nsis7z::ExtractWithDetails "$EXEDIR\mingw.7z" "Extracting MinGW %s..."
+    EnVar::SetHKLM
+    EnVar::AddValue "Path" "$INSTDIR\mingw64\bin"
+    Pop $0
+    DetailPrint "EnVar::AddValue returned=|$0|"
+    Delete "$EXEDIR\mingw.7z"
+SectionEnd
+
+Section "nghdl-msys"
+    SetOutPath $INSTDIR\mingw64
+    ZipDLL::extractall "$EXEDIR\MSYS.zip" "$INSTDIR\mingw64\"
+    EnVar::SetHKLM
+    EnVar::AddValue "Path" "$INSTDIR\mingw64\msys\bin"
+    Pop $0
+    DetailPrint "EnVar::AddValue returned=|$0|"
+    Delete "$EXEDIR\MSYS.zip"
+SectionEnd
+
+Section "nghdl-GHDL"
+    SetOutPath $INSTDIR\mingw64
+    ZipDLL::extractall "$EXEDIR\ghdl.zip" "$INSTDIR\mingw64\"
+    EnVar::SetHKLM
+    EnVar::AddValue "Path" "$INSTDIR\mingw64\GHDL\bin"
+    Pop $0
+    DetailPrint "EnVar::AddValue returned=|$0|"
+    Delete "$EXEDIR\ghdl.zip"
+SectionEnd
+
+Section "envar-refresh"	
+	ReadEnvStr $R0 "PATH"
+	StrCpy $R0 "$R0;$INSTDIR\eSim\nghdl\src;$INSTDIR\mingw64\bin;$INSTDIR\mingw64\msys\bin;$INSTDIR\mingw64\GHDL\bin;"
+	System::Call 'Kernel32::SetEnvironmentVariable(t, t) i("PATH", R0).r0'
+SectionEnd
+
+
+Section "nghdl-installNgspice"
+    SetOutPath $INSTDIR
+    ZipDLL::extractall "$EXEDIR\ngspice-nghdl.zip" "$INSTDIR\"
+
+    CopyFiles $INSTDIR\eSim\nghdl\src\outitf.c $INSTDIR\ngspice-nghdl\src\frontend
+    
+    CopyFiles $INSTDIR\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
+
+    Var /GLOBAL shellpath
+    Var /GLOBAL shellpath1
+    Var /GLOBAL cpucores
+    
+    ${CPUFeatures.GetCount} $cpucores
+
+    StrCpy $shellpath $INSTDIR
+
+    ${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`
+    FileWrite $0 `make -j$cpucores &&$\n`
+    FileWrite $0 `make install$\n`
+    FileClose $0
+    
+    nsExec::ExecToLog "$INSTDIR\mingw64\msys\bin\bash.exe installngspice.sh"
+    Delete "$EXEDIR\ngspice-nghdl.zip"
+	Delete $INSTDIR\ngspice-nghdl\release\installngspice.sh
+
+    SetOutPath $INSTDIR
+
+    EnVar::SetHKLM
+    EnVar::AddValue "Path" "$INSTDIR\ngspice-nghdl\install_dir\bin"
+    Pop $0
+    DetailPrint "EnVar::AddValue returned=|$0|"
+
+SectionEnd
+  
+Section "nghdl-config.ini" 
+    CreateDirectory $PROFILE\.nghdl
+    FileOpen $0  "$PROFILE\.nghdl\config.ini" w
+    FileWrite $0 `[NGSPICE]$\n`
+    FileWrite $0 `NGSPICE_HOME = $INSTDIR\ngspice-nghdl$\n`
+    FileWrite $0 `DIGITAL_MODEL = %(NGSPICE_HOME)s\src\xspice\icm\ghdl$\n`
+    FileWrite $0 `RELEASE = %(NGSPICE_HOME)s\release$\n`
+    FileWrite $0 `[SRC]$\n`
+    FileWrite $0 `SRC_HOME = $INSTDIR\eSim\nghdl$\n`
+    FileWrite $0 `LICENSE = %(SRC_HOME)s\LICENSE$\n`
+    FileWrite $0 `[COMPILER]$\n`
+    FileWrite $0 `MSYS_HOME = $INSTDIR\mingw64\msys\bin$\n`
+    FileClose $0
+SectionEnd
+
+;-------------------------------------------------------------------------------------
-- 
cgit 


From 27776b92439b26de41df324b4f2cabb73913e661 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 16 Jul 2020 22:55:25 +0530
Subject: create nghdl.exe and packaging nghdl

---
 Windows/readme.md | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 Windows/readme.md

(limited to 'Windows')

diff --git a/Windows/readme.md b/Windows/readme.md
new file mode 100644
index 0000000..10c73f2
--- /dev/null
+++ b/Windows/readme.md
@@ -0,0 +1,102 @@
+NGHDL Installer (Windows OS)
+====
+
+
+It contains all the documenation for making NGHDL executable (using PyInstaller) and packging for eSim Installation Script on Windows 7 and above.
+
+
+## NGHDL Executable:
+
+1. Download and install "Python-3.7.7", "Git For Windows". Use "Git Bash" for all following shell commands.
+		
+		Reference - https://gitforwindows.org/
+
+2. Add alias to python.exe in Git shell:
+
+		$ alias python='winpty python.exe'	#Need to be done for each new shell created
+
+3. Download `virtualenv` package as:
+
+	    $ pip install virtualenv
+
+4. Create a virtual environment as:
+
+		$ python -m virtualenv nghdl
+
+5. Activate the virtual environment as:
+	
+		$ source nghdl/Scripts/activate
+
+6. Install all Python dependencies for NGHDL within the virtual environment as:
+		
+		- Install PyInstaller, tornado, SetupTools through pip :
+
+			$ pip install pyinstaller
+			$ pip install tornado
+			$ pip install --upgrade 'setuptools<45.0.0'
+		
+		- Install PyQt4 through pip (Reference - https://stackoverflow.com/questions/22640640/how-to-install-pyqt4-on-windows-using-pip) :
+			
+			$ pip install --upgrade 'sip<5.0.0'
+			$ pip install <wheel_package_of_PyQt4>
+			
+			Download PyQt4 Wheel from - [https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyqt4]
+			Where cp37 represents the Python version i.e. 3.7.7
+
+			> Note : 
+				- If there are any issues regarding loading of DLL files, refer : https://stackoverflow.com/questions/2738879/cannot-import-pyqt4-qtgui
+				- If above step works, then goto step 7.
+
+7. Test whether only eSim dependencies are available or not:
+
+		$ pip freeze
+
+> Note : Following dependencies should be available -
+>	- PyQt4
+>	- numpy
+>	- dateutil
+>	- pyparsing
+>	- six
+>	- cycler.py
+
+
+8. Create spec file as:
+
+		$ pyi-makespec --onefile -n eSim <path_to_nghdl>/src/ngspice_ghdl.py
+
+9. Create onefile executable using pyinstaller as:
+		
+		$ pyinstaller -F --clean nghdl.spec
+
+10. Verify whether all eSim `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller.
+11. nghdl.exe is generated at the dist folder.
+
+
+
+## How to package NGHDL?
+
+1. Place the nghdl.exe generated from the above process at the location /nghdl/src/
+
+2. Delete all python files (files ending in .py) at /nghdl/src/
+
+3. Remove the following files at /nghdl/
+    - .gitignore
+    - GHDLside.md
+    - Readme.md
+    - Workflow.md
+
+4. Place nghdl folder containing `src folder`, `Examples folder`&`LICENSE`under folder named eSim/
+
+5. Compress `eSim` folder in zip format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.zip`.
+
+6.  Place the following zip files at the installer folder for eSim.
+(these can be obtained under *sources/* folder in the repository )
+- nghdl-src.zip
+- ghdl.zip
+- MSYS.zip
+- ngspice-nghdl.zip
+- mingw.7z
+
+7.  Place the script `installnghdl.nsi` at the eSim installer location.
+
+8. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script` file). Now only use the generated installer for distribution.
\ No newline at end of file
-- 
cgit 


From 4c8c9e1448b138c8636a04e31374a385b8960657 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 16 Jul 2020 22:58:10 +0530
Subject: Update readme.md

---
 Windows/readme.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Windows')

diff --git a/Windows/readme.md b/Windows/readme.md
index 10c73f2..7da8684 100644
--- a/Windows/readme.md
+++ b/Windows/readme.md
@@ -47,7 +47,7 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 				- If there are any issues regarding loading of DLL files, refer : https://stackoverflow.com/questions/2738879/cannot-import-pyqt4-qtgui
 				- If above step works, then goto step 7.
 
-7. Test whether only eSim dependencies are available or not:
+7. Test whether only NGHDL dependencies are available or not:
 
 		$ pip freeze
 
@@ -62,13 +62,13 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 
 8. Create spec file as:
 
-		$ pyi-makespec --onefile -n eSim <path_to_nghdl>/src/ngspice_ghdl.py
+		$ pyi-makespec --onefile -n nghdl <path_to_nghdl>/src/ngspice_ghdl.py
 
 9. Create onefile executable using pyinstaller as:
 		
 		$ pyinstaller -F --clean nghdl.spec
 
-10. Verify whether all eSim `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller.
+10. Verify whether all NGHDL `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller.
 11. nghdl.exe is generated at the dist folder.
 
 
@@ -99,4 +99,4 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 
 7.  Place the script `installnghdl.nsi` at the eSim installer location.
 
-8. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script` file). Now only use the generated installer for distribution.
\ No newline at end of file
+8. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script` file). Now only use the generated installer for distribution.
-- 
cgit 


From 4ec3aa8dbd9ecf17af8e8dcad0a76fb57525d642 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 16 Jul 2020 23:00:44 +0530
Subject: Plugins required by NSIS for NGHDL

---
 Windows/NSISplugins/CPUFeatures.2013-02-26.zip | Bin 0 -> 92286 bytes
 Windows/NSISplugins/EnVar_plugin.zip           | Bin 0 -> 33630 bytes
 Windows/NSISplugins/Nsis7z_19.00.7z            | Bin 0 -> 461078 bytes
 Windows/NSISplugins/ZipDLL (1).zip             | Bin 0 -> 379356 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Windows/NSISplugins/CPUFeatures.2013-02-26.zip
 create mode 100644 Windows/NSISplugins/EnVar_plugin.zip
 create mode 100644 Windows/NSISplugins/Nsis7z_19.00.7z
 create mode 100644 Windows/NSISplugins/ZipDLL (1).zip

(limited to 'Windows')

diff --git a/Windows/NSISplugins/CPUFeatures.2013-02-26.zip b/Windows/NSISplugins/CPUFeatures.2013-02-26.zip
new file mode 100644
index 0000000..2f701d8
Binary files /dev/null and b/Windows/NSISplugins/CPUFeatures.2013-02-26.zip differ
diff --git a/Windows/NSISplugins/EnVar_plugin.zip b/Windows/NSISplugins/EnVar_plugin.zip
new file mode 100644
index 0000000..cdee545
Binary files /dev/null and b/Windows/NSISplugins/EnVar_plugin.zip differ
diff --git a/Windows/NSISplugins/Nsis7z_19.00.7z b/Windows/NSISplugins/Nsis7z_19.00.7z
new file mode 100644
index 0000000..78d88ab
Binary files /dev/null and b/Windows/NSISplugins/Nsis7z_19.00.7z differ
diff --git a/Windows/NSISplugins/ZipDLL (1).zip b/Windows/NSISplugins/ZipDLL (1).zip
new file mode 100644
index 0000000..f5c4fc0
Binary files /dev/null and b/Windows/NSISplugins/ZipDLL (1).zip differ
-- 
cgit 


From 1f4985d7e4cd56ebbd342fc62b89837f57b9eadd Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 16 Jul 2020 23:10:18 +0530
Subject: GHDL source

---
 Windows/sources/ghdl.zip | Bin 0 -> 21331447 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Windows/sources/ghdl.zip

(limited to 'Windows')

diff --git a/Windows/sources/ghdl.zip b/Windows/sources/ghdl.zip
new file mode 100644
index 0000000..197414d
Binary files /dev/null and b/Windows/sources/ghdl.zip differ
-- 
cgit 


From d200df270aab304c732adaa7699f8a3a190c5b58 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 16 Jul 2020 23:36:07 +0530
Subject: Add existing file

---
 Windows/sources/MSYS.zip          | Bin 0 -> 52163263 bytes
 Windows/sources/mingw.7z          | Bin 0 -> 49370037 bytes
 Windows/sources/nghdl-src.zip     | Bin 0 -> 15494597 bytes
 Windows/sources/ngspice-nghdl.zip | Bin 0 -> 9349804 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Windows/sources/MSYS.zip
 create mode 100644 Windows/sources/mingw.7z
 create mode 100644 Windows/sources/nghdl-src.zip
 create mode 100644 Windows/sources/ngspice-nghdl.zip

(limited to 'Windows')

diff --git a/Windows/sources/MSYS.zip b/Windows/sources/MSYS.zip
new file mode 100644
index 0000000..84ccd49
Binary files /dev/null and b/Windows/sources/MSYS.zip differ
diff --git a/Windows/sources/mingw.7z b/Windows/sources/mingw.7z
new file mode 100644
index 0000000..9c1eb68
Binary files /dev/null and b/Windows/sources/mingw.7z differ
diff --git a/Windows/sources/nghdl-src.zip b/Windows/sources/nghdl-src.zip
new file mode 100644
index 0000000..2535bf4
Binary files /dev/null and b/Windows/sources/nghdl-src.zip differ
diff --git a/Windows/sources/ngspice-nghdl.zip b/Windows/sources/ngspice-nghdl.zip
new file mode 100644
index 0000000..d35f0d2
Binary files /dev/null and b/Windows/sources/ngspice-nghdl.zip differ
-- 
cgit 


From 694cb5d1522bfe450fc9315e9220b71b3dbf12f6 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Wed, 29 Jul 2020 17:48:35 +0530
Subject: Update readme.md

---
 Windows/readme.md | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

(limited to 'Windows')

diff --git a/Windows/readme.md b/Windows/readme.md
index 7da8684..799e4c9 100644
--- a/Windows/readme.md
+++ b/Windows/readme.md
@@ -7,7 +7,7 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 
 ## NGHDL Executable:
 
-1. Download and install "Python-3.7.7", "Git For Windows". Use "Git Bash" for all following shell commands.
+1. Download and install "Python-3.5.2", "Git For Windows". Use "Git Bash" for all following shell commands.
 		
 		Reference - https://gitforwindows.org/
 
@@ -32,7 +32,6 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 		- Install PyInstaller, tornado, SetupTools through pip :
 
 			$ pip install pyinstaller
-			$ pip install tornado
 			$ pip install --upgrade 'setuptools<45.0.0'
 		
 		- Install PyQt4 through pip (Reference - https://stackoverflow.com/questions/22640640/how-to-install-pyqt4-on-windows-using-pip) :
@@ -41,7 +40,7 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 			$ pip install <wheel_package_of_PyQt4>
 			
 			Download PyQt4 Wheel from - [https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyqt4]
-			Where cp37 represents the Python version i.e. 3.7.7
+			Where cp37 represents the Python version i.e. 3.7.x and so on
 
 			> Note : 
 				- If there are any issues regarding loading of DLL files, refer : https://stackoverflow.com/questions/2738879/cannot-import-pyqt4-qtgui
@@ -53,11 +52,12 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 
 > Note : Following dependencies should be available -
 >	- PyQt4
->	- numpy
->	- dateutil
->	- pyparsing
->	- six
->	- cycler.py
+>	- sip
+>	- altgraph
+>	- future
+>	- pefile
+>	- pyinstaller
+>	- pywin32-ctypes
 
 
 8. Create spec file as:
@@ -73,7 +73,7 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 
 
 
-## How to package NGHDL?
+## How to package NGHDL with eSim ?
 
 1. Place the nghdl.exe generated from the above process at the location /nghdl/src/
 
@@ -85,18 +85,22 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
     - Readme.md
     - Workflow.md
 
-4. Place nghdl folder containing `src folder`, `Examples folder`&`LICENSE`under folder named eSim/
+4. Place **nghdl** folder containing `src folder`, `Examples folder` & `LICENSE`under folder named eSim/
 
-5. Compress `eSim` folder in zip format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.zip`.
+5. Final directory structure should be:  eSim/nghdl/Examples
+				         eSim/nghdL/src
+				         eSim/nghdl/LICENSE
 
-6.  Place the following zip files at the installer folder for eSim.
+6. Compress the `eSim` folder from step 4 in 7z format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.7z`.
+	(7z compression tool can be downloaded from - https://www.7-zip.org/download.html )
+
+7. ALong with `nghdl-src.7z` from step 5, place the following 7z files at the installer folder for eSim.
 (these can be obtained under *sources/* folder in the repository )
-- nghdl-src.zip
-- ghdl.zip
-- MSYS.zip
-- ngspice-nghdl.zip
-- mingw.7z
+- ghdl.7z
+- MSYS.7z
+- ngspice-nghdl.7z
+- mingw64.7z
 
-7.  Place the script `installnghdl.nsi` at the eSim installer location.
+8.  Place the script `installnghdl.nsi` at the eSim installer location.
 
-8. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script` file). Now only use the generated installer for distribution.
+9. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script.nsi` file). Now only use the generated installer for distribution.
-- 
cgit 


From f0c7979f4ab41be5c0da7efb095b94bc5e416663 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Wed, 29 Jul 2020 19:04:59 +0530
Subject: Update readme.md

---
 Windows/readme.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Windows')

diff --git a/Windows/readme.md b/Windows/readme.md
index 799e4c9..6f5aae9 100644
--- a/Windows/readme.md
+++ b/Windows/readme.md
@@ -82,17 +82,17 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 3. Remove the following files at /nghdl/
     - .gitignore
     - GHDLside.md
-    - Readme.md
     - Workflow.md
 
-4. Place **nghdl** folder containing `src folder`, `Examples folder` & `LICENSE`under folder named eSim/
+4. Place **nghdl** folder containing `src folder`, `Example folder` & `LICENSE` under folder named eSim/
 
-5. Final directory structure should be:  eSim/nghdl/Examples
-				         eSim/nghdL/src
-				         eSim/nghdl/LICENSE
+5. Final directory structure should be: 
+- eSim/nghdl/Example
+- eSim/nghdl/src 
+- eSim/nghdl/LICENSE 
 
-6. Compress the `eSim` folder from step 4 in 7z format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.7z`.
-	(7z compression tool can be downloaded from - https://www.7-zip.org/download.html )
+6. Compress the `eSim` folder from step 4 in 7z format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.7z`.\
+(7z compression tool can be downloaded from - https://www.7-zip.org/download.html )
 
 7. ALong with `nghdl-src.7z` from step 5, place the following 7z files at the installer folder for eSim.
 (these can be obtained under *sources/* folder in the repository )
-- 
cgit 


From f5ee0a49642b0b7642f815bbd7e0e7cb4baa403b Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Fri, 31 Jul 2020 23:33:13 +0530
Subject: 7z for increased compression

---
 Windows/installnghdl.nsi | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'Windows')

diff --git a/Windows/installnghdl.nsi b/Windows/installnghdl.nsi
index 0ab7da4..2d5de99 100644
--- a/Windows/installnghdl.nsi
+++ b/Windows/installnghdl.nsi
@@ -76,52 +76,52 @@
 Section "nghdl-loadsource"
     SetOutPath $EXEDIR
     
-    File "ghdl.zip"
-    File "mingw.7z"
-    File "MSYS.zip"
-    File "nghdl-src.zip"
-    File "ngspice-nghdl.zip"
+    File "ghdl.7z"
+    File "mingw64.7z"
+    File "MSYS.7z"
+    File "nghdl-src.7z"
+    File "ngspice-nghdl.7z"
 SectionEnd
 
 Section "nghdl-src"
     SetOutPath $INSTDIR
-    ZipDLL::extractall "$EXEDIR\nghdl-src.zip" "$INSTDIR\"
+    Nsis7z::ExtractWithDetails "$EXEDIR\nghdl-src.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.zip"
+    Delete "$EXEDIR\nghdl-src.7z"
 SectionEnd
 
 Section "nghdl-mingw"
     SetOutPath $INSTDIR
-    Nsis7z::ExtractWithDetails "$EXEDIR\mingw.7z" "Extracting MinGW %s..."
+    Nsis7z::ExtractWithDetails "$EXEDIR\mingw64.7z" "Extracting MinGW %s..."
     EnVar::SetHKLM
     EnVar::AddValue "Path" "$INSTDIR\mingw64\bin"
     Pop $0
     DetailPrint "EnVar::AddValue returned=|$0|"
-    Delete "$EXEDIR\mingw.7z"
+    Delete "$EXEDIR\mingw64.7z"
 SectionEnd
 
 Section "nghdl-msys"
     SetOutPath $INSTDIR\mingw64
-    ZipDLL::extractall "$EXEDIR\MSYS.zip" "$INSTDIR\mingw64\"
+    Nsis7z::ExtractWithDetails "$EXEDIR\MSYS.7z" "Extracting MSYS %s..."
     EnVar::SetHKLM
     EnVar::AddValue "Path" "$INSTDIR\mingw64\msys\bin"
     Pop $0
     DetailPrint "EnVar::AddValue returned=|$0|"
-    Delete "$EXEDIR\MSYS.zip"
+    Delete "$EXEDIR\MSYS.7z"
 SectionEnd
 
 Section "nghdl-GHDL"
     SetOutPath $INSTDIR\mingw64
-    ZipDLL::extractall "$EXEDIR\ghdl.zip" "$INSTDIR\mingw64\"
+    Nsis7z::ExtractWithDetails "$EXEDIR\ghdl.7z" "Extracting GHDL %s..."
     EnVar::SetHKLM
     EnVar::AddValue "Path" "$INSTDIR\mingw64\GHDL\bin"
     Pop $0
     DetailPrint "EnVar::AddValue returned=|$0|"
-    Delete "$EXEDIR\ghdl.zip"
+    Delete "$EXEDIR\ghdl.7z"
 SectionEnd
 
 Section "envar-refresh"	
@@ -133,7 +133,7 @@ SectionEnd
 
 Section "nghdl-installNgspice"
     SetOutPath $INSTDIR
-    ZipDLL::extractall "$EXEDIR\ngspice-nghdl.zip" "$INSTDIR\"
+    Nsis7z::ExtractWithDetails "$EXEDIR\ngspice-nghdl.7z" "Extracting GHDL %s..."
 
     CopyFiles $INSTDIR\eSim\nghdl\src\outitf.c $INSTDIR\ngspice-nghdl\src\frontend
     
@@ -160,7 +160,7 @@ Section "nghdl-installNgspice"
     FileClose $0
     
     nsExec::ExecToLog "$INSTDIR\mingw64\msys\bin\bash.exe installngspice.sh"
-    Delete "$EXEDIR\ngspice-nghdl.zip"
+    Delete "$EXEDIR\ngspice-nghdl.7z"
 	Delete $INSTDIR\ngspice-nghdl\release\installngspice.sh
 
     SetOutPath $INSTDIR
-- 
cgit 


From 2e7c1591ed1ed6e181521182dd1763056572e661 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Fri, 31 Jul 2020 23:34:13 +0530
Subject: Delete MSYS.zip

---
 Windows/sources/MSYS.zip | Bin 52163263 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Windows/sources/MSYS.zip

(limited to 'Windows')

diff --git a/Windows/sources/MSYS.zip b/Windows/sources/MSYS.zip
deleted file mode 100644
index 84ccd49..0000000
Binary files a/Windows/sources/MSYS.zip and /dev/null differ
-- 
cgit 


From 0f22172d72efc06f7fda409c8e35d6f2a54091c6 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Fri, 31 Jul 2020 23:34:42 +0530
Subject: Delete ghdl.zip

---
 Windows/sources/ghdl.zip | Bin 21331447 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Windows/sources/ghdl.zip

(limited to 'Windows')

diff --git a/Windows/sources/ghdl.zip b/Windows/sources/ghdl.zip
deleted file mode 100644
index 197414d..0000000
Binary files a/Windows/sources/ghdl.zip and /dev/null differ
-- 
cgit 


From 5eec6521ce630403b9cb5cb33e3940a4b57879a3 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Fri, 31 Jul 2020 23:34:50 +0530
Subject: Delete mingw.7z

---
 Windows/sources/mingw.7z | Bin 49370037 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Windows/sources/mingw.7z

(limited to 'Windows')

diff --git a/Windows/sources/mingw.7z b/Windows/sources/mingw.7z
deleted file mode 100644
index 9c1eb68..0000000
Binary files a/Windows/sources/mingw.7z and /dev/null differ
-- 
cgit 


From e8d3d12bc0a381e803b2337af94969a2758a65ce Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Fri, 31 Jul 2020 23:35:00 +0530
Subject: Delete nghdl-src.zip

---
 Windows/sources/nghdl-src.zip | Bin 15494597 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Windows/sources/nghdl-src.zip

(limited to 'Windows')

diff --git a/Windows/sources/nghdl-src.zip b/Windows/sources/nghdl-src.zip
deleted file mode 100644
index 2535bf4..0000000
Binary files a/Windows/sources/nghdl-src.zip and /dev/null differ
-- 
cgit 


From 2af7b9153c1c9adc53dac76e8784311e62ee112c Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Fri, 31 Jul 2020 23:35:09 +0530
Subject: Delete ngspice-nghdl.zip

---
 Windows/sources/ngspice-nghdl.zip | Bin 9349804 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Windows/sources/ngspice-nghdl.zip

(limited to 'Windows')

diff --git a/Windows/sources/ngspice-nghdl.zip b/Windows/sources/ngspice-nghdl.zip
deleted file mode 100644
index d35f0d2..0000000
Binary files a/Windows/sources/ngspice-nghdl.zip and /dev/null differ
-- 
cgit 


From 4bb2079a4f94e0fd6446f2abcd8df86f6427499b Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Fri, 31 Jul 2020 23:35:29 +0530
Subject: Create sources

---
 Windows/sources | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Windows/sources

(limited to 'Windows')

diff --git a/Windows/sources b/Windows/sources
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/Windows/sources
@@ -0,0 +1 @@
+
-- 
cgit 


From 705880606aa60b897040dd37d9bd5f9ff56a77b3 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Fri, 31 Jul 2020 23:35:46 +0530
Subject: Delete sources

---
 Windows/sources | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 Windows/sources

(limited to 'Windows')

diff --git a/Windows/sources b/Windows/sources
deleted file mode 100644
index 8b13789..0000000
--- a/Windows/sources
+++ /dev/null
@@ -1 +0,0 @@
-
-- 
cgit 


From 64b6576e0770258f599c9ec7eb8c4dc5bba18a4d Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Sat, 1 Aug 2020 10:50:12 +0530
Subject: sources compressed using 7z

---
 Windows/sources/MSYS.7z          | Bin 0 -> 8449807 bytes
 Windows/sources/ghdl.7z          | Bin 0 -> 10968564 bytes
 Windows/sources/mingw64.7z       | Bin 0 -> 16720325 bytes
 Windows/sources/ngspice-nghdl.7z | Bin 0 -> 3725876 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 Windows/sources/MSYS.7z
 create mode 100644 Windows/sources/ghdl.7z
 create mode 100644 Windows/sources/mingw64.7z
 create mode 100644 Windows/sources/ngspice-nghdl.7z

(limited to 'Windows')

diff --git a/Windows/sources/MSYS.7z b/Windows/sources/MSYS.7z
new file mode 100644
index 0000000..c113d5f
Binary files /dev/null and b/Windows/sources/MSYS.7z differ
diff --git a/Windows/sources/ghdl.7z b/Windows/sources/ghdl.7z
new file mode 100644
index 0000000..f403f6e
Binary files /dev/null and b/Windows/sources/ghdl.7z differ
diff --git a/Windows/sources/mingw64.7z b/Windows/sources/mingw64.7z
new file mode 100644
index 0000000..41b0a98
Binary files /dev/null and b/Windows/sources/mingw64.7z differ
diff --git a/Windows/sources/ngspice-nghdl.7z b/Windows/sources/ngspice-nghdl.7z
new file mode 100644
index 0000000..aaee3be
Binary files /dev/null and b/Windows/sources/ngspice-nghdl.7z differ
-- 
cgit 


From 4cd9040bba306c9c42e815c0afcba5f95783e045 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Mon, 3 Aug 2020 16:11:12 +0530
Subject: MinGW + MSYS

---
 Windows/MinGW+MSYS.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 Windows/MinGW+MSYS.md

(limited to 'Windows')

diff --git a/Windows/MinGW+MSYS.md b/Windows/MinGW+MSYS.md
new file mode 100644
index 0000000..d2f682a
--- /dev/null
+++ b/Windows/MinGW+MSYS.md
@@ -0,0 +1,27 @@
+# MinGW + MSYS - Build environment for Ngspice on Windows
+> MSYS provides a Linux like shell and all the utilities required during the configure-make-make install process of Ngspice on Windows.
+
+> MinGW provides the GCC compiler required to build the Ngspice executable.
+
+[Download MinGW (unmodified)](https://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/8.1.0/threads-posix/seh/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.7z)\
+[Download MSYS (unmodified)](https://sourceforge.net/projects/mingw-w64/files/External%20binary%20packages%20%28Win64%20hosted%29/MSYS%20%2832-bit%29/MSYS-20111123.zip/download)
+
+**Reduced versions of MinGW and MSYS for NGHDL can be found in this repository under `sources/` folder.**
+
+## Usage of MinGW + MSYS
+1. Add `/mingw64/bin/` and `/mingw64/msys/bin` to the path so that all the utilities are able to find each other.
+2. Open Windows command prompt at the location you want to use `MinGW + MSYS`.
+3. Execute the command to launch `bash` provided by MSYS at this location.
+  ```sh
+  > pathtoMSYS/bin/bash.exe
+  ```
+ 4. This comand launches bash in the CMD window which can then be used as `BASH shell`, with commands similar to Linux.
+ 
+ 
+## Reduction of MinGW + MSYS
+> Originally MinGW and MSYS are provided for a large variety of development scenarios which are not required by NGHDL, causing size overheads in the final distribution.
+
+1. To remove unrequired parts of MSYS and MinGW, a trial and error based approach is to be followed.
+
+2. To start, both utilities should be reduced to the bare minimum required components which can be noted by studying the Ngspice configure file `(/ngspice/configure)`.
+The rest of the utilities are to added by accessing the errors in the logs provided during the configure-make-make install process.
-- 
cgit 


From a64e48e777e3c95ca720b3225ee5262b0f1aa956 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Wed, 5 Aug 2020 22:08:04 +0530
Subject: Update readme.md

---
 Windows/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Windows')

diff --git a/Windows/readme.md b/Windows/readme.md
index 6f5aae9..cb39499 100644
--- a/Windows/readme.md
+++ b/Windows/readme.md
@@ -29,7 +29,7 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 
 6. Install all Python dependencies for NGHDL within the virtual environment as:
 		
-		- Install PyInstaller, tornado, SetupTools through pip :
+		- Install PyInstaller, SetupTools through pip :
 
 			$ pip install pyinstaller
 			$ pip install --upgrade 'setuptools<45.0.0'
-- 
cgit 


From f9f56ff487b16c312143bd4e81949f4f5db1e9e8 Mon Sep 17 00:00:00 2001
From: rahulp13
Date: Thu, 6 Aug 2020 01:55:36 +0530
Subject: updated doc files

---
 Windows/README.md | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Windows/readme.md | 106 ------------------------------------------------------
 2 files changed, 106 insertions(+), 106 deletions(-)
 create mode 100644 Windows/README.md
 delete mode 100644 Windows/readme.md

(limited to 'Windows')

diff --git a/Windows/README.md b/Windows/README.md
new file mode 100644
index 0000000..6f5aae9
--- /dev/null
+++ b/Windows/README.md
@@ -0,0 +1,106 @@
+NGHDL Installer (Windows OS)
+====
+
+
+It contains all the documenation for making NGHDL executable (using PyInstaller) and packging for eSim Installation Script on Windows 7 and above.
+
+
+## NGHDL Executable:
+
+1. Download and install "Python-3.5.2", "Git For Windows". Use "Git Bash" for all following shell commands.
+		
+		Reference - https://gitforwindows.org/
+
+2. Add alias to python.exe in Git shell:
+
+		$ alias python='winpty python.exe'	#Need to be done for each new shell created
+
+3. Download `virtualenv` package as:
+
+	    $ pip install virtualenv
+
+4. Create a virtual environment as:
+
+		$ python -m virtualenv nghdl
+
+5. Activate the virtual environment as:
+	
+		$ source nghdl/Scripts/activate
+
+6. Install all Python dependencies for NGHDL within the virtual environment as:
+		
+		- Install PyInstaller, tornado, SetupTools through pip :
+
+			$ pip install pyinstaller
+			$ pip install --upgrade 'setuptools<45.0.0'
+		
+		- Install PyQt4 through pip (Reference - https://stackoverflow.com/questions/22640640/how-to-install-pyqt4-on-windows-using-pip) :
+			
+			$ pip install --upgrade 'sip<5.0.0'
+			$ pip install <wheel_package_of_PyQt4>
+			
+			Download PyQt4 Wheel from - [https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyqt4]
+			Where cp37 represents the Python version i.e. 3.7.x and so on
+
+			> Note : 
+				- If there are any issues regarding loading of DLL files, refer : https://stackoverflow.com/questions/2738879/cannot-import-pyqt4-qtgui
+				- If above step works, then goto step 7.
+
+7. Test whether only NGHDL dependencies are available or not:
+
+		$ pip freeze
+
+> Note : Following dependencies should be available -
+>	- PyQt4
+>	- sip
+>	- altgraph
+>	- future
+>	- pefile
+>	- pyinstaller
+>	- pywin32-ctypes
+
+
+8. Create spec file as:
+
+		$ pyi-makespec --onefile -n nghdl <path_to_nghdl>/src/ngspice_ghdl.py
+
+9. Create onefile executable using pyinstaller as:
+		
+		$ pyinstaller -F --clean nghdl.spec
+
+10. Verify whether all NGHDL `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller.
+11. nghdl.exe is generated at the dist folder.
+
+
+
+## How to package NGHDL with eSim ?
+
+1. Place the nghdl.exe generated from the above process at the location /nghdl/src/
+
+2. Delete all python files (files ending in .py) at /nghdl/src/
+
+3. Remove the following files at /nghdl/
+    - .gitignore
+    - GHDLside.md
+    - Workflow.md
+
+4. Place **nghdl** folder containing `src folder`, `Example folder` & `LICENSE` under folder named eSim/
+
+5. Final directory structure should be: 
+- eSim/nghdl/Example
+- eSim/nghdl/src 
+- eSim/nghdl/LICENSE 
+
+6. Compress the `eSim` folder from step 4 in 7z format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.7z`.\
+(7z compression tool can be downloaded from - https://www.7-zip.org/download.html )
+
+7. ALong with `nghdl-src.7z` from step 5, place the following 7z files at the installer folder for eSim.
+(these can be obtained under *sources/* folder in the repository )
+- ghdl.7z
+- MSYS.7z
+- ngspice-nghdl.7z
+- mingw64.7z
+
+8.  Place the script `installnghdl.nsi` at the eSim installer location.
+
+9. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script.nsi` file). Now only use the generated installer for distribution.
diff --git a/Windows/readme.md b/Windows/readme.md
deleted file mode 100644
index 6f5aae9..0000000
--- a/Windows/readme.md
+++ /dev/null
@@ -1,106 +0,0 @@
-NGHDL Installer (Windows OS)
-====
-
-
-It contains all the documenation for making NGHDL executable (using PyInstaller) and packging for eSim Installation Script on Windows 7 and above.
-
-
-## NGHDL Executable:
-
-1. Download and install "Python-3.5.2", "Git For Windows". Use "Git Bash" for all following shell commands.
-		
-		Reference - https://gitforwindows.org/
-
-2. Add alias to python.exe in Git shell:
-
-		$ alias python='winpty python.exe'	#Need to be done for each new shell created
-
-3. Download `virtualenv` package as:
-
-	    $ pip install virtualenv
-
-4. Create a virtual environment as:
-
-		$ python -m virtualenv nghdl
-
-5. Activate the virtual environment as:
-	
-		$ source nghdl/Scripts/activate
-
-6. Install all Python dependencies for NGHDL within the virtual environment as:
-		
-		- Install PyInstaller, tornado, SetupTools through pip :
-
-			$ pip install pyinstaller
-			$ pip install --upgrade 'setuptools<45.0.0'
-		
-		- Install PyQt4 through pip (Reference - https://stackoverflow.com/questions/22640640/how-to-install-pyqt4-on-windows-using-pip) :
-			
-			$ pip install --upgrade 'sip<5.0.0'
-			$ pip install <wheel_package_of_PyQt4>
-			
-			Download PyQt4 Wheel from - [https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyqt4]
-			Where cp37 represents the Python version i.e. 3.7.x and so on
-
-			> Note : 
-				- If there are any issues regarding loading of DLL files, refer : https://stackoverflow.com/questions/2738879/cannot-import-pyqt4-qtgui
-				- If above step works, then goto step 7.
-
-7. Test whether only NGHDL dependencies are available or not:
-
-		$ pip freeze
-
-> Note : Following dependencies should be available -
->	- PyQt4
->	- sip
->	- altgraph
->	- future
->	- pefile
->	- pyinstaller
->	- pywin32-ctypes
-
-
-8. Create spec file as:
-
-		$ pyi-makespec --onefile -n nghdl <path_to_nghdl>/src/ngspice_ghdl.py
-
-9. Create onefile executable using pyinstaller as:
-		
-		$ pyinstaller -F --clean nghdl.spec
-
-10. Verify whether all NGHDL `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller.
-11. nghdl.exe is generated at the dist folder.
-
-
-
-## How to package NGHDL with eSim ?
-
-1. Place the nghdl.exe generated from the above process at the location /nghdl/src/
-
-2. Delete all python files (files ending in .py) at /nghdl/src/
-
-3. Remove the following files at /nghdl/
-    - .gitignore
-    - GHDLside.md
-    - Workflow.md
-
-4. Place **nghdl** folder containing `src folder`, `Example folder` & `LICENSE` under folder named eSim/
-
-5. Final directory structure should be: 
-- eSim/nghdl/Example
-- eSim/nghdl/src 
-- eSim/nghdl/LICENSE 
-
-6. Compress the `eSim` folder from step 4 in 7z format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.7z`.\
-(7z compression tool can be downloaded from - https://www.7-zip.org/download.html )
-
-7. ALong with `nghdl-src.7z` from step 5, place the following 7z files at the installer folder for eSim.
-(these can be obtained under *sources/* folder in the repository )
-- ghdl.7z
-- MSYS.7z
-- ngspice-nghdl.7z
-- mingw64.7z
-
-8.  Place the script `installnghdl.nsi` at the eSim installer location.
-
-9. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script.nsi` file). Now only use the generated installer for distribution.
-- 
cgit 


From b05ed92da35bb7e1e0c09ffc9616465cc30cae94 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 6 Aug 2020 18:33:44 +0530
Subject: Update readme.md

---
 Windows/readme.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Windows')

diff --git a/Windows/readme.md b/Windows/readme.md
index cb39499..f63e717 100644
--- a/Windows/readme.md
+++ b/Windows/readme.md
@@ -98,9 +98,10 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 (these can be obtained under *sources/* folder in the repository )
 - ghdl.7z
 - MSYS.7z
-- ngspice-nghdl.7z
 - mingw64.7z
 
+- ngspice-nghdl.7z ( this file can be obtained by decompressing `ngspice-nghdl.tar.xz` file present at `master branch` of this repository and recompressing using 7z tool)
+
 8.  Place the script `installnghdl.nsi` at the eSim installer location.
 
 9. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script.nsi` file). Now only use the generated installer for distribution.
-- 
cgit 


From f1056e2b9b752470d5434d19da65195f8ba70b10 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 6 Aug 2020 18:34:07 +0530
Subject: Delete ngspice-nghdl.7z

---
 Windows/sources/ngspice-nghdl.7z | Bin 3725876 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 Windows/sources/ngspice-nghdl.7z

(limited to 'Windows')

diff --git a/Windows/sources/ngspice-nghdl.7z b/Windows/sources/ngspice-nghdl.7z
deleted file mode 100644
index aaee3be..0000000
Binary files a/Windows/sources/ngspice-nghdl.7z and /dev/null differ
-- 
cgit 


From 61fd2a0cec774a9076b1e45c53973a037d333147 Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 6 Aug 2020 19:15:11 +0530
Subject: Delete readme.md

---
 Windows/readme.md | 107 ------------------------------------------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 Windows/readme.md

(limited to 'Windows')

diff --git a/Windows/readme.md b/Windows/readme.md
deleted file mode 100644
index f63e717..0000000
--- a/Windows/readme.md
+++ /dev/null
@@ -1,107 +0,0 @@
-NGHDL Installer (Windows OS)
-====
-
-
-It contains all the documenation for making NGHDL executable (using PyInstaller) and packging for eSim Installation Script on Windows 7 and above.
-
-
-## NGHDL Executable:
-
-1. Download and install "Python-3.5.2", "Git For Windows". Use "Git Bash" for all following shell commands.
-		
-		Reference - https://gitforwindows.org/
-
-2. Add alias to python.exe in Git shell:
-
-		$ alias python='winpty python.exe'	#Need to be done for each new shell created
-
-3. Download `virtualenv` package as:
-
-	    $ pip install virtualenv
-
-4. Create a virtual environment as:
-
-		$ python -m virtualenv nghdl
-
-5. Activate the virtual environment as:
-	
-		$ source nghdl/Scripts/activate
-
-6. Install all Python dependencies for NGHDL within the virtual environment as:
-		
-		- Install PyInstaller, SetupTools through pip :
-
-			$ pip install pyinstaller
-			$ pip install --upgrade 'setuptools<45.0.0'
-		
-		- Install PyQt4 through pip (Reference - https://stackoverflow.com/questions/22640640/how-to-install-pyqt4-on-windows-using-pip) :
-			
-			$ pip install --upgrade 'sip<5.0.0'
-			$ pip install <wheel_package_of_PyQt4>
-			
-			Download PyQt4 Wheel from - [https://www.lfd.uci.edu/~gohlke/pythonlibs/#pyqt4]
-			Where cp37 represents the Python version i.e. 3.7.x and so on
-
-			> Note : 
-				- If there are any issues regarding loading of DLL files, refer : https://stackoverflow.com/questions/2738879/cannot-import-pyqt4-qtgui
-				- If above step works, then goto step 7.
-
-7. Test whether only NGHDL dependencies are available or not:
-
-		$ pip freeze
-
-> Note : Following dependencies should be available -
->	- PyQt4
->	- sip
->	- altgraph
->	- future
->	- pefile
->	- pyinstaller
->	- pywin32-ctypes
-
-
-8. Create spec file as:
-
-		$ pyi-makespec --onefile -n nghdl <path_to_nghdl>/src/ngspice_ghdl.py
-
-9. Create onefile executable using pyinstaller as:
-		
-		$ pyinstaller -F --clean nghdl.spec
-
-10. Verify whether all NGHDL `src` files (`*.py`) have been included in `Analysis-00.toc` file under the build folder generated by PyInstaller.
-11. nghdl.exe is generated at the dist folder.
-
-
-
-## How to package NGHDL with eSim ?
-
-1. Place the nghdl.exe generated from the above process at the location /nghdl/src/
-
-2. Delete all python files (files ending in .py) at /nghdl/src/
-
-3. Remove the following files at /nghdl/
-    - .gitignore
-    - GHDLside.md
-    - Workflow.md
-
-4. Place **nghdl** folder containing `src folder`, `Example folder` & `LICENSE` under folder named eSim/
-
-5. Final directory structure should be: 
-- eSim/nghdl/Example
-- eSim/nghdl/src 
-- eSim/nghdl/LICENSE 
-
-6. Compress the `eSim` folder from step 4 in 7z format (Make sure that there is folder named `eSim` inside this compressed file) and name it as `nghdl-src.7z`.\
-(7z compression tool can be downloaded from - https://www.7-zip.org/download.html )
-
-7. ALong with `nghdl-src.7z` from step 5, place the following 7z files at the installer folder for eSim.
-(these can be obtained under *sources/* folder in the repository )
-- ghdl.7z
-- MSYS.7z
-- mingw64.7z
-
-- ngspice-nghdl.7z ( this file can be obtained by decompressing `ngspice-nghdl.tar.xz` file present at `master branch` of this repository and recompressing using 7z tool)
-
-8.  Place the script `installnghdl.nsi` at the eSim installer location.
-
-9. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script.nsi` file). Now only use the generated installer for distribution.
-- 
cgit 


From 87f2b459db9251df785b079ae97180f87d0d769b Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 6 Aug 2020 19:18:14 +0530
Subject: Update README.md

---
 Windows/README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Windows')

diff --git a/Windows/README.md b/Windows/README.md
index 6f5aae9..bf3e7ca 100644
--- a/Windows/README.md
+++ b/Windows/README.md
@@ -98,9 +98,10 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 (these can be obtained under *sources/* folder in the repository )
 - ghdl.7z
 - MSYS.7z
-- ngspice-nghdl.7z
 - mingw64.7z
 
+- ngspice-nghdl.7z ( this file can be obtained by decompressing `ngspice-nghdl.tar.xz` file present at `master branch` of this repository and recompressing using 7z tool)
+
 8.  Place the script `installnghdl.nsi` at the eSim installer location.
 
 9. Follow the rest of the instructions for packging eSim [https://github.com/FOSSEE/eSim/tree/installers/Windows] and compile the NSI script (`esim-setup-script.nsi` file). Now only use the generated installer for distribution.
-- 
cgit 


From 335ae3ddf3910315dda1cf274054b40635c304fe Mon Sep 17 00:00:00 2001
From: Bladen Martin
Date: Thu, 6 Aug 2020 19:20:06 +0530
Subject: Update README.md

---
 Windows/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Windows')

diff --git a/Windows/README.md b/Windows/README.md
index bf3e7ca..f63e717 100644
--- a/Windows/README.md
+++ b/Windows/README.md
@@ -29,7 +29,7 @@ It contains all the documenation for making NGHDL executable (using PyInstaller)
 
 6. Install all Python dependencies for NGHDL within the virtual environment as:
 		
-		- Install PyInstaller, tornado, SetupTools through pip :
+		- Install PyInstaller, SetupTools through pip :
 
 			$ pip install pyinstaller
 			$ pip install --upgrade 'setuptools<45.0.0'
-- 
cgit