merge with crew.

This commit is contained in:
Vadim Gelfer 2006-05-18 16:49:45 -07:00
commit 3d84de6ddb
2 changed files with 9 additions and 7 deletions

View File

@ -8,12 +8,12 @@
import os, cgi, sys
import mimetypes
from demandload import demandload
demandload(globals(), "mdiff time re socket zlib errno ui hg ConfigParser")
demandload(globals(), "tempfile StringIO BaseHTTPServer util SocketServer")
demandload(globals(), "archival mimetypes templater urllib")
from node import *
from i18n import gettext as _
from mercurial.demandload import demandload
demandload(globals(), "time re socket zlib errno ConfigParser tempfile")
demandload(globals(), "StringIO BaseHTTPServer SocketServer urllib")
demandload(globals(), "mercurial:mdiff,ui,hg,util,archival,templater")
from mercurial.node import *
from mercurial.i18n import gettext as _
def splitURI(uri):
""" Return path and query splited from uri

View File

@ -56,6 +56,8 @@ try:
self.includes = self.includes.split(',')
self.includes += mercurial.packagescan.getmodules(self.build_lib,
'mercurial')
self.includes += mercurial.packagescan.getmodules(self.build_lib,
'mercurial/hgweb')
self.includes += mercurial.packagescan.getmodules(self.build_lib,
'hgext')
build_exe.finalize_options(self)
@ -85,7 +87,7 @@ setup(name='mercurial',
url='http://selenic.com/mercurial',
description='Scalable distributed SCM',
license='GNU GPL',
packages=['mercurial', 'hgext'],
packages=['mercurial', 'mercurial.hgweb', 'hgext'],
ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c']),
Extension('mercurial.bdiff', ['mercurial/bdiff.c'])],
data_files=[('mercurial/templates',