Fixing installation issues when upgrading PyXRD

PyXRD · Sep 6, 2016 · 03a712d · 03a712d
1 parent 58fe91c
commit 03a712d
Showing 1 changed file with 8 additions and 14 deletions.
diff --git a/PyXRDiss.iss b/PyXRDiss.iss
@@ -26,23 +26,17 @@ OutputDir="{#OutputDir}"
 Source: "{#DepDir}\python-2.7.11.msi"; DestDir: "{tmp}"; Flags: deleteafterinstall
 Source: "{#DepDir}\pygtk-all-in-one-2.24.2.win32-py2.7.msi"; DestDir: "{tmp}"; Flags: deleteafterinstall
 Source: "{#DepDir}\scipy-0.17.0-cp27-none-win32.whl"; DestDir: "{tmp}"; Flags: deleteafterinstall
-Source: "{#DepDir}\numpy-1.11.0+mkl-cp27-cp27m-win32.whl"; DestDir: "{tmp}"; Flags: deleteafterinstall
 Source: "{#OutputDir}\PyXRD-{#MyAppVersion}-py2-none-any.whl"; DestDir: "{tmp}"; Flags: deleteafterinstall
 
 [Run]
-StatusMsg: "Installing Python";     Filename: "msiexec.exe";            Parameters: "/i ""{tmp}\python-2.7.11.msi"" /passive ALLUSERS=1 TARGETDIR=""C:\Python27"""; Flags: runasoriginaluser;
-StatusMsg: "Installing PyGTK";      Filename: "msiexec.exe";            Parameters: "/i ""{tmp}\pygtk-all-in-one-2.24.2.win32-py2.7.msi"" /passive ALLUSERS=1 TARGETDIR=""C:\Python27"""; Flags: runasoriginaluser;
-StatusMsg: "Installing Setuptools"; Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U pip setuptools"; Flags: runascurrentuser;
-StatusMsg: "Installing Wheel";      Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U wheel"; Flags: runascurrentuser;
-StatusMsg: "Installing Pyro";       Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U Pyro4"; Flags: runascurrentuser;
-StatusMsg: "Installing Deap";       Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U deap"; Flags: runascurrentuser;
-StatusMsg: "Installing Pywin32";    Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U pypiwin32"; Flags: runascurrentuser;
-StatusMsg: "Installing Numpy";      Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install ""{tmp}\numpy-1.11.0+mkl-cp27-cp27m-win32.whl"""; Flags: runascurrentuser;
-StatusMsg: "Installing Scipy";      Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install ""{tmp}\scipy-0.17.0-cp27-none-win32.whl"""; Flags: runascurrentuser;
-StatusMsg: "Installing Pyparsing";  Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U pyparsing"; Flags: runascurrentuser;
-StatusMsg: "Installing Matplotlib"; Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U matplotlib"; Flags: runascurrentuser;
-StatusMsg: "Installing PyXRD";      Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U ""{tmp}\PyXRD-{#MyAppVersion}-py2-none-any.whl"""; Flags: runascurrentuser;
-StatusMsg: "Installing PyXRD";      Filename: "C:\Python27\Python.exe"; Parameters: """C:\Python27\Scripts\win32_pyxrd_post_install.py"" -install"; Flags: runascurrentuser waituntilterminated;
+StatusMsg: "Installing Python";       Filename: "msiexec.exe";            Parameters: "/i ""{tmp}\python-2.7.11.msi"" /passive ALLUSERS=1 TARGETDIR=""C:\Python27"""; Flags: runasoriginaluser;
+StatusMsg: "Installing PyGTK";        Filename: "msiexec.exe";            Parameters: "/i ""{tmp}\pygtk-all-in-one-2.24.2.win32-py2.7.msi"" /passive ALLUSERS=1 TARGETDIR=""C:\Python27"""; Flags: runasoriginaluser;
+StatusMsg: "Installing Dependencies"; Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install -U pip setuptools wheel Pyro4 deap pypiwin32 pyparsing numpy"; Flags: runascurrentuser;
+StatusMsg: "Installing Scipy";        Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install ""{tmp}\scipy-0.17.0-cp27-none-win32.whl"""; Flags: runascurrentuser;
+StatusMsg: "Installing Matplotlib";   Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install matplotlib"; Flags: runascurrentuser;
+StatusMsg: "Uninstalling old versions of PyXRD";      Filename: "C:\Python27\Python.exe"; Parameters: "-m pip uninstall -y pyxrd"; Flags: runascurrentuser;
+StatusMsg: "Installing PyXRD";        Filename: "C:\Python27\Python.exe"; Parameters: "-m pip install ""{tmp}\PyXRD-{#MyAppVersion}-py2-none-any.whl"""; Flags: runascurrentuser;
+StatusMsg: "Installing PyXRD";        Filename: "C:\Python27\Python.exe"; Parameters: """C:\Python27\Scripts\win32_pyxrd_post_install.py"" -install"; Flags: runascurrentuser waituntilterminated;
 
 [UninstallDelete]
 Type: files; Name: "{win}\MYPROG.INI"