Merge pull request #189 from rahulp13/masterv2.2_pre-release

Updated version details to v2.2 pre-release

9 files changed, 16 insertions, 16 deletions

diff --git a/INSTALL b/INSTALL
index e78d4321..882fbc43 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Table of contents
     
    	i.      After downloading eSim, extract it using: 
   
-   		       $ unzip eSim-2.1.zip
+   		       $ unzip eSim-2.2_pre-release.zip
 
    	ii.     Now change directories in to the top-level eSim directory (where this INSTALL file can be found).
 
@@ -52,4 +52,4 @@ Table of contents
 
 Note
 ======
-Please report any eSim installation related issue/error at "https://forums.fossee.in/"
\ No newline at end of file
+Please report any eSim installation related issue/error at "https://forums.fossee.in/"
diff --git a/README.md b/README.md
index fdfb1838..f3cee1fc 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ It is an integrated tool build using open source softwares such as KiCad, Ngspic
 
 ## Releases and Installation
 eSim is released for the following distributions (operating systems):
-* Ubuntu 16.04 OS and above LTS versions.
+* Ubuntu 18.04 and 20.04 LTS versions.
 * Microsoft Windows 7, 8 and 10.
 
 To use eSim on your machine having above distributions, please refer to link [here](https://esim.fossee.in/downloads) for installation and other guidelines.
@@ -37,7 +37,7 @@ To use eSim on your machine having above distributions, please refer to link [he
 * [NGHDL](https://github.com/fossee/nghdl)
 
 ## eSim Manual
-To know everything about eSim, how it works and it's feature please download manual [here](https://static.fossee.in/esim/manuals/eSim_Manual_2020_August.pdf)
+To know everything about eSim, how it works and it's feature please download the manual from [here](https://static.fossee.in/esim/manuals/eSim_Manual_2.2_pre-release.pdf)
 
 ## Contact
 For any queries regarding eSim please write us on at this [email address](mailto:contact-esim@fossee.in).
diff --git a/VERSION b/VERSION
index 879b416e..1f0d0ab5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1
+2.2 pre-release
diff --git a/conf.py b/conf.py
index 95faa92f..12cbb7f9 100644
--- a/conf.py
+++ b/conf.py
@@ -21,13 +21,13 @@ autodoc_mock_imports = ["PyQt5", "pathmagic", "matplotlib", "numpy"]
 # -- Project information -----------------------------------------------------
 
 project = u'eSim'
-copyright = u'2020, FOSSEE'
+copyright = u'2022, FOSSEE'
 author = u'FOSSEE, IIT Bombay'
 
 # The short X.Y version
-version = u'2.1'
+version = u'2.2 pre-release'
 # The full version, including alpha/beta/rc tags
-release = u'2.1.0'
+release = u'2.2.0 pre-release'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/library/browser/welcome.html b/library/browser/welcome.html
index c438194e..8a93a730 100644
--- a/library/browser/welcome.html
+++ b/library/browser/welcome.html
@@ -39,15 +39,15 @@
         <center><img src="../../images/logo.png" alt="eSim logo" height="100" width="100"></center>
         <br/> 
         <p>
-            <b>eSim</b> is an open source EDA tool for circuit design, simulation, analysis and PCB design. It is an integrated tool built using open source softwares such as KiCad (<a href=http://www.kicad-pcb.org>http://www.kicad-pcb.org</a>), Ngspice (<a href=http://ngspice.sourceforge.net>http://ngspice.sourceforge.net</a>) and GHDL (<a href=http://ghdl.free.fr>http://ghdl.free.fr</a>). eSim source is released under <b>GNU General Public License.</b> 
+            <b>eSim</b> is an open source EDA tool for circuit design, simulation, analysis and PCB design. It is an integrated tool built using open source softwares such as KiCad (<a href="https://www.kicad.org">https://www.kicad.org/</a>), Makerchip IDE (<a href="https://www.makerchip.com/">https://www.makerchip.com/</a>), Ngspice (<a href="http://ngspice.sourceforge.net">http://ngspice.sourceforge.net</a>), GHDL (<a href="http://ghdl.free.fr">http://ghdl.free.fr</a>) and Verilator (<a href="https://www.veripool.org/verilator/">https://www.veripool.org/verilator/</a>). eSim source is released under <b>GNU General Public License.</b> 
         </p>
         <br/>
         <p>
-            This tool is developed by the <b>FOSSEE team at IIT Bombay</b>. To know more about eSim, please visit: <a href=http://esim.fossee.in>http://esim.fossee.in</a>.
+            This tool is developed by the <b>FOSSEE team at IIT Bombay</b>. To know more about eSim, please visit: <a href="https://esim.fossee.in">https://esim.fossee.in</a>.
         </p>
         <br/>
         <p>
-            To discuss more about eSim, please visit: <a href=http://forums.fossee.in>http://forums.fossee.in</a>
+            To discuss more about eSim, please visit: <a href="https://forums.fossee.in">https://forums.fossee.in</a>
         </p>
         <br/>
     </body>
diff --git a/setup.py b/setup.py
index 192f25b5..2cc33279 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ Needed to define the module structure, look up `Modules` for python
 '''
 setup(
     name='eSim',
-    version='2.1.0',
+    version='2.2.0 pre-release',
     author='FOSSEE',
     author_email='contact-esim@fossee.in',
     package_dir={'': 'src'},
diff --git a/src/browser/UserManual.py b/src/browser/UserManual.py
index e723680a..a3005846 100644
--- a/src/browser/UserManual.py
+++ b/src/browser/UserManual.py
@@ -14,7 +14,7 @@ class UserManual(QtWidgets.QWidget):
 
         self.vlayout = QtWidgets.QVBoxLayout()
 
-        manual = 'library/browser/User-Manual/eSim_Manual_2.1.pdf'
+        manual = 'library/browser/User-Manual/eSim_Manual_2.2-pre_release.pdf'
 
         if os.name == 'nt':
             os.startfile(os.path.realpath(manual))
diff --git a/src/configuration/Appconfig.py b/src/configuration/Appconfig.py
index d0b4fd18..21fd717e 100644
--- a/src/configuration/Appconfig.py
+++ b/src/configuration/Appconfig.py
@@ -103,9 +103,9 @@ class Appconfig(QtWidgets.QWidget):
 
         # Application Details
         self._APPLICATION = 'eSim'
-        self._VERSION = '2.1'
+        self._VERSION = '2.2 pre-release'
         self._AUTHOR = 'Fahim'
-        self._REVISION = 'Rahul'
+        self._REVISION = 'Rahul, Sumanto'
 
         # Application geometry setting
         self._app_xpos = 100
diff --git a/src/maker/createkicad.py b/src/maker/createkicad.py
index 1a00bde9..dcde5526 100755
--- a/src/maker/createkicad.py
+++ b/src/maker/createkicad.py
@@ -109,7 +109,7 @@ class AutoSchematic:
         self.input_length = portInformation.input_len
         self.portName = portInformation.port_name
 
-    # creating the XML files in eSim-2.1/library/modelParamXML/Ngveri
+    # creating the XML files in eSim-2.2/library/modelParamXML/Ngveri
     def createXML(self):
         cwd = os.getcwd()
         xmlDestination = os.path.join(self.xml_loc, 'Ngveri')