Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Sigil-Ebook/Sigil
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinhendricks committed Jun 10, 2019
2 parents 54e3d6f + b40bd20 commit 5b5c0c0
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 61 deletions.
1 change: 1 addition & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Sigil-0.9.14
- dropping epubs on Sigil.app no longer opens an extra empty epub on macOS
- reload Preview only when needed to help prevent screen flicker and lower memory use
- enabled Windows automated builds using Apppveyor
- Windows releases now compiled with Visual Studio 2017
- characters in HTML files report now uses gumbo for speed
- allow user's custom plugin icons to survive a plugin update

Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,13 @@ before_build:
python -m pip install --upgrade pip
pip3.7 install six==1.12.0
pip3.7 install html5lib==1.0.1
pip3.7 install regex==2018.11.22
pip3.7 install regex==2019.3.12
pip3.7 install cssutils==1.0.2
pip3.7 install cssselect==1.0.3
pip3.7 install chardet==3.0.4
pip3.7 install pillow==5.4.1
pip3.7 install PyQt5==5.12.1
pip3.7 install lxml==4.2.6
pip3.7 install PyQt5==5.12.2
pip3.7 install lxml==4.3.2
cd project\sigil\build
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
echo 'LIB = %LIB%'
Expand Down
55 changes: 28 additions & 27 deletions docs/Building_Sigil_on_Windows.html

Large diffs are not rendered by default.

56 changes: 29 additions & 27 deletions docs/Building_Sigil_on_Windows.md

Large diffs are not rendered by default.

Binary file modified docs/Sigil_Plugin_Framework_rev10.epub
Binary file not shown.
Binary file not shown.
5 changes: 1 addition & 4 deletions src/Resource_Files/python_pkg/windows_python_gather.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
('six.py', 'f'),
('html5lib','d'),
('PIL', 'd'),
('regex.py','f'),
('_regex.pyd','f'),
('_regex_core.py','f'),
('test_regex.py', 'f'),
('regex','d'),
('cssselect', 'd'),
('encutils', 'd'),
('cssutils', 'd'),
Expand Down

0 comments on commit 5b5c0c0

Please sign in to comment.