diff options
| author | Paweł Jastrzębski <pawelj@iosphe.re> | 2017-10-13 08:57:58 +0200 |
|---|---|---|
| committer | Paweł Jastrzębski <pawelj@iosphe.re> | 2017-10-13 08:57:58 +0200 |
| commit | 968a1afa1dc623ee2329c9c32bf2e924d7e3ac3b (patch) | |
| tree | 691d4c1da305612b4038904d7da7ef7c12d5e4b8 | |
| parent | Merge pull request #244 from ciromattia/dev (diff) | |
| download | kcc-968a1afa1dc623ee2329c9c32bf2e924d7e3ac3b.tar.gz kcc-968a1afa1dc623ee2329c9c32bf2e924d7e3ac3b.tar.bz2 kcc-968a1afa1dc623ee2329c9c32bf2e924d7e3ac3b.zip | |
Updated build enviroment
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | kcc.iss | 2 | ||||
| -rw-r--r-- | other/windows/vc_redist.x64.exe | bin | 14572000 -> 0 bytes |
4 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 11a98b4..eff62b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,10 +21,10 @@ before_install: install: - if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install -r requirements.txt ; fi -- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install certifi https://github.com/pyinstaller/pyinstaller/archive/develop.zip ; fi +- if [ "$TRAVIS_OS_NAME" == "linux" ] ; then pip install certifi PyInstaller ; fi - if [ "$TRAVIS_OS_NAME" == "linux" ] ; then gem install fpm ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install -r requirements.txt ; fi -- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install certifi https://github.com/pyinstaller/pyinstaller/archive/develop.zip ; fi +- if [ "$TRAVIS_OS_NAME" == "osx" ] ; then pip3 install certifi PyInstaller ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then npm install -g appdmg ; fi script: python3 setup.py build_binary diff --git a/appveyor.yml b/appveyor.yml index 2a47721..1fb13e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,7 +5,7 @@ install: - set PATH="%PYTHON%\\Scripts";"C:\\Program Files (x86)\\Inno Setup 5";%PATH% - "%PYTHON%\\python.exe -m pip install --upgrade pip setuptools wheel" - "%PYTHON%\\python.exe -m pip install -r requirements.txt" - - "%PYTHON%\\python.exe -m pip install certifi https://github.com/pyinstaller/pyinstaller/archive/develop.zip" + - "%PYTHON%\\python.exe -m pip install certifi PyInstaller" - nuget install secure-file -ExcludeVersion - nuget install verpatch -ExcludeVersion - secure-file\tools\secure-file -decrypt other\windows\Cert.pfx.enc -secret %ENCRYPTION% diff --git a/kcc.iss b/kcc.iss index c51f8c8..526ce7c 100644 --- a/kcc.iss +++ b/kcc.iss @@ -49,7 +49,6 @@ Source: "LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion solidbreak Source: "other\windows\Additional-LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "other\windows\UnRAR.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "other\windows\7za.exe"; DestDir: "{app}"; Flags: ignoreversion -Source: "other\windows\vc_redist.x64.exe"; DestDir: "{tmp}"; Flags: ignoreversion deleteafterinstall [Icons] Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" @@ -57,7 +56,6 @@ Name: "{group}\Readme"; Filename: "https://github.com/ciromattia/kcc#kcc" Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon [Run] -Filename: "{tmp}\vc_redist.x64.exe"; Parameters: "/install /passive /norestart"; StatusMsg: "Installing Microsoft Visual C++ 2015 Redistributable Package..." Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall [Messages] diff --git a/other/windows/vc_redist.x64.exe b/other/windows/vc_redist.x64.exe deleted file mode 100644 index 048fda2..0000000 --- a/other/windows/vc_redist.x64.exe +++ /dev/null Binary files differ |