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