@@ -219,10 +219,9 @@ def build_one(version, git_branch, isdev, quick, venv, build_root, www_root,
219
219
logging .warning ("Can't change group of %s: %s" , target , str (err ))
220
220
git_clone ('https://github.com/python/cpython.git' ,
221
221
checkout , git_branch )
222
- os .chdir (checkout )
223
222
maketarget = "autobuild-" + ("dev" if isdev else "stable" ) + ("-html" if quick else "" )
224
223
logging .info ("Running make %s" , maketarget )
225
- logname = "{}-{} .log" .format (os .path .basename (checkout ), language )
224
+ logname = "{}.log" .format (os .path .basename (checkout ))
226
225
python = os .path .join (venv , "bin/python" )
227
226
sphinxbuild = os .path .join (venv , "bin/sphinx-build" )
228
227
blurb = os .path .join (venv , "bin/blurb" )
@@ -233,20 +232,20 @@ def build_one(version, git_branch, isdev, quick, venv, build_root, www_root,
233
232
shell_out (['chgrp' , '-R' , group , log_directory ])
234
233
changed = changed_files (os .path .join (checkout , "Doc/build/html" ), target )
235
234
logging .info ("Copying HTML files to %s" , target )
236
- shell_out (['chown' , '-R' , ':' + group , 'Doc/build/html/' ])
237
- shell_out (['chmod' , '-R' , 'o+r' , 'Doc/build/html/' ])
238
- shell_out (['find' , 'Doc/build/html/' , '-type' , 'd' ,
235
+ shell_out (['chown' , '-R' , ':' + group , os . path . join ( checkout , 'Doc/build/html/' ) ])
236
+ shell_out (['chmod' , '-R' , 'o+r' , os . path . join ( checkout , 'Doc/build/html/' ) ])
237
+ shell_out (['find' , os . path . join ( checkout , 'Doc/build/html/' ) , '-type' , 'd' ,
239
238
'-exec' , 'chmod' , 'o+x' , '{}' , ';' ])
240
239
if quick :
241
- shell_out (['rsync' , '-a' , 'Doc/build/html/' , target ])
240
+ shell_out (['rsync' , '-a' , os . path . join ( checkout , 'Doc/build/html/' ) , target ])
242
241
else :
243
- shell_out (['rsync' , '-a' , '--delete-delay' , 'Doc/build/html/' , target ])
242
+ shell_out (['rsync' , '-a' , '--delete-delay' , os . path . join ( checkout , 'Doc/build/html/' ) , target ])
244
243
if not quick :
245
244
logging .debug ("Copying dist files" )
246
- shell_out (['chown' , '-R' , ':' + group , 'Doc/dist/' ])
247
- shell_out (['chmod' , '-R' , 'o+r' , 'Doc/dist/' ])
248
- shell_out (['mkdir' , '-m' , 'o+rx' , '-p' , target + '/ archives' ])
249
- shell_out (['chown' , ':' + group , target + '/ archives' ])
245
+ shell_out (['chown' , '-R' , ':' + group , os . path . join ( checkout , 'Doc/dist/' ) ])
246
+ shell_out (['chmod' , '-R' , 'o+r' , os . path . join ( 'Doc/dist/' ) ])
247
+ shell_out (['mkdir' , '-m' , 'o+rx' , '-p' , os . path . join ( target , ' archives') ])
248
+ shell_out (['chown' , ':' + group , os . path . join ( target , ' archives') ])
250
249
shell_out ("cp -a Doc/dist/* %s/archives" % target , shell = True )
251
250
changed .append ("archives/" )
252
251
for fn in os .listdir (os .path .join (target , "archives" )):
0 commit comments