Merge pull request #194 from rahulp13/master

Verilator support and fixes crash issues

24 files changed, 426 insertions, 281 deletions

diff --git a/eSim.bat b/eSim.bat
deleted file mode 100644
index 690605d8..00000000
--- a/eSim.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off 
-set HOME=C:\Users\<username>\
-start eSim.exe
-cd /d %HOME%
\ No newline at end of file
diff --git a/src/maker/tlv/clk_gate.v b/library/tlv/clk_gate.v
index 77e9186d..77e9186d 100755
--- a/src/maker/tlv/clk_gate.v
+++ b/library/tlv/clk_gate.v
diff --git a/src/maker/lint_off.txt b/library/tlv/lint_off.txt
index 5d4b7f0a..5d4b7f0a 100755
--- a/src/maker/lint_off.txt
+++ b/library/tlv/lint_off.txt
diff --git a/src/maker/tlv/pseudo_rand.m4out.tlv b/library/tlv/pseudo_rand.m4out.tlv
index cb0d6149..cb0d6149 100755
--- a/src/maker/tlv/pseudo_rand.m4out.tlv
+++ b/library/tlv/pseudo_rand.m4out.tlv
diff --git a/src/maker/tlv/pseudo_rand.sv b/library/tlv/pseudo_rand.sv
index a9988b58..a9988b58 100755
--- a/src/maker/tlv/pseudo_rand.sv
+++ b/library/tlv/pseudo_rand.sv
diff --git a/src/maker/tlv/pseudo_rand_gen.sv b/library/tlv/pseudo_rand_gen.sv
index ec008179..ec008179 100755
--- a/src/maker/tlv/pseudo_rand_gen.sv
+++ b/library/tlv/pseudo_rand_gen.sv
diff --git a/src/maker/tlv/sandpiper.vh b/library/tlv/sandpiper.vh
index ccba8b0e..ccba8b0e 100755
--- a/src/maker/tlv/sandpiper.vh
+++ b/library/tlv/sandpiper.vh
diff --git a/src/maker/tlv/sandpiper_gen.vh b/library/tlv/sandpiper_gen.vh
index d063661a..d063661a 100755
--- a/src/maker/tlv/sandpiper_gen.vh
+++ b/library/tlv/sandpiper_gen.vh
diff --git a/src/maker/tlv/sp_default.vh b/library/tlv/sp_default.vh
index 5e74259a..5e74259a 100755
--- a/src/maker/tlv/sp_default.vh
+++ b/library/tlv/sp_default.vh
diff --git a/src/configuration/Appconfig.py b/src/configuration/Appconfig.py
index 21fd717e..e41fc218 100644
--- a/src/configuration/Appconfig.py
+++ b/src/configuration/Appconfig.py
@@ -34,9 +34,14 @@ class Appconfig(QtWidgets.QWidget):
     """
 
     # Home directory
+    if os.name == 'nt':
+        user_home = os.path.join('library', 'config')
+    else:
+        user_home = os.path.expanduser('~')
+
     try:
         file = open(os.path.join(
-            os.path.expanduser("~"), ".esim/workspace.txt"), 'r'
+            user_home, ".esim/workspace.txt"), 'r'
         )
         workspace_check, home = file.readline().split(' ', 1)
         file.close()
@@ -65,11 +70,8 @@ class Appconfig(QtWidgets.QWidget):
 
     parser_esim = ConfigParser()
     parser_esim.read(
-        os.path.join(
-            os.path.expanduser("~"),
-            os.path.join(
-                '.esim',
-                'config.ini')))
+        os.path.join(user_home, '.esim', 'config.ini')
+    )
 
     # Try catch added, since eSim cannot be accessed under parser for Win10
     try:
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index cc69c2af..24955c60 100755..100644
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -11,16 +11,16 @@
 #         NOTES: ---
 #        AUTHOR: Fahim Khan, fahim.elex@gmail.com
 #      MODIFIED: Rahul Paknikar, rahulp@iitb.ac.in
-#                Sumanto Kar, sumantokar@iitb.ac.in, FOSSEE, IIT Bombay
+#                Sumanto Kar, sumantokar@iitb.ac.in
 #  ORGANIZATION: eSim Team at FOSSEE, IIT Bombay
 #       CREATED: Tuesday 24 February 2015
-#      REVISION: Wednesday 25 August 2021
+#      REVISION: Monday 31 January 2022
 # =========================================================================
 
 import os
-
 import traceback
-if os.name == 'nt':     # noqa
+
+if os.name == 'nt':
     from frontEnd import pathmagic  # noqa:F401
     init_path = ''
 else:
@@ -90,7 +90,7 @@ class Application(QtWidgets.QMainWindow):
 
             - Top-tool-bar (New project, Open project, Close project, \
                 Mode switch, Help option)
-            - Left-tool-bar (Open Schematic, Convert KiCad to NgSpice, \
+            - Left-tool-bar (Open Schematic, Convert KiCad to Ngspice, \
                 Simuation, Model Editor, Subcircuit, NGHDL, Modelica \
                 Converter, OM Optimisation)
         """
@@ -187,7 +187,7 @@ class Application(QtWidgets.QMainWindow):
 
         self.conversion = QtWidgets.QAction(
             QtGui.QIcon(init_path + 'images/ki-ng.png'),
-            '<b>Convert Kicad to Ngspice</b>', self
+            '<b>Convert KiCad to Ngspice</b>', self
         )
         self.conversion.triggered.connect(self.obj_kicad.openKicadToNgspice)
 
@@ -210,7 +210,7 @@ class Application(QtWidgets.QMainWindow):
         self.subcircuit.triggered.connect(self.open_subcircuit)
 
         self.nghdl = QtWidgets.QAction(
-            QtGui.QIcon(init_path + 'images/nghdl.png'), '<b>Nghdl</b>', self
+            QtGui.QIcon(init_path + 'images/nghdl.png'), '<b>NGHDL</b>', self
         )
         self.nghdl.triggered.connect(self.open_nghdl)
 
@@ -516,7 +516,7 @@ class Application(QtWidgets.QMainWindow):
             self.msg.setWindowTitle("Error Message")
             self.msg.setModal(True)
             self.msg.showMessage(
-                'Please save and close all the Kicad ' +
+                'Please save and close all the KiCad ' +
                 'windows first, then change the mode'
             )
             self.msg.exec_()
@@ -560,35 +560,42 @@ class Application(QtWidgets.QMainWindow):
             if self.obj_Mainview.obj_dockarea.ngspiceEditor(
                     self.projDir) is False:
                 print(
-                    "No netlist file (*.cir.out)"
-                    "Check netlist file to change simulation parameters."
+                    "Netlist file (*.cir.out) not found."
                 )
 
                 self.msg = QtWidgets.QErrorMessage()
                 self.msg.setModal(True)
-                self.msg.setWindowTitle("Warning Message")
+                self.msg.setWindowTitle("Error Message")
                 self.msg.showMessage(
-                    'No netlist file (*.cir.out)'
+                    'Netlist file (*.cir.out) not found.'
                 )
                 self.msg.exec_()
                 return
+
             currTime = time.time()
             count = 0
             while True:
                 try:
+                    # if os.name == 'nt':
+                    #     proc = 'mintty'
+                    # else:
+                    #     proc = 'xterm'
+
                     # Edited by Sumanto Kar 25/08/2021
-                    st = os.stat(os.path.join(self.projDir, "plot_data_i.txt"))
-                    if self.checkIfProcessRunning('xterm') is False:
+                    if os.name != 'nt' and \
+                            self.checkIfProcessRunning('xterm') is False:
                         self.msg = QtWidgets.QErrorMessage()
                         self.msg.setModal(True)
                         self.msg.setWindowTitle("Warning Message")
                         self.msg.showMessage(
-                            'Simulation was interuppted. '
-                            'Please close all the Xterm windows.'
-                            'And then rerun the simulation'
+                            'Simulation was interrupted/failed. '
+                            'Please close all the Ngspice windows '
+                            'and then rerun the simulation.'
                         )
                         self.msg.exec_()
                         return
+
+                    st = os.stat(os.path.join(self.projDir, "plot_data_i.txt"))
                     if st.st_mtime >= currTime:
                         break
                 except Exception:
@@ -788,8 +795,8 @@ class Application(QtWidgets.QMainWindow):
             self.msg.setModal(True)
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage(
-                'Please select the project first. ' +
-                'You can either create a new project or open existing project'
+                'Please select the project first. You can either ' +
+                'create a new project or open an existing project'
             )
             self.msg.exec_()
 
@@ -920,9 +927,12 @@ def main(args):
     appView.obj_workspace.returnWhetherClickedOrNot(appView)
 
     try:
-        file = open(os.path.join(
-            os.path.expanduser("~"), ".esim/workspace.txt"), 'r'
-        )
+        if os.name == 'nt':
+            user_home = os.path.join('library', 'config')
+        else:
+            user_home = os.path.expanduser('~')
+
+        file = open(os.path.join(user_home, ".esim/workspace.txt"), 'r')
         work = int(file.read(1))
         file.close()
     except IOError:
diff --git a/src/frontEnd/Workspace.py b/src/frontEnd/Workspace.py
index 4d033539..fca73e39 100755
--- a/src/frontEnd/Workspace.py
+++ b/src/frontEnd/Workspace.py
@@ -124,9 +124,13 @@ class Workspace(QtWidgets.QWidget):
 
         self.obj_appconfig.workspace_check = self.chkbox.checkState()
         print(self.workspace_loc.text())
-        file = open(os.path.join(
-            os.path.expanduser("~"), ".esim/workspace.txt"), 'w'
-        )
+
+        if os.name == 'nt':
+            user_home = os.path.join('library', 'config')
+        else:
+            user_home = os.path.expanduser('~')
+
+        file = open(os.path.join(user_home, ".esim/workspace.txt"), 'w')
         file.writelines(
             str(self.obj_appconfig.workspace_check) +
             " " + self.workspace_loc.text()
diff --git a/src/kicadtoNgspice/KicadtoNgspice.py b/src/kicadtoNgspice/KicadtoNgspice.py
index 93cf6a4e..28294be1 100644
--- a/src/kicadtoNgspice/KicadtoNgspice.py
+++ b/src/kicadtoNgspice/KicadtoNgspice.py
@@ -663,7 +663,7 @@ class MainWindow(QtWidgets.QWidget):
             print("=========================================================")
             self.createNetlistFile(store_schematicInfo, plotText)
 
-            self.msg = "The Kicad to Ngspice Conversion completed "
+            self.msg = "The KiCad to Ngspice conversion completed "
             self.msg += "successfully!"
             QtWidgets.QMessageBox.information(
                 self, "Information", self.msg, QtWidgets.QMessageBox.Ok
diff --git a/src/kicadtoNgspice/Processing.py b/src/kicadtoNgspice/Processing.py
index 494c49b4..94a2e51f 100644
--- a/src/kicadtoNgspice/Processing.py
+++ b/src/kicadtoNgspice/Processing.py
@@ -318,7 +318,7 @@ class PrcocessNetlist:
                                 for item in param:
                                     # print "Tags ",item.tag
                                     # print "Value",item.text
-                                    if 'vector'in item.attrib:
+                                    if 'vector' in item.attrib:
                                         # print "Tag having vector attribute",\
                                         # item.tag,item.attrib['vector']
                                         temp_count = 1
diff --git a/src/maker/Appconfig.py b/src/maker/Appconfig.py
index efeac75a..06758898 100755
--- a/src/maker/Appconfig.py
+++ b/src/maker/Appconfig.py
@@ -1,11 +1,15 @@
 import os.path
-from configparser import SafeConfigParser
+from configparser import ConfigParser
 
 
 class Appconfig:
-    home = os.path.expanduser("~")
+    if os.name == 'nt':
+        home = os.path.join('library', 'config')
+    else:
+        home = os.path.expanduser('~')
+
     # Reading all variables from eSim config.ini
-    parser_esim = SafeConfigParser()
+    parser_esim = ConfigParser()
     parser_esim.read(os.path.join(home, os.path.join('.esim', 'config.ini')))
     try:
         src_home = parser_esim.get('eSim', 'eSim_HOME')
@@ -16,7 +20,7 @@ class Appconfig:
     esimFlag = 0
 
     # Reading all variables from ngveri config.ini
-    # parser_ngveri = SafeConfigParser()
+    # parser_ngveri = ConfigParser()
     # parser_ngveri.read(os.path.join(home,
     # os.path.join('.ngveri', 'config.ini')))
 
diff --git a/src/maker/Maker.py b/src/maker/Maker.py
index f4c696f6..c7a66204 100755
--- a/src/maker/Maker.py
+++ b/src/maker/Maker.py
@@ -27,17 +27,11 @@
 # =========================================================================
 
 # importing the files and libraries
-from xml.etree import ElementTree as ET  # noqa:F401
 import hdlparse.verilog_parser as vlog
-import time  # noqa:F401
 from PyQt5 import QtCore, QtWidgets
-from PyQt5.QtCore import QThread, Qt  # noqa:F401
-from PyQt5.QtWidgets \
-    import QApplication, \
-    QWidget, QLabel, QVBoxLayout  # noqa:F401
+from PyQt5.QtCore import QThread
 from configuration.Appconfig import Appconfig
 import os
-import subprocess  # noqa:F401
 import watchdog.events
 import watchdog.observers
 from os.path import expanduser
@@ -50,9 +44,31 @@ home = expanduser("~")
 verilogFile = []
 toggle_flag = []
 
-# beginning class Maker. This class create the Maker Tab
+
+# This function is called to accept TOS of makerchip
+def makerchipTOSAccepted(display=True):
+    if not os.path.isfile(home + "/.makerchip_accepted"):
+        if display:
+            reply = QtWidgets.QMessageBox.warning(
+                None, "Terms of Service", "Please review the Makerchip \
+                       Terms of Service \
+                       (<a href='https://www.makerchip.com/terms/'>\
+                       https://www.makerchip.com/terms/</a>). \
+                       Have you read and do you \
+                       accept these Terms of Service?",
+                QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No
+            )
+
+            if reply == QtWidgets.QMessageBox.Yes:
+                f = open(home + "/.makerchip_accepted", "w")
+                f.close()
+                return True
+
+        return False
+    return True
 
 
+# beginning class Maker. This class create the Maker Tab
 class Maker(QtWidgets.QWidget):
 
     # initailising the varaibles
@@ -79,15 +95,15 @@ class Maker(QtWidgets.QWidget):
         # self.grid.addWidget(self.creategroup(), 1, 0, 5, 0)
         self.show()
 
-    # This function is to Add new  verilog file
+    # This function is to Add new verilog file
     def addverilog(self):
 
-        init_path = '../../../'
+        init_path = '../../'
         if os.name == 'nt':
             init_path = ''
         self.verilogfile = QtCore.QDir.toNativeSeparators(
             QtWidgets.QFileDialog.getOpenFileName(
-                self, "Open verilog Directory",
+                self, "Open Verilog Directory",
                 init_path + "home", "*v"
             )[0]
         )
@@ -98,11 +114,16 @@ class Maker(QtWidgets.QWidget):
             reply = QtWidgets.QMessageBox.critical(
                 None,
                 "Error Message",
-                "<b>Error: No Verilog File Chosen.\
-                Please chose a Verilog file</b>",
+                "<b>No Verilog File Chosen. \
+                Please choose a verilog file.</b>",
                 QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel)
+
             if reply == QtWidgets.QMessageBox.Ok:
                 self.addverilog()
+
+                if self.verilogfile == "":
+                    return
+
                 self.obj_Appconfig.print_info('Add Verilog File Called')
 
             elif reply == QtWidgets.QMessageBox.Cancel:
@@ -168,32 +189,29 @@ class Maker(QtWidgets.QWidget):
 
     # This function is used to save the edited file in eSim
     def save(self):
-        wr = self.entry_var[1].toPlainText()
-        open(self.verilogfile, "w+").write(wr)
+        try:
+            wr = self.entry_var[1].toPlainText()
+            open(self.verilogfile, "w+").write(wr)
+        except BaseException as err:
+            self.msg = QtWidgets.QErrorMessage(self)
+            self.msg.setModal(True)
+            self.msg.setWindowTitle("Error Message")
+            self.msg.showMessage(
+                "Error in saving verilog file. Please check if it is chosen."
+            )
+            self.msg.exec_()
+            print("Error in saving verilog file: " + str(err))
 
     # This is used to run the makerchip-app
     def runmakerchip(self):
         init_path = '../../'
         if os.name == 'nt':
-            init_path = ''  # noqa:F841
+            init_path = ''
         try:
-            if not os.path.isfile(home + "/.makerchip_accepted"):
-                reply = QtWidgets.QMessageBox.warning(
-                    None, "Terms of Services", "Please review the makerchip\
-                         Terms of Service \
-                         (<a href='https://www.makerchip.com/terms/'>\
-                         https://www.makerchip.com/terms/</a> ).\
-                          Have you read and do you accept \
-                          these Terms of Service? [y/N]:",
-                    QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No
-                )
+            if not makerchipTOSAccepted(True):
+                return
 
-                if reply == QtWidgets.QMessageBox.Yes:
-                    f = open(home + "/.makerchip_accepted", "w")
-                    f.close()
-                else:
-                    return
-            print("Running Makerchip..............................")
+            print("Running Makerchip IDE...........................")
             # self.file = open(self.verilogfile,"w")
             # self.file.write(self.entry_var[1].toPlainText())
             # self.file.close()
@@ -201,14 +219,15 @@ class Maker(QtWidgets.QWidget):
             if self.verilogfile.split('.')[-1] != "tlv":
                 reply = QtWidgets.QMessageBox.warning(
                     None,
-                    "Do you want to automate top module?",
-                    "<b>Click on YES if you want top module \
-                    to be automatically added. \
-                    NOTE: a .tlv file will be created \
-                    in the directory of current verilog file\
-                        and the makerchip will be running on \
-                        this file. Otherwise click on NO.</b><br/> \
-                    <b> To not open Makerchip, click CANCEL</b>",
+                    "Do you want to automate the top module? ",
+                    "<b>Click on YES button if you want the top module \
+                    to be added automatically. A .tlv file will be created \
+                    in the directory of current verilog file \
+                    and the Makerchip IDE will be running on \
+                    this file. Otherwise click on NO button. \
+                    To not open Makerchip IDE, click on CANCEL button. </b>\
+                    <br><br> NOTE: Makerchip IDE requires an active \
+                    internet connection and a browser.",
                     QtWidgets.QMessageBox.Yes
                     | QtWidgets.QMessageBox.No
                     | QtWidgets.QMessageBox.Cancel)
@@ -222,13 +241,13 @@ class Maker(QtWidgets.QWidget):
                     file = os.path.basename('.'.join(
                         self.verilogfile.split('.')[:-1]))
                     f = open(filename, 'w')
-                    flag = 1  # noqa F841
-                    ports = ""  # noqa F841
                     code = code.replace(" wire ", " ")
                     code = code.replace(" reg ", " ")
                     vlog_ex = vlog.VerilogExtractor()
                     vlog_mods = vlog_ex.extract_objects_from_source(code)
-                    lint_off = open("../maker/lint_off.txt").readlines()
+                    lint_off = open(
+                        init_path + "library/tlv/lint_off.txt"
+                    ).readlines()
                     string = '''\\TLV_version 1d: tl-x.org\n\\SV\n'''
                     for item in lint_off:
                         string += "/* verilator lint_off " + \
@@ -257,11 +276,11 @@ output logic passed, output logic failed);\n'''
                             "Error Message",
                             "<b>Error: File name and module \
                             name are not same. Please \
-                            ensure that they are same</b>",
+                            ensure that they are same.</b>",
                             QtWidgets.QMessageBox.Ok)
 
                         self.obj_Appconfig.print_info(
-                            'NgVeri Stopped due to File \
+                            'NgVeri stopped due to file \
 name and module name not matching error')
                         return
                     string += "//The $random() can be replaced \
@@ -301,7 +320,7 @@ Add \\TLV here if desired\
             print("File: " + filename)
             self.process.start(cmd)
             print(
-                "Makerchip command process pid ---------- >",
+                "Makerchip IDE command process pid ---------->",
                 self.process.pid())
         except BaseException as e:
             print(e)
@@ -309,11 +328,11 @@ Add \\TLV here if desired\
             self.msg.setModal(True)
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage(
-                "Error in running Makerchip. \
-Please check if Verilog File Chosen.")
+                "Error in running Makerchip IDE. \
+Please check if verilog file is chosen.")
             self.msg.exec_()
-            print("Error in running Makerchip. \
-Please check if Verilog File Chosen.")
+            print("Error in running Makerchip IDE. \
+Please check if verilog file is chosen.")
         #   initial = self.read_file()
 
         # while True:
@@ -357,44 +376,27 @@ Please check if Verilog File Chosen.")
         # self.optionsbox.setLayout(self.optionsgrid)
         # self.grid.addWidget(self.creategroup(), 1, 0, 5, 0)
         self.runoptions = QtWidgets.QPushButton("Edit in Makerchip")
+        self.runoptions.setToolTip(
+            "Requires internet connection and a browser"
+        )
+        self.runoptions.setToolTipDuration(5000)
         self.optionsgroupbtn.addButton(self.runoptions)
         self.runoptions.clicked.connect(self.runmakerchip)
         self.optionsgrid.addWidget(self.runoptions, 0, 4)
         # self.optionsbox.setLayout(self.optionsgrid)
         # self.grid.addWidget(self.creategroup(), 1, 0, 5, 0)
-        if not os.path.isfile(home + "/.makerchip_accepted"):
+        if not makerchipTOSAccepted(False):
             self.acceptTOS = QtWidgets.QPushButton("Accept Makerchip TOS")
             self.optionsgroupbtn.addButton(self.acceptTOS)
-            self.acceptTOS.clicked.connect(self.makerchipaccepted)
+            self.acceptTOS.clicked.connect(lambda: makerchipTOSAccepted(True))
             self.optionsgrid.addWidget(self.acceptTOS, 0, 5)
             # self.optionsbox.setLayout(self.optionsgrid)
             # self.grid.addWidget(self.creategroup(), 1, 0, 5, 0)
         self.optionsbox.setLayout(self.optionsgrid)
         return self.optionsbox
 
-    # This function is called to accept TOS of makerchip
-
-    def makerchipaccepted(self):
-        reply = QtWidgets.QMessageBox.warning(
-            None, "Terms of Services", "Please review the makerchip\
-                         Terms of Service \
-                         (<a href='https://www.makerchip.com/terms/'>\
-                         https://www.makerchip.com/terms/</a> ).\
-                          Have you read and do you \
-                          accept these Terms of Service? [y/N]:",
-            QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No
-        )
-
-        if reply == QtWidgets.QMessageBox.Yes:
-            f = open(home + "/.makerchip_accepted", "w")
-            f.close()
-        # else:
-        #    return
-
     # This function adds the other parts of widget like text box
-
     def creategroup(self):
-
         self.trbox = QtWidgets.QGroupBox()
         self.trbox.setTitle(".tlv file")
         # self.trbox.setDisabled(True)
@@ -405,7 +407,7 @@ Please check if Verilog File Chosen.")
         self.start = QtWidgets.QLabel("Path to .tlv file")
         self.trgrid.addWidget(self.start, 1, 0)
         self.count = 0
-        self.entry_var[self.count] = QtWidgets.QLabel(" - ")
+        self.entry_var[self.count] = QtWidgets.QLabel()
         self.trgrid.addWidget(self.entry_var[self.count], 1, 1)
         self.entry_var[self.count].setMaximumWidth(1000)
         self.count += 1
diff --git a/src/maker/ModelGeneration.py b/src/maker/ModelGeneration.py
index caafe3c8..49d5da0b 100755
--- a/src/maker/ModelGeneration.py
+++ b/src/maker/ModelGeneration.py
@@ -30,20 +30,14 @@
 # importing the files and libraries
 import re
 import os
-import sys  # noqa:F401
-import shutil  # noqa:F401
-import subprocess  # noqa:F401
-from PyQt5 import QtGui, QtCore, QtWidgets  # noqa:F401
-from PyQt5.QtGui import *  # noqa:F401 F403
-from configparser import ConfigParser  # noqa:F401
+from PyQt5 import QtCore, QtWidgets
+from configparser import ConfigParser
 from configuration import Appconfig
 from . import createkicad
 import hdlparse.verilog_parser as vlog
-from configparser import SafeConfigParser  # noqa:F401
-
-# Class is used to generate the Ngspice Model
 
 
+# Class is used to generate the Ngspice Model
 class ModelGeneration(QtWidgets.QWidget):
 
     # initialising the variables
@@ -52,27 +46,36 @@ class ModelGeneration(QtWidgets.QWidget):
         super().__init__()
         self.obj_Appconfig = Appconfig.Appconfig()
         print("Argument is : ", file)
-        self.file = file
+
+        if os.name == 'nt':
+            self.file = file.replace('\\', '/')
+        else:
+            self.file = file
+
         self.termedit = termedit
         self.cur_dir = os.getcwd()
         self.fname = os.path.basename(file)
         self.fname = self.fname.lower()
         print("Verilog/SystemVerilog/TL Verilog filename is : ", self.fname)
-        self.home = os.path.expanduser("~")
-        self.parser = SafeConfigParser()
+
+        if os.name == 'nt':
+            self.home = os.path.join('library', 'config')
+        else:
+            self.home = os.path.expanduser('~')
+
+        self.parser = ConfigParser()
         self.parser.read(os.path.join(
             self.home, os.path.join('.nghdl', 'config.ini')))
-        self.ngspice_home = self.parser.get('NGSPICE', 'NGSPICE_HOME')
-        self.release_dir = self.parser.get('NGSPICE', 'RELEASE')
+        self.nghdl_home = self.parser.get('NGHDL', 'NGHDL_HOME')
+        self.release_dir = self.parser.get('NGHDL', 'RELEASE')
         self.src_home = self.parser.get('SRC', 'SRC_HOME')
         self.licensefile = self.parser.get('SRC', 'LICENSE')
-        self.digital_home = self.parser.get('NGSPICE', 'DIGITAL_MODEL')
-
-        self.digital_home = self.digital_home.split("/ghdl")[0] + "/Ngveri"
+        self.digital_home = self.parser.get(
+                            'NGHDL', 'DIGITAL_MODEL') + "/Ngveri"
         # # #### Creating connection_info.txt file from verilog file #### #
 
-    # Readinf the file and performing operations and copying it in the Ngspice
-    # folder
+    # Reading the file and performing operations and
+    # copying it in the Ngspice folder
     def verilogfile(self):
         Text = "<span style=\" font-size:25pt;\
          font-weight:1000; color:#008000;\" >"
@@ -104,14 +107,21 @@ class ModelGeneration(QtWidgets.QWidget):
         f.write("\n")
         f.close()
 
-    # This function is call the sandpiper to convert .tlv file to .sv file
+    # This function calls the sandpiper to convert .tlv file to .sv file
     def sandpiper(self):
+        init_path = '../../'
+        if os.name == 'nt':
+            init_path = ''
         # Text="Running Sandpiper............"
         print("Running Sandpiper-Saas for TLV to SV Conversion")
-        self.cmd = "cp ../maker/tlv/clk_gate.v ../maker/tlv/pseudo_rand.sv \
-../maker/tlv/sandpiper.vh ../maker/tlv/sandpiper_gen.vh \
-../maker/tlv/sp_default.vh ../maker/tlv/pseudo_rand_gen.sv \
-../maker/tlv/pseudo_rand.m4out.tlv " + self.file + " " + self.modelpath
+        self.cmd = "cp " + init_path + "library/tlv/clk_gate.v " + \
+                   init_path + "library/tlv/pseudo_rand.sv " + \
+                   init_path + "library/tlv/sandpiper.vh " + \
+                   init_path + "library/tlv/sandpiper_gen.vh " + \
+                   init_path + "library/tlv/sp_default.vh " + \
+                   init_path + "library/tlv/pseudo_rand_gen.sv " + \
+                   init_path + "library/tlv/pseudo_rand.m4out.tlv " + \
+                   self.file + " " + self.modelpath
 
         self.process = QtCore.QProcess(self)
         self.args = ['-c', self.cmd]
@@ -127,8 +137,9 @@ class ModelGeneration(QtWidgets.QWidget):
         self.cmd = "sandpiper-saas -i " + \
             self.fname.split('.')[0] + ".tlv -o "\
             + self.fname.split('.')[0] + ".sv"
-        self.args = ['-c', self.cmd]
-        self.process.start('sh', self.args)
+        # self.args = ['-c', self.cmd]
+        # self.process.start('sh', self.args)
+        self.process.start(self.cmd)
         self.termtitle("RUN SANDPIPER-SAAS")
         self.termtext("Current Directory: " + self.modelpath)
         self.termtext("Command: " + self.cmd)
@@ -196,7 +207,7 @@ class ModelGeneration(QtWidgets.QWidget):
                 QtWidgets.QMessageBox.Ok)
 
             self.obj_Appconfig.print_info(
-                'NgVeri Stopped due to File \
+                'NgVeri stopped due to file \
                 name and module name not matching error')
             return "Error"
         modelname = str(m.name)
@@ -439,7 +450,7 @@ and set the load for input ports */
         cfunc.write("\n")
 
         # if os.name == 'nt':
-        #     digital_home = parser.get('NGSPICE', 'DIGITAL_MODEL')
+        #     digital_home = parser.get('NGHDL', 'DIGITAL_MODEL')
         #     msys_home = parser.get('COMPILER', 'MSYS_HOME')
         #     cmd_str2 = "/start_server.sh %d %s & read" + "\\" + "\"" + "\""
         #     cmd_str1 = os.path.normpath(
@@ -456,7 +467,7 @@ and set the load for input ports */
         # else:
         #     cfunc.write(
         #         '\t\tsnprintf(command,1024,"' + home +
-        #         '/ngspice-nghdl/src/xspice/icm/ghdl/' +
+        #         '/nghdl-simulator/src/xspice/icm/ghdl/' +
         #         fname.split('.')[0] +
         #         '/DUTghdl/start_server.sh %d %s &", sock_port, my_ip);'
         #     )
@@ -790,18 +801,30 @@ and set the load for input ports */
 
     # This function is used to run the Verilator using the verilator commands
     def run_verilator(self):
+        init_path = '../../'
+        if os.name == 'nt':
+            init_path = ''
+
         self.cur_dir = os.getcwd()
-        file = open("../maker/lint_off.txt").readlines()
         wno = " "
-        for item in file:
-            wno += " -Wno-" + item.strip("\n")
+        with open(init_path + "library/tlv/lint_off.txt") as file:
+            for item in file.readlines():
+                if item and item.strip():
+                    wno += " -Wno-" + item.strip("\n")
+
         print("Running Verilator.............")
         os.chdir(self.modelpath)
-        self.release_home = self.parser.get('NGSPICE', 'RELEASE')
+        self.release_home = self.parser.get('NGHDL', 'RELEASE')
         # print(self.modelpath)
 
-        self.cmd = "verilator -Wall " + wno + "\
-         --cc --exe --no-MMD --Mdir . -CFLAGS -fPIC  sim_main_" + \
+        if os.name == 'nt':
+            self.msys_home = self.parser.get('COMPILER', 'MSYS_HOME')
+            self.cmd = "export VERILATOR_ROOT=" + self.msys_home + "/mingw64; "
+        else:
+            self.cmd = ''
+
+        self.cmd = self.cmd + "verilator -Wall " + wno + " \
+         --cc --exe --no-MMD --Mdir . -CFLAGS -fPIC sim_main_" + \
             self.fname.split('.')[0] + ".cpp " + self.fname
         self.process = QtCore.QProcess(self)
         self.process.readyReadStandardOutput.connect(self.readAllStandard)
@@ -823,10 +846,21 @@ and set the load for input ports */
         self.cur_dir = os.getcwd()
         print("Make Verilator.............")
         os.chdir(self.modelpath)
-        self.cmd = "make -f V" + self.fname.split('.')[0]\
+
+        if os.path.exists(self.modelpath + "../verilated.o"):
+            os.remove(self.modelpath + "../verilated.o")
+
+        if os.name == 'nt':
+            # path to msys home directory
+            self.msys_home = self.parser.get('COMPILER', 'MSYS_HOME')
+            self.cmd = self.msys_home + "/mingw64/bin/mingw32-make.exe"
+        else:
+            self.cmd = "make"
+
+        self.cmd = self.cmd + " -f V" + self.fname.split('.')[0]\
             + ".mk V" + self.fname.split(
             '.')[0] + "__ALL.a sim_main_" \
-            + self.fname.split('.')[0] + ".o verilated.o"
+            + self.fname.split('.')[0] + ".o ../verilated.o"
         self.process = QtCore.QProcess(self)
         self.process.readyReadStandardOutput.connect(self.readAllStandard)
         self.process.start('sh', ['-c', self.cmd])
@@ -848,8 +882,8 @@ and set the load for input ports */
         self.cur_dir = os.getcwd()
         print("Copying the required files to Release Folder.............")
         os.chdir(self.modelpath)
-        self.release_home = self.parser.get('NGSPICE', 'RELEASE')
-        path_icm = os.path.join(self.release_home, "src/xspice/icm/Ngveri/")
+        self.release_home = self.parser.get('NGHDL', 'RELEASE')
+        path_icm = self.release_home + "/src/xspice/icm/Ngveri/"
         if not os.path.isdir(path_icm + self.fname.split('.')[0]):
             os.mkdir(path_icm + self.fname.split('.')[0])
         path_icm = path_icm + self.fname.split('.')[0]
@@ -861,9 +895,11 @@ and set the load for input ports */
             os.remove(path_icm + "sim_main_" + self.fname.split('.')[0] + ".o")
         if os.path.exists(
             self.release_home +
-            "src/xspice/icm/" +
+            "src/xspice/icm/Ngveri/" +
                 "verilated.o"):
-            os.remove(self.release_home + "src/xspice/icm/" + "verilated.o")
+            os.remove(
+                self.release_home + "src/xspice/icm/Ngveri/" + "verilated.o"
+            )
         if os.path.exists(
             path_icm +
             "V" +
@@ -886,8 +922,8 @@ and set the load for input ports */
             self.termtext("Current Directory: " + self.modelpath)
             self.termtext("Command: " + self.cmd)
             self.process.waitForFinished(50000)
-            self.cmd = "cp verilated.o " + self.release_home \
-                + "/src/xspice/icm/"
+            self.cmd = "cp ../verilated.o " + self.release_home \
+                + "/src/xspice/icm/Ngveri/"
             self.process.start('sh', ['-c', self.cmd])
             self.termtext("Command: " + self.cmd)
             self.process \
@@ -901,20 +937,19 @@ and set the load for input ports */
     # Running the make command for Ngspice
     def runMake(self):
         print("run Make Called")
-        self.release_home = self.parser.get('NGSPICE', 'RELEASE')
+        self.release_home = self.parser.get('NGHDL', 'RELEASE')
         path_icm = os.path.join(self.release_home, "src/xspice/icm")
         os.chdir(path_icm)
 
         try:
             if os.name == 'nt':
-                # path to msys bin directory where make is located
-                self.msys_bin = self.parser.get('COMPILER', 'MSYS_HOME')
-                self.cmd = self.msys_bin + "\\make.exe"
+                # path to msys home directory
+                self.msys_home = self.parser.get('COMPILER', 'MSYS_HOME')
+                self.cmd = self.msys_home + "/mingw64/bin/mingw32-make.exe"
             else:
                 self.cmd = "make"
 
             print("Running Make command in " + path_icm)
-            path = os.getcwd()  # noqa
             self.process = QtCore.QProcess(self)
             self.process.start('sh', ['-c', self.cmd])
             print("make command process pid ---------- >", self.process.pid())
@@ -936,18 +971,18 @@ and set the load for input ports */
     def runMakeInstall(self):
         self.cur_dir = os.getcwd()
         print("run Make Install Called")
-        self.release_home = self.parser.get('NGSPICE', 'RELEASE')
+        self.release_home = self.parser.get('NGHDL', 'RELEASE')
         path_icm = os.path.join(self.release_home, "src/xspice/icm")
         os.chdir(path_icm)
 
         try:
             if os.name == 'nt':
-                self.msys_bin = self.parser.get('COMPILER', 'MSYS_HOME')
-                self.cmd = self.msys_bin + "\\make.exe install"
+                self.msys_home = self.parser.get('COMPILER', 'MSYS_HOME')
+                self.cmd = self.msys_home + \
+                    "/mingw64/bin/mingw32-make.exe install"
             else:
                 self.cmd = "make install"
             print("Running Make Install")
-            path = os.getcwd()  # noqa
             try:
                 self.process.close()
             except BaseException:
@@ -977,26 +1012,35 @@ and set the load for input ports */
     def addfile(self):
         print("Adding the files required by the top level module file")
 
-        init_path = '../../../'
+        init_path = '../../'
         if os.name == 'nt':
             init_path = ''
+
         includefile = QtCore.QDir.toNativeSeparators(
             QtWidgets.QFileDialog.getOpenFileName(
                 self,
                 "Open adding other necessary files to be included",
                 init_path + "home")[0])
+
         if includefile == "":
             reply = QtWidgets.QMessageBox.critical(
                 None, "Error Message",
                 "<b>Error: No File Chosen. Please chose a file</b>",
                 QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel
             )
+
             if reply == QtWidgets.QMessageBox.Ok:
                 self.addfile()
+
+                if includefile == "":
+                    return
+
                 self.obj_Appconfig.print_info('Add Other Files Called')
 
             elif reply == QtWidgets.QMessageBox.Cancel:
                 self.obj_Appconfig.print_info('No File Chosen')
+                return
+
         filename = os.path.basename(includefile)
         self.modelpath = self.digital_home + \
             "/" + self.fname.split('.')[0] + "/"
@@ -1013,33 +1057,38 @@ and set the load for input ports */
         print("Added the File:" + filename)
         self.termtitle("Added the File:" + filename)
 
-    # This function is used to add additional folder required by the verilog
-    # top module
-
     def addfolder(self):
+        '''
+            This function is used to add additional folder required
+            by the verilog top module
+        '''
         # self.cur_dir = os.getcwd()
         print("Adding the folder required by the top level module file")
 
-        init_path = '../../../'
-        if os.name == 'nt':
-            init_path = ''  # noqa:F841
         includefolder = QtCore.QDir.toNativeSeparators(
             QtWidgets.QFileDialog.getExistingDirectory(
                 self, "open", "home"
             )
         )
+
         if includefolder == "":
             reply = QtWidgets.QMessageBox.critical(
                 None, "Error Message",
                 "<b>Error: No Folder Chosen. Please chose a folder</b>",
                 QtWidgets.QMessageBox.Ok | QtWidgets.QMessageBox.Cancel
             )
+
             if reply == QtWidgets.QMessageBox.Ok:
                 self.addfolder()
+
+                if includefolder == "":
+                    return
+
                 self.obj_Appconfig.print_info('Add Folder Called')
 
             elif reply == QtWidgets.QMessageBox.Cancel:
-                self.obj_Appconfig.print_info('No File Chosen')
+                self.obj_Appconfig.print_info('No Folder Chosen')
+                return
 
         self.modelpath = self.digital_home + \
             "/" + self.fname.split('.')[0] + "/"
@@ -1072,7 +1121,6 @@ and set the load for input ports */
         # os.chdir(self.cur_dir)
 
     # This function is used to print the titles in the terminal of Ngveri tab
-
     def termtitle(self, textin):
 
         Text = "<span style=\" font-size:20pt; \
@@ -1135,7 +1183,7 @@ and set the load for input ports */
     #     Text += "</span>"
     #     self.termedit.append(Text+"\n")
 
-        # init_path = '../../../'
+        # init_path = '../../'
         # if os.name == 'nt':
         #     init_path = ''
         # includefile = QtCore.QDir.toNativeSeparators(\
diff --git a/src/maker/NgVeri.py b/src/maker/NgVeri.py
index d26c9338..cb553a31 100755
--- a/src/maker/NgVeri.py
+++ b/src/maker/NgVeri.py
@@ -28,13 +28,12 @@
 
 
 # importing the files and libraries
-from PyQt5 import QtCore, QtWidgets, QtGui
+from PyQt5 import QtCore, QtWidgets
 from . import Maker
 from . import ModelGeneration
 import os
-import subprocess
+import shutil
 from configuration.Appconfig import Appconfig
-from configparser import SafeConfigParser
 from configparser import ConfigParser
 
 
@@ -47,16 +46,21 @@ class NgVeri(QtWidgets.QWidget):
         QtWidgets.QWidget.__init__(self)
         # Maker.addverilog(self)
         self.obj_Appconfig = Appconfig()
-        self.home = os.path.expanduser("~")
-        self.parser = SafeConfigParser()
+
+        if os.name == 'nt':
+            self.home = os.path.join('library', 'config')
+        else:
+            self.home = os.path.expanduser('~')
+
+        self.parser = ConfigParser()
         self.parser.read(os.path.join(
             self.home, os.path.join('.nghdl', 'config.ini')))
-        self.ngspice_home = self.parser.get('NGSPICE', 'NGSPICE_HOME')
-        self.release_dir = self.parser.get('NGSPICE', 'RELEASE')
+        self.nghdl_home = self.parser.get('NGHDL', 'NGHDL_HOME')
+        self.release_dir = self.parser.get('NGHDL', 'RELEASE')
         self.src_home = self.parser.get('SRC', 'SRC_HOME')
         self.licensefile = self.parser.get('SRC', 'LICENSE')
-        self.digital_home = self.parser.get('NGSPICE', 'DIGITAL_MODEL')
-        self.digital_home = self.digital_home.split("/ghdl")[0] + "/Ngveri"
+        self.digital_home = self.parser.get('NGHDL', 'DIGITAL_MODEL')
+        self.digital_home = self.digital_home + "/Ngveri"
         self.count = 0
         self.text = ""
         self.entry_var = {}
@@ -78,10 +82,6 @@ class NgVeri(QtWidgets.QWidget):
 
     # Adding the verilog file in Maker tab to Ngveri Tab automatically
     def addverilog(self):
-
-        init_path = '../../../'
-        if os.name == 'nt':
-            init_path = ''
         # b=Maker.Maker(self)
         print(Maker.verilogFile)
         if Maker.verilogFile[self.filecount] == "":
@@ -89,11 +89,13 @@ class NgVeri(QtWidgets.QWidget):
                 None,
                 "Error Message",
                 "<b>Error: No Verilog File Chosen. \
-                Please chose a Verilog file in Makerchip Tab</b>",
+                Please choose a verilog file in Makerchip Tab</b>",
                 QtWidgets.QMessageBox.Ok)
             if reply == QtWidgets.QMessageBox.Ok:
                 self.obj_Appconfig.print_error(
-                    'No VerilogFile. Please add a File in Makerchip Tab')
+                    'No Verilog File Chosen. '
+                    'Please choose a verilog file in Makerchip Tab'
+                )
                 return
 
         self.fname = Maker.verilogFile[self.filecount]
@@ -101,52 +103,89 @@ class NgVeri(QtWidgets.QWidget):
         file = (os.path.basename(self.fname)).split('.')[0]
         if self.entry_var[1].findText(file) == -1:
             self.entry_var[1].addItem(file)
-        model.verilogfile()
-        error = model.verilogParse()
-        if error != "Error":
-            model.getPortInfo()
-            model.cfuncmod()
-            model.ifspecwrite()
-            model.sim_main_header()
-            model.sim_main()
-            model.modpathlst()
-            model.run_verilator()
-            model.make_verilator()
-            model.copy_verilator()
-            model.runMake()
-            model.runMakeInstall()
-            txt = self.entry_var[0].toPlainText()
-            if "error" not in txt.lower():
-                self.entry_var[0].append('''
-                <p style=\"font-size:20pt; font-weight:1000; color:#00FF00;\" >
-                Model Created Successfully !
-                </p>
-                ''')
-            else:
-                self.entry_var[0].append('''
-                <p style=\"font-size:20pt; font-weight:1000; color:#FF0000;\" >
-                There was an error during model creation,
-                <br/>
-                Please rectify the error and try again !
-                </p>
-                ''')
 
-    # This function is used to add additional files required by the verilog
-    # top module
+        if not Maker.makerchipTOSAccepted(True):
+            QtWidgets.QMessageBox.warning(
+                None, "Warning Message",
+                "Please accept the Makerchip Terms of Service "
+                "to proceed further.",
+                QtWidgets.QMessageBox.Ok
+            )
+
+            return
+
+        try:
+            model.verilogfile()
+            error = model.verilogParse()
+            if error != "Error":
+                model.getPortInfo()
+                model.cfuncmod()
+                model.ifspecwrite()
+                model.sim_main_header()
+                model.sim_main()
+                model.modpathlst()
+                model.run_verilator()
+                model.make_verilator()
+                model.copy_verilator()
+                model.runMake()
+
+                if os.name != 'nt':
+                    model.runMakeInstall()
+                else:
+                    try:
+                        shutil.copy(
+                            self.release_dir +
+                            "/src/xspice/icm/Ngveri/Ngveri.cm",
+                            self.nghdl_home + "/lib/ngspice/"
+                        )
+                    except FileNotFoundError as err:
+                        self.entry_var[0].append(
+                            "Error in copying Ngveri code model: " + str(err)
+                        )
+
+                terminalLog = self.entry_var[0].toPlainText()
+                if "error" not in terminalLog.lower():
+                    self.entry_var[0].append('''
+                        <p style=\" font-size:16pt; font-weight:1000;
+                        color:#00FF00;\"> Model Created Successfully!
+                        </p>
+                    ''')
+
+                    return
+
+        except BaseException as err:
+            self.entry_var[0].append(
+                "Error in Ngspice code model generation " +
+                "from Verilog: " + str(err)
+            )
+
+        terminalLog = self.entry_var[0].toPlainText()
+        if "error" in terminalLog.lower():
+            self.entry_var[0].append('''
+                <p style=\" font-size:16pt; font-weight:1000;
+                color:#FF0000;\">There was an error during model creation,
+                <br/>Please rectify the error and try again!
+                </p>
+            ''')
 
     def addfile(self):
+        '''
+            This function is used to add additional files required
+            by the verilog top module
+        '''
         if len(Maker.verilogFile) < (self.filecount + 1):
             reply = QtWidgets.QMessageBox.critical(
                 None,
                 "Error Message",
                 "<b>Error: No Verilog File Chosen. \
-                Please chose a Verilog file in Makerchip Tab</b>",
+                Please choose a verilog file in Makerchip Tab</b>",
                 QtWidgets.QMessageBox.Ok)
             if reply == QtWidgets.QMessageBox.Ok:
                 self.obj_Appconfig.print_error(
-                    'No VerilogFile. Please chose\
-                     a Verilog File in Makerchip Tab')
+                    'No Verilog File Chosen. Please choose \
+                     a verilog file in Makerchip Tab')
                 return
+
         self.fname = Maker.verilogFile[self.filecount]
         model = ModelGeneration.ModelGeneration(self.fname, self.entry_var[0])
         # model.verilogfile()
@@ -160,12 +199,12 @@ class NgVeri(QtWidgets.QWidget):
                 None,
                 "Error Message",
                 "<b>Error: No Verilog File Chosen. \
-                Please chose a Verilog file in Makerchip Tab</b>",
+                Please choose a verilog file in Makerchip Tab</b>",
                 QtWidgets.QMessageBox.Ok)
             if reply == QtWidgets.QMessageBox.Ok:
                 self.obj_Appconfig.print_error(
-                    'No VerilogFile. Please chose \
-                    a Verilog File in Makerchip Tab')
+                    'No Verilog File Chosen. Please choose \
+                    a verilog file in Makerchip Tab')
                 return
         self.fname = Maker.verilogFile[self.filecount]
         model = ModelGeneration.ModelGeneration(self.fname, self.entry_var[0])
@@ -188,6 +227,10 @@ class NgVeri(QtWidgets.QWidget):
 
         self.addverilogbutton = QtWidgets.QPushButton(
             "Run Verilog to NgSpice Converter")
+        self.addverilogbutton.setToolTip(
+            "Requires internet connection for converting TL-Verilog models"
+        )
+        self.addverilogbutton.setToolTipDuration(5000)
         self.optionsgroupbtn.addButton(self.addverilogbutton)
         self.addverilogbutton.clicked.connect(self.addverilog)
         self.optionsgrid.addWidget(self.addverilogbutton, 0, 1)
@@ -218,7 +261,7 @@ class NgVeri(QtWidgets.QWidget):
         return self.optionsbox
 
     # This function is used to remove models in modlst of Ngspice folder if
-    # the user wants to remove a model.Note: files do not get removed
+    # the user wants to remove a model. Note: files do not get removed
     def edit_modlst(self, text):
         if text == "Edit modlst":
             return
@@ -226,7 +269,7 @@ class NgVeri(QtWidgets.QWidget):
         self.entry_var[1].removeItem(index)
         self.entry_var[1].setCurrentIndex(0)
         ret = QtWidgets.QMessageBox.warning(
-            None, "Warning", '''<b>Do you want to remove model:''' +
+            None, "Warning", '''<b>Do you want to remove the model: ''' +
             text,
             QtWidgets.QMessageBox.Ok, QtWidgets.QMessageBox.Cancel
         )
@@ -242,16 +285,34 @@ class NgVeri(QtWidgets.QWidget):
             self.fname = Maker.verilogFile[self.filecount]
             model = ModelGeneration.ModelGeneration(
                 self.fname, self.entry_var[0])
-            model.runMake()
-            model.runMakeInstall()
-            return
 
-        # else:
-        #    return
+            try:
+                model.runMake()
+
+                if os.name != 'nt':
+                    model.runMakeInstall()
+                else:
+                    shutil.copy(
+                        self.release_dir + "/src/xspice/icm/Ngveri/Ngveri.cm",
+                        self.nghdl_home + "/lib/ngspice/"
+                    )
+            except BaseException as err:
+                QtWidgets.QMessageBox.critical(
+                    None, "Error Message",
+                    "The verilog model '" + str(text) +
+                    "' could not be removed: " + str(err),
+                    QtWidgets.QMessageBox.Ok
+                )
 
-    # This is to remove lint_off comments needed by the verilator warnings
-    # This function writes to the lint_off.txt here in the same folder
     def lint_off_edit(self, text):
+        '''
+          This is to remove lint_off comments needed by the verilator warnings.
+          This function writes to the lint_off.txt in the library/tlv folder.
+        '''
+        init_path = '../../'
+        if os.name == 'nt':
+            init_path = ''
+
         if text == "Edit lint_off":
             return
         index = self.entry_var[2].findText(text)
@@ -260,32 +321,35 @@ class NgVeri(QtWidgets.QWidget):
         ret = QtWidgets.QMessageBox.warning(
             None,
             "Warning",
-            '''<b>Do you want to remove the lint off error:''' +
+            '''<b>Do you want to remove the lint off error: ''' +
             text,
             QtWidgets.QMessageBox.Ok,
             QtWidgets.QMessageBox.Cancel)
+
         if ret == QtWidgets.QMessageBox.Ok:
-            file = open("../maker/lint_off.txt", 'r')
+            file = open(init_path + "library/tlv/lint_off.txt", 'r')
             data = file.readlines()
             file.close()
 
             data.remove(text + "\n")
-            file = open("../maker/lint_off.txt", 'w')
+            file = open(init_path + "library/tlv/lint_off.txt", 'w')
             for item in data:
                 file.write(item)
-            return
-
-        # else:
-        #    return
 
-    # This is to add lint_off comments needed by the verilator warnings
-    # This function writes to the lint_off.txt here in the same folder
     def add_lint_off(self):
+        '''
+            This is to add lint_off comments needed by the verilator warnings.
+            This function writes to the lint_off.txt in the library/tlv folder.
+        '''
+        init_path = '../../'
+        if os.name == 'nt':
+            init_path = ''
+
         text = self.entry_var[3].text()
 
         if self.entry_var[2].findText(text) == -1:
             self.entry_var[2].addItem(text)
-            file = open("../maker/lint_off.txt", 'a+')
+            file = open(init_path + "library/tlv/lint_off.txt", 'a+')
             file.write(text + "\n")
             file.close()
         self.entry_var[3].setText("")
@@ -325,7 +389,12 @@ class NgVeri(QtWidgets.QWidget):
         self.count += 1
         self.entry_var[self.count] = QtWidgets.QComboBox()
         self.entry_var[self.count].addItem("Edit lint_off")
-        self.lint_off = open("../maker/lint_off.txt", 'r')
+
+        init_path = '../../'
+        if os.name == 'nt':
+            init_path = ''
+        self.lint_off = open(init_path + "library/tlv/lint_off.txt", 'r')
+
         self.data = self.lint_off.readlines()
         self.lint_off.close()
         for item in self.data:
diff --git a/src/maker/createkicad.py b/src/maker/createkicad.py
index dcde5526..af30cee0 100755..100644
--- a/src/maker/createkicad.py
+++ b/src/maker/createkicad.py
@@ -30,7 +30,6 @@
 from . import Appconfig
 import re
 import os
-import sys  # noqa F401
 import xml.etree.cElementTree as ET
 from PyQt5 import QtWidgets
 
@@ -48,7 +47,7 @@ class AutoSchematic:
         self.lib_loc = self.App_obj.lib_loc
         self.modelpath = modelpath
         if os.name == 'nt':
-            eSim_src = Appconfig.src_home
+            eSim_src = self.App_obj.src_home
             inst_dir = eSim_src.replace('\\eSim', '')
             self.kicad_ngveri_lib = \
                 inst_dir + '/KiCad/share/kicad/library/eSim_Ngveri.lib'
@@ -68,40 +67,43 @@ class AutoSchematic:
             if (str(self.modelname) + '.xml') in files:
                 xmlFound = root
                 print(xmlFound)
+                break
+
         if xmlFound is None:
             self.getPortInformation()
             self.createXML()
             self.createLib()
+
         elif (xmlFound == os.path.join(self.xml_loc, 'Ngveri')):
             print('Library already exists...')
             ret = QtWidgets.QMessageBox.warning(
                 None, "Warning", '''<b>Library files for this model''' +
                 ''' already exist. Do you want to overwrite it?</b><br/>
                 If yes press ok, else cancel it and ''' +
-                '''change the name of your vhdl file.''',
+                '''change the name of your verilog model.''',
                 QtWidgets.QMessageBox.Ok, QtWidgets.QMessageBox.Cancel
             )
+
             if ret == QtWidgets.QMessageBox.Ok:
                 print("Overwriting existing libraries")
                 self.getPortInformation()
                 self.createXML()
-                self.removeOldLibrary()     # Removes the exisitng library
+                self.removeOldLibrary()     # Removes the existng library
                 self.createLib()
             else:
                 print("Library Creation Cancelled")
                 return "Error"
 
         else:
-            print('Pre existing library...')
+            print('Pre-existing library...')
             ret = QtWidgets.QMessageBox.critical(
                 self.parent, "Error", '''<b>A standard library already ''' +
                 '''exists with this name.</b><br/><b>Please change the ''' +
-                '''name of your vhdl file and upload it again</b>''',
+                '''name of your verilog model and add it again.</b>''',
                 QtWidgets.QMessageBox.Ok
             )
 
     # getting the port information here
-
     def getPortInformation(self):
         portInformation = PortInfo(self, self.modelpath)
         portInformation.getPortInfo()
@@ -267,7 +269,6 @@ class AutoSchematic:
 
         port_list = []
         j = 0
-        k = 0   # noqa F841
         for i in range(total):
             if (i < inputs):
                 input_port[1] = inputName[i]
diff --git a/src/maker/makerchip.py b/src/maker/makerchip.py
index 29e1421d..152c6cbb 100755
--- a/src/maker/makerchip.py
+++ b/src/maker/makerchip.py
@@ -27,23 +27,15 @@
 # =========================================================================
 
 # importing the files and libraries
-import sys
-import os
 from PyQt5 import QtWidgets
-from configuration.Appconfig import Appconfig
-from projManagement.Validation import Validation
-# from .Processing import PrcocessNetlist
 from . import Maker
 from . import NgVeri
 
-from xml.etree import ElementTree as ET
-
 # filecount is used to count thenumber of objects created
 filecount = 0
 
-# this class creates objects for creating the Maker and the Ngveri tabs
-
 
+# This class creates objects for creating the Maker and the Ngveri tabs
 class makerchip(QtWidgets.QWidget):
 
     # initialising the variables
diff --git a/src/maker/verilated.o b/src/maker/verilated.o
deleted file mode 100755
index db5f1163..00000000
--- a/src/maker/verilated.o
+++ /dev/null
diff --git a/src/ngspiceSimulation/NgspiceWidget.py b/src/ngspiceSimulation/NgspiceWidget.py
index c068d0de..3c68148b 100644
--- a/src/ngspiceSimulation/NgspiceWidget.py
+++ b/src/ngspiceSimulation/NgspiceWidget.py
@@ -23,19 +23,18 @@ class NgspiceWidget(QtWidgets.QWidget):
         print("Argument to ngspice command : ", command)
 
         if os.name == 'nt':     # For Windows OS
-            home = os.path.expanduser("~")
-
             parser_nghdl = ConfigParser()
-            parser_nghdl.read(os.path.join(
-                home, os.path.join('.nghdl', 'config.ini')))
+            parser_nghdl.read(
+                os.path.join('library', 'config', '.nghdl', 'config.ini')
+            )
 
-            msys_bin = parser_nghdl.get('COMPILER', 'MSYS_HOME')
+            msys_home = parser_nghdl.get('COMPILER', 'MSYS_HOME')
 
             tempdir = os.getcwd()
             projPath = self.obj_appconfig.current_project["ProjectName"]
             os.chdir(projPath)
             self.command = 'cmd /c '+'"start /min ' + \
-                msys_bin + "/mintty.exe ngspice -p " + command + '"'
+                msys_home + "/usr/bin/mintty.exe ngspice -p " + command + '"'
             self.process.start(self.command)
             os.chdir(tempdir)
 
diff --git a/src/projManagement/Kicad.py b/src/projManagement/Kicad.py
index 8f25b732..8c92c06b 100644
--- a/src/projManagement/Kicad.py
+++ b/src/projManagement/Kicad.py
@@ -96,11 +96,11 @@ class Kicad:
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage(
                 'Please select the project first. You can either ' +
-                'create new project or open existing project')
+                'create new project or open an existing project')
             self.msg.exec_()
             self.obj_appconfig.print_warning(
                 'Please select the project first. You can either ' +
-                'create new project or open existing project')
+                'create new project or open an existing project')
 
     '''
     # Commenting as it is no longer needed as PCB and Layout will open from
@@ -133,10 +133,10 @@ class Kicad:
             self.msg.setModal(True)
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage('Please select the project first. You can'
-            + 'either create new project or open existing project')
+            + 'either create new project or open an existing project')
             self.msg.exec_()
             self.obj_appconfig.print_warning('Please select the project'
-            + 'first. You can either create new project or open existing'
+            + 'first. You can either create new project or open an existing'
             + 'project')
 
     def openLayout(self):
@@ -166,10 +166,10 @@ class Kicad:
             self.msg.setModal(True)
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage('Please select the project first. You can'
-            + 'either create new project or open existing project')
+            + 'either create new project or open an existing project')
             self.msg.exec_()
             self.obj_appconfig.print_warning('Please select the project'
-            + 'first. You can either create new project or open existing'
+            + 'first. You can either create new project or open an existing'
             + 'project')
     '''
 
@@ -226,8 +226,8 @@ class Kicad:
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage(
                 'Please select the project first. You can either ' +
-                'create new project or open existing project')
+                'create new project or open an existing project')
             self.msg.exec_()
             self.obj_appconfig.print_warning(
                 'Please select the project first. You can either ' +
-                'create new project or open existing project')
+                'create new project or open an existing project')
diff --git a/src/projManagement/Worker.py b/src/projManagement/Worker.py
index 970bfccd..6ff1e361 100644
--- a/src/projManagement/Worker.py
+++ b/src/projManagement/Worker.py
@@ -16,7 +16,7 @@
 #      REVISION: Sunday 16 August 2020
 # =========================================================================
 
-from PyQt5 import QtCore
+from PyQt5 import QtCore, QtWidgets
 import subprocess
 from configuration.Appconfig import Appconfig
 
@@ -97,7 +97,25 @@ class WorkerThread(QtCore.QThread):
         """
 
         procThread = Appconfig()
+        projDir = procThread.current_project["ProjectName"]
+
+        if (projDir is None) and ('nghdl' not in command):
+            msg = QtWidgets.QErrorMessage()
+            msg.setModal(True)
+            msg.setWindowTitle("Error Message")
+            msg.showMessage(
+                'Please select the project first. You can either ' +
+                'create a new project or open an existing project.'
+            )
+            msg.exec_()
+
+            return
+
         proc = subprocess.Popen(command.split())
+
+        if 'nghdl' in command:
+            return
+
         self.my_workers.append(proc)
         procThread.procThread_list.append(proc)
         procThread.proc_dict[procThread.current_project['ProjectName']].append(