Show More
@@ -106,5 +106,5 b' gitwash-update:' | |||
|
106 | 106 | nightly: dist |
|
107 | 107 | rsync -avH --delete dist/ ipython:www/doc/nightly |
|
108 | 108 | |
|
109 |
gh-pages: html |
|
|
109 | gh-pages: clean html | |
|
110 | 110 | python gh-pages.py |
@@ -83,7 +83,7 b" if __name__ == '__main__':" | |||
|
83 | 83 | tag = sys.argv[1] |
|
84 | 84 | except IndexError: |
|
85 | 85 | try: |
|
86 | tag = sh2('git describe') | |
|
86 | tag = sh2('git describe --exact-match') | |
|
87 | 87 | except CalledProcessError: |
|
88 | 88 | tag = "dev" # Fallback |
|
89 | 89 | |
@@ -102,12 +102,16 b" if __name__ == '__main__':" | |||
|
102 | 102 | |
|
103 | 103 | # don't `make html` here, because gh-pages already depends on html in Makefile |
|
104 | 104 | # sh('make html') |
|
105 | if tag != 'dev': | |
|
106 | # only build pdf for non-dev targets | |
|
107 | sh2('make pdf') | |
|
105 | 108 | |
|
106 | 109 | # This is pretty unforgiving: we unconditionally nuke the destination |
|
107 | 110 | # directory, and then copy the html tree in there |
|
108 | 111 | shutil.rmtree(dest, ignore_errors=True) |
|
109 | 112 | shutil.copytree(html_dir, dest) |
|
110 | shutil.copy(pjoin(pdf_dir, 'ipython.pdf'), pjoin(dest, 'ipython.pdf')) | |
|
113 | if tag != 'dev': | |
|
114 | shutil.copy(pjoin(pdf_dir, 'ipython.pdf'), pjoin(dest, 'ipython.pdf')) | |
|
111 | 115 | |
|
112 | 116 | try: |
|
113 | 117 | cd(pages_dir) |
@@ -118,7 +122,7 b" if __name__ == '__main__':" | |||
|
118 | 122 | branch) |
|
119 | 123 | raise RuntimeError(e) |
|
120 | 124 | |
|
121 | sh('git add %s' % tag) | |
|
125 | sh('git add -A %s' % tag) | |
|
122 | 126 | sh('git commit -m"Updated doc release: %s"' % tag) |
|
123 | 127 | |
|
124 | 128 | print 'Most recent 3 commits:' |
General Comments 0
You need to be logged in to leave comments.
Login now