about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--dist/test_app.app/Contents/Info.plist.patch0
-rw-r--r--icons/Thumbs.dbbin5120 -> 0 bytes
-rw-r--r--setup.py19
4 files changed, 9 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index a7a55e6..f2c69be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ build
 dist
 kindlegen*
 .DS_Store
+Thumbs.db
diff --git a/dist/test_app.app/Contents/Info.plist.patch b/dist/test_app.app/Contents/Info.plist.patch
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dist/test_app.app/Contents/Info.plist.patch
diff --git a/icons/Thumbs.db b/icons/Thumbs.db
deleted file mode 100644
index 147e158..0000000
--- a/icons/Thumbs.db
+++ /dev/null
Binary files differdiff --git a/setup.py b/setup.py
index c79c95d..c6f7fe2 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,11 @@
 """
 cx_Freeze build script for KCC.
 
-Usage (Windows):
-    python setup.py build
+Usage (Mac OS X):
+    python setup.py bdist_mac
 
-Usage (Linux):
+Usage (Windows):
     python setup.py build
-
-Usage (OS X):
-    python setup.py bdist_mac
 """
 from sys import platform
 from cx_Freeze import setup, Executable
@@ -18,12 +15,12 @@ VERSION = "3.0"
 MAIN = "kcc.py"
 
 includefiles = ['LICENSE.txt']
-includes = []
-excludes = []
+includes = ['sip', 'atexit', 'PyQt4.QtCore']
+excludes = ['curses', 'email', 'tcl', 'ttk']
 
 if platform == "darwin":
     extra_options = dict(
-        options={"build_exe": {"include_files": includefiles, "excludes": excludes, "compressed": True},
+        options={"build_exe": {"include_files": includefiles, "includes": includes, "excludes": excludes, "compressed": True},
                  "bdist_mac": {"iconfile": "icons/comic2ebook.icns"}},
         executables=[Executable(MAIN,
                                 copyDependentFiles=True,
@@ -33,7 +30,7 @@ if platform == "darwin":
 elif platform == "win32":
     base = "Win32GUI"
     extra_options = dict(
-        options={"build_exe": {"include_files": includefiles, "excludes": excludes, "compressed": True}},
+        options={"build_exe": {"include_files": includefiles, "includes": includes, "excludes": excludes, "compressed": True}},
         executables=[Executable(MAIN,
                                 base=base,
                                 targetName="KCC.exe",
@@ -61,6 +58,6 @@ setup(
     license="ISC License (ISCL)",
     keywords="kindle comic mobipocket mobi cbz cbr manga",
     url="http://github.com/ciromattia/kcc",
-    packages=['kcc'], requires=['PIL'],
+    packages=['KCC'], requires=['Pillow'],
     **extra_options
 )
\ No newline at end of file