From 0ff0ce51e8caa9ddad481aea314c2509c9247580 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 26 Sep 2009 17:29:10 -0600 Subject: [PATCH] IGN:... --- setup/installer/osx/freeze.py | 4 ++-- src/calibre/manual/develop.rst | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/setup/installer/osx/freeze.py b/setup/installer/osx/freeze.py index 4f9a6c62f9..8358a61a81 100644 --- a/setup/installer/osx/freeze.py +++ b/setup/installer/osx/freeze.py @@ -55,7 +55,7 @@ print >>loader, 'sys.argv[0] =', repr(os.path.basename(path)) print >>loader, 'if', repr(dirpath), 'in sys.path: sys.path.remove(', repr(dirpath), ')' print >>loader, 'sys.path.append(', repr(site_packages), ')' if do_devf: - print >>loader, 'sys.path.insert(0, %r)'%devf + print >>loader, 'sys.path.insert(0, '+repr(devf)+')' print >>loader, 'sys.frozen = "macosx_app"' print >>loader, 'sys.frameworks_dir =', repr(frameworks_dir) print >>loader, 'sys.extensions_location =', repr(extensions_dir) @@ -390,7 +390,7 @@ def main(): 'calibre.ebooks.metadata.amazon', ], 'packages' : ['PIL', 'Authorization', 'lxml', 'dns'], - 'excludes' : ['IPython'], + 'excludes' : ['IPython', 'PyQt4.uic.port_v3.proxy_base'], 'plist' : { 'CFBundleGetInfoString' : '''calibre, an E-book management application.''' ''' Visit http://calibre.kovidgoyal.net for details.''', 'CFBundleIdentifier':'net.kovidgoyal.calibre', diff --git a/src/calibre/manual/develop.rst b/src/calibre/manual/develop.rst index 27865f2d9a..626a784142 100644 --- a/src/calibre/manual/develop.rst +++ b/src/calibre/manual/develop.rst @@ -63,25 +63,24 @@ this, make your changes, then run:: bzr commit -m "Comment describing your changes" bzr send -o my-changes -This will create a my-changes file in the current directory, simply attach that to a ticket on the |app| bug tracker at -`http://calibre.kovidgoyal.net`_. +This will create a my-changes file in the current directory, simply attach that to a ticket on the |app| `bug tracker `_. If you plan to do a lot of development on |app|, then the best method is to create a `Launchpad `_ account. Once you have the account, you can create your own -branch in which you do |app| development. To do that go to `https://code.launchpad.net`_ and click +branch in which you do |app| development. To do that go to `Launchpad code `_ and click "Register a branch" (choose a branch type of "Hosted"). Once the branch is setup you can associate it with the code you checked out in the previous step running the following command in any directory in the |app| code you checked out:: bzr push -This will host your branch on launchpad. Now go to `http://code.launchpad.net/calibre`_ and register +This will host your branch on launchpad. Now go to `calibre@Launchapd `_ and register your branch with the |app| project. Now whenever you commit changes to your branch with the command:: bzr commit -m "Comment describing your change" I can merge it directly from you branch into the main |app| source tree. You should also subscribe to the |app| -developers mailing list at `https://launchpad.net/~calibre-devs`_. Before making major changes, you should +developers mailing list `calibre-devs `_. Before making major changes, you should discuss them on the mailing list to ensure that the changes will be accepted once you're done. @@ -134,7 +133,7 @@ calibre is the directory that contains the src and resources sub directories. Th This assumes that you have installed the |app| command line tools. This can be done via Preferences->Advanced in the |app| GUI. The next step is to set the environment variable ``CALIBRE_DEVELOP_FROM`` to the absolute path to the src directory. So, following the example above, it would be ``/Users/kovid/work/calibre/src``. Apple -`documentation http://developer.apple.com/mac/library/documentation/MacOSX/Conceptual/BPRuntimeConfig/Articles/EnvironmentVars.html#//apple_ref/doc/uid/20002093-BCIJIJBH`_ +`documentation `_ on how to set environment variables. Once you have set the environment variable, open a new Terminal and check that it was correctly set by using