Commit by: heikki Modified files: hardhat/buildscripts/fullchandler.py 1.20 1.21
Log message: Workaround for bug 2297, clean as last step will remove build_debug which prevents cvs up -D now working on the Mac. ViewCVS links: http://cvs.osafoundation.org/index.cgi/hardhat/buildscripts/fullchandler.py.diff?r1=text&tr1=1.20&r2=text&tr2=1.21 Index: hardhat/buildscripts/fullchandler.py diff -u hardhat/buildscripts/fullchandler.py:1.20 hardhat/buildscripts/fullchandler.py:1.21 --- hardhat/buildscripts/fullchandler.py:1.20 Thu Dec 16 11:39:33 2004 +++ hardhat/buildscripts/fullchandler.py Thu Jan 13 16:12:14 2005 @@ -353,12 +353,22 @@ log.write("cd " + moduleDir + "\n") os.chdir(moduleDir) - print "Doing make " + dbgStr + " " + clean + " all binaries install\n" - log.write("Doing make " + dbgStr + " " + clean + " all binaries install\n") + buildCmds = ' all binaries install' + + print "Doing make " + dbgStr + " " + clean + buildCmds + "\n" + log.write("Doing make " + dbgStr + " " + clean + buildCmds + "\n") - outputList = hardhatutil.executeCommandReturnOutput( [buildenv['make'], dbgStr, clean, "all binaries install" ]) + outputList = hardhatutil.executeCommandReturnOutput( [buildenv['make'], dbgStr, clean, buildCmds ]) hardhatutil.dumpOutputList(outputList, log) + if module == 'internal': + # This hack is needed because on OSX, CVS fails in + # internal/wxPython-2.5/wxPython when build_debug + # directory exists and there is a sticky tag (like date). + # This is bug 2297. + outputList = hardhatutil.executeCommandReturnOutput( [buildenv['make'], dbgStr, 'clean' ]) + hardhatutil.dumpOutputList(outputList, log) + log.write(separator) except hardhatutil.ExternalCommandErrorWithOutputList, e: print "build error" _______________________________________________ Commits mailing list [EMAIL PROTECTED] http://lists.osafoundation.org/mailman/listinfo/commits
