Merge pull request #195 from rahulp13/master

Updated version details to v2.2

8 files changed, 17 insertions, 12 deletions

diff --git a/INSTALL b/INSTALL
index 882fbc43..0f4b91ce 100644
--- a/INSTALL
+++ b/INSTALL
@@ -14,7 +14,7 @@ Table of contents
     
    	i.      After downloading eSim, extract it using: 
   
-   		       $ unzip eSim-2.2_pre-release.zip
+   		       $ unzip eSim-2.2.zip
 
    	ii.     Now change directories in to the top-level eSim directory (where this INSTALL file can be found).
 
@@ -43,9 +43,12 @@ Table of contents
 
     i.      Download eSim for Windows OS from "https://esim.fossee.in/". Disable the antivirus (if any).
 
-    ii.     Now double click on eSim installer and then follow the instruction to install eSim.
+    ii.     If MinGW and/or MSYS is already installed in your machine, then remove it from the
+            PATH environment variable as it may interfere with eSim and might not work as intended.
 
-    iii.    To uninstall eSim and all of its components, run the uninstaller "uninst-eSim.exe" located at 
+    iii.    Now double click on eSim installer and then follow the instruction to install eSim.
+
+    iv.     To uninstall eSim and all of its components, run the uninstaller "uninst-eSim.exe" located at 
             top-level eSim directory (where this INSTALL file can be found).
 
 
diff --git a/README.md b/README.md
index f3cee1fc..de871b36 100644
--- a/README.md
+++ b/README.md
@@ -33,11 +33,12 @@ To use eSim on your machine having above distributions, please refer to link [he
 
 ## Open-Source Softwares Used
 * [Python](https://www.python.org/)
-* [KiCad](https://kicad.org/)
-* [NGHDL](https://github.com/fossee/nghdl)
+* [KiCad](https://www.kicad.org/)
+* [Makerchip](https://www.makerchip.com/)
+* [NGHDL](https://github.com/fossee/nghdl/)
 
 ## eSim Manual
-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)
+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.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 1f0d0ab5..8bbe6cf7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2 pre-release
+2.2
diff --git a/conf.py b/conf.py
index 12cbb7f9..4d501197 100644
--- a/conf.py
+++ b/conf.py
@@ -25,9 +25,9 @@ copyright = u'2022, FOSSEE'
 author = u'FOSSEE, IIT Bombay'
 
 # The short X.Y version
-version = u'2.2 pre-release'
+version = u'2.2'
 # The full version, including alpha/beta/rc tags
-release = u'2.2.0 pre-release'
+release = u'2.2.0'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/library/tlv/lint_off.txt b/library/tlv/lint_off.txt
index 5d4b7f0a..e659e188 100755
--- a/library/tlv/lint_off.txt
+++ b/library/tlv/lint_off.txt
@@ -27,3 +27,4 @@ MODDUP
 STMTDLY
 LITENDIAN
 INITIALDLY
+
diff --git a/setup.py b/setup.py
index 2cc33279..4d64259b 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.2.0 pre-release',
+    version='2.2.0',
     author='FOSSEE',
     author_email='contact-esim@fossee.in',
     package_dir={'': 'src'},
diff --git a/src/browser/UserManual.py b/src/browser/UserManual.py
index a3005846..bf9c4b2b 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.2-pre_release.pdf'
+        manual = 'library/browser/User-Manual/eSim_Manual_2.2.pdf'
 
         if os.name == 'nt':
             os.startfile(os.path.realpath(manual))
diff --git a/src/configuration/Appconfig.py b/src/configuration/Appconfig.py
index e41fc218..ab19ada5 100644
--- a/src/configuration/Appconfig.py
+++ b/src/configuration/Appconfig.py
@@ -105,7 +105,7 @@ class Appconfig(QtWidgets.QWidget):
 
         # Application Details
         self._APPLICATION = 'eSim'
-        self._VERSION = '2.2 pre-release'
+        self._VERSION = '2.2'
         self._AUTHOR = 'Fahim'
         self._REVISION = 'Rahul, Sumanto'