We are currently indexing your data, so search results may be incomplete until we finish.
replace subrepos with extra script logic, bundle hgcr-gui extension
Changeset 33ad81de7c4b…
Parent cd55c8711450…
by
Changes to 4 files · Browse files at 33ad81de7c4b Showing diff from parent cd55c8711450 Diff from another changeset...
|
|
@@ -1,5 +0,0 @@ - tortoisehg = http://bitbucket.org/tortoisehg/stable/
-hg-main = http://selenic.com/repo/hg/
-hg-stable = http://selenic.com/repo/hg-stable/
-asciidoc = http://hg.sharesource.org/asciidoc/
-hgfold = http://files.movedbylight.com/cgi-bin/hg/hgfold/
|
|
|
|
@@ -1,5 +0,0 @@ - 6649b4674f01c10fce6c82b4fa833adf30613c17 tortoisehg
-3ac42ca1f3e617438c9fa3732678583ec6888bf6 hg-stable
-37042e8b3b342b2e380d8be3e3f7692584c92d33 hg-main
-f90db4ee6f11b6b66864681133cabbbc7ebed573 asciidoc
-63b82f40acc8ac675b14de596c198e86a2ae40f3 hgfold
|
|
|
@@ -4,19 +4,20 @@ found on this repository's wiki:
http://bitbucket.org/tortoisehg/thg-winbuild/wiki/Home
-Subrepos:
+Repository subdirs:
+
+contrib/ - Bundled libraries and utilities external to (T)HG
+misc/ - Miscellaneous files used to build packages
+gtk-dist/ - directory where you copy GTK+ redistribution files
+
+Clones:
asciidoc - for Mercurial man pages, up to release 1.3
hg-main - Mercurial repository
hg-stable - Mercurial stable repository
tortoisehg - TortoiseHg repository
hgfold - case folding conflict detection and resolution extension
-
-Provided subdirs:
-
-contrib/ - Bundled libraries and utilities external to (T)HG
-misc/ - Miscellaneous files used to build packages
-gtk-dist/ - directory where you copy GTK+ redistribution files
+hgcr-gui - code review extension
=== Prerequisites ===
|
||
|
|
|
@@ -26,6 +26,7 @@ import getopt
import re
+
# default to TortoiseHg nightly build config
hgbranch = 'hg-stable'
hgtag = 'tip'
@@ -37,10 +38,23 @@buildthg = False
isccopts = []
dopull = None
-hgurl = 'http://selenic.com/repo/hg-stable/'
-thgurl = 'http://bitbucket.org/tortoisehg/stable/'
showconfig = False
+URL = {
+ 'hg-stable' : 'http://selenic.com/repo/hg-stable/',
+ 'hg-main' : 'http://selenic.com/repo/hg/',
+ 'tortoisehg': 'http://bitbucket.org/tortoisehg/stable/',
+ 'asciidoc' : 'http://hg.sharesource.org/asciidoc/',
+ 'hgfold' : 'http://files.movedbylight.com/cgi-bin/hg/hgfold/',
+ 'hgcr-gui' : 'http://bitbucket.org/glimchb/hgcr-gui/',
+ }
+
+def checkrepo(name, ver=''):
+ if os.path.isdir(name):
+ return
+ run(r'hg clone -U %s %s' % (URL[name], name))
+ run(r'hg update -R %s %s' % (name, ver))
+
def run(cmd, cwd='.'):
print cwd + "> " + cmd
subprocess.check_call(cmd, shell=True, cwd=cwd)
@@ -74,7 +88,6 @@ run(r'hg update ' + tag, 'build-hg')
# Comment the next line to use MSVC to build Mercurial
run(r'copy misc\setup.cfg build-hg')
- run(r'copy hgfold\fold.py build-hg\hgext')
run(r'python setup.py --version', 'build-hg')
run(r'python setup.py build_py -c -d . build_ext -i build_mo', 'build-hg')
# Build man pages
@@ -105,6 +118,8 @@ run(r'xcopy /s /q ..\gtk-dist dist', 'build-thg')
run(r'copy ..\misc\gtkrc dist\gtk\etc\gtk-2.0', 'build-thg')
run(r'copy contrib\win32\setup.cfg .', 'build-thg')
+ run(r'if exist hgfold copy hgfold\fold.py build-hg\hgext')
+ run(r'if exist hgcr-gui copy hgcr-gui\hgcr-gui.py build-hg\hgext')
# Build docs
os.environ['hhc_compiler'] = '"' + findhhc() + '"'
run(r'build chm', 'build-thg/doc')
@@ -209,6 +224,9 @@ run(r'del misc\ThgShellx??.dll')
sys.exit(0)
elif opt == '--thg-release':
+ for r in ('tortoisehg', 'hg-stable', 'hgfold'):
+ checkrepo(r)
+ checkrepo('asciidoc', '8.2.6')
buildthg = True
thgbranch = 'stable'
thgtag = '0.8.2'
@@ -217,6 +235,9 @@ isccopts.append('/F"TortoiseHg-%s-hg-%s"' % (thgtag, hgtag))
isccopts.append('/DVERSION=' + thgtag)
elif opt == '--thg-nightly':
+ for r in ('tortoisehg', 'hg-stable', 'hgfold'):
+ checkrepo(r)
+ checkrepo('asciidoc', '8.2.6')
if dopull is None:
dopull = True
buildthg = True
@@ -227,23 +248,28 @@ isccopts.append('/F"TortoiseHg-Nightly-%s"' % getdate())
isccopts.append('/DVERSION=' + getdate())
elif opt == '--thg-unstable':
+ for r in ('tortoisehg', 'hg-main', 'hgfold', 'hgcr-gui'):
+ checkrepo(r)
if dopull is None:
dopull = True
buildthg = True
thgbranch = 'default'
thgtag = 'tip'
- hgurl = 'http://selenic.com/repo/hg/'
hgbranch = 'hg-main'
hgtag = 'tip'
isccopts.append('/F"TortoiseHg-Unstable-%s"' % getdate())
isccopts.append('/DVERSION=' + getdate())
elif opt == '--hg-release':
+ checkrepo('hg-stable')
+ checkrepo('asciidoc', '8.2.6')
buildhg = True
hgbranch = 'hg-stable'
hgtag = lasttag(hgbranch)
isccopts.append('/F"Mercurial-%s"' % (hgtag))
isccopts.append('/DVERSION=' + hgtag)
elif opt == '--hg-nightly':
+ checkrepo('hg-stable')
+ checkrepo('asciidoc', '8.2.6')
if dopull is None:
dopull = True
buildhg = True
@@ -252,10 +278,10 @@ isccopts.append('/F"Mercurial-Nightly-%s"' % getdate())
isccopts.append('/DVERSION=' + getdate())
elif opt == '--hg-unstable':
+ checkrepo('hg-main')
if dopull is None:
dopull = True
buildhg = True
- hgurl = 'http://selenic.com/repo/hg/'
hgbranch = 'hg-main'
hgtag = 'tip'
isccopts.append('/F"Mercurial-Unstable-%s"' % getdate())
@@ -276,16 +302,16 @@
if buildhg:
if dopull:
- run(r'hg -R %s pull %s' % (hgbranch, hgurl))
+ run(r'hg -R %s pull %s' % (hgbranch, URL[hgbranch]))
build_hg(forcehg, hgbranch, hgtag)
build_hg_installer(isccopts)
elif buildthg:
if dopull:
- run(r'hg -R %s pull %s' % (hgbranch, hgurl))
- run(r'hg -R tortoisehg pull %s' % thgurl)
+ run(r'hg -R %s pull %s' % (hgbranch, URL[hgbranch]))
+ run(r'hg -R tortoisehg pull %s' % URL['tortoisehg'])
build_hg(forcehg, hgbranch, hgtag)
build_thg(forcethg, thgbranch, thgtag)
build_thg_installer(isccopts)
elif dopull:
- run(r'hg -R %s pull %s' % (hgbranch, hgurl))
- run(r'hg -R tortoisehg pull %s' % thgurl)
+ run(r'hg -R %s pull %s' % (hgbranch, URL[hgbranch]))
+ run(r'hg -R tortoisehg pull %s' % URL['tortoisehg'])
|
Add a tag
Loading...