##// END OF EJS Templates
require specifying the version for gh-pages...
MinRK -
Show More
@@ -133,7 +133,10 b' nightly: dist'
133 133 rsync -avH --delete dist/ ipython:www/doc/nightly
134 134
135 135 gh-pages: clean html
136 python gh-pages.py
136 # if VERSION is unspecified, it will be dev
137 # For releases, VERSION should be just the major version,
138 # e.g. VERSION=2 make gh-pages
139 python gh-pages.py $(VERSION)
137 140
138 141 texinfo:
139 142 mkdir -p $(BUILDDIR)/texinfo
@@ -82,10 +82,7 b" if __name__ == '__main__':"
82 82 try:
83 83 tag = sys.argv[1]
84 84 except IndexError:
85 try:
86 tag = sh2('git describe --exact-match')
87 except CalledProcessError:
88 tag = "dev" # Fallback
85 tag = "dev"
89 86
90 87 startdir = os.getcwdu()
91 88 if not os.path.exists(pages_dir):
@@ -117,8 +114,7 b" if __name__ == '__main__':"
117 114
118 115 try:
119 116 cd(pages_dir)
120 status = sh2('git status | head -1')
121 branch = re.match('\# On branch (.*)$', status).group(1)
117 branch = sh2('git rev-parse --abbrev-ref HEAD').strip()
122 118 if branch != 'gh-pages':
123 119 e = 'On %r, git branch is %r, MUST be "gh-pages"' % (pages_dir,
124 120 branch)
General Comments 0
You need to be logged in to leave comments. Login now