diff options
| -rw-r--r-- | .gitignore | 7 | ||||
| -rw-r--r-- | appveyor.yml | 4 | ||||
| -rw-r--r-- | other/windows/Cert.pfx.enc | bin | 3520 -> 0 bytes | |||
| -rw-r--r-- | setup.bat | 4 | ||||
| -rwxr-xr-x | setup.py | 4 |
5 files changed, 4 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 6b1ecfe..6877d7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,15 @@ *.pyc *.cbz *.cbr +*.spec .idea .DS_Store +.python-version Thumbs.db dist Output -test -solaio kindlegen* -*.spec +setup.bat kindlecomicconverter/sentry.py build/ -.python-version KindleComicConverter.egg-info/ diff --git a/appveyor.yml b/appveyor.yml index 1fb13e1..44cd72b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,15 +7,13 @@ install: - "%PYTHON%\\python.exe -m pip install -r requirements.txt" - "%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% - secure-file\tools\secure-file -decrypt other\windows\sentry.py.enc -out kindlecomicconverter\sentry.py -secret %ENCRYPTION% build_script: - "%PYTHON%\\python.exe setup.py build_binary" after_build: - - ps: Get-ChildItem .\dist\KindleComicConverter_win_* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } + - ps: Get-ChildItem .\dist\KCC* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name } deploy: provider: S3 diff --git a/other/windows/Cert.pfx.enc b/other/windows/Cert.pfx.enc deleted file mode 100644 index 147cb97..0000000 --- a/other/windows/Cert.pfx.enc +++ /dev/null Binary files differdiff --git a/setup.bat b/setup.bat deleted file mode 100644 index ac9de58..0000000 --- a/setup.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -verpatch\lib\win\verpatch dist\KCC.exe %1 /va /pv %1 /s product "Kindle Comic Converter" /s description "Kindle Comic Converter" /s copyright "Copyright (C) 2012-2017 Ciro Mattia Gonano and Pawel Jastrzebski" -"C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe" sign /f "%APPVEYOR_BUILD_FOLDER%\other\windows\Cert.pfx" /p "%CERT_PASS%" /t http://time.certum.pl /d "Kindle Comic Converter" /du "http://kcc.iosphe.re/" dist/KCC.exe -iscc /SSignTool="""C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe"" sign /f ""%APPVEYOR_BUILD_FOLDER%\other\windows\Cert.pfx"" /p ""%CERT_PASS%"" /t http://time.certum.pl $p" kcc.iss >nul 2>&1 diff --git a/setup.py b/setup.py index c50dcaa..5028704 100755 --- a/setup.py +++ b/setup.py @@ -47,10 +47,6 @@ class BuildBinaryCommand(distutils.cmd.Command): exit(0) elif sys.platform == 'win32': os.system('pyinstaller -y -F -i icons\comic2ebook.ico -n KCC -w --noupx kcc.py') - if os.getenv('APPVEYOR'): - if len(VERSION) == 3: - VERSION = VERSION + '.0' - os.system('setup.bat ' + VERSION) exit(0) else: os.system('pyinstaller -y -F kcc.py') |