if not os.path.exists(trunkPath + "/CMakeLists.txt"): logging.warning("it's not a owb repository") exit(0) if len(sys.argv) == 2: mergeVersion = sys.argv[1] else: mergeVersion = 0 logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s', filename='/tmp/merge.log', filemode='w') if not check.checkDataIntegrity(trunkPath): print "fix all error in data files, commit and restart the merge" exit(0) print "check data integrity done" cleanOWB.clean(trunkPath) print "clean owb done" vl = version.getVersionLastMerge(trunkPath) if mergeVersion == 0: vr = version.getVersionCurrentMerge() else: vr = mergeVersion print "get version done"
if not os.path.exists(trunkPath + "/CMakeLists.txt") : logging.warning("it's not a owb repository") exit(0) if len(sys.argv) == 2 : mergeVersion = sys.argv[1] else : mergeVersion = 0 logging.basicConfig(level=logging.DEBUG, format='%(asctime)s %(levelname)s %(message)s', filename='/tmp/merge.log', filemode='w') if not check.checkDataIntegrity(trunkPath) : print "fix all error in data files, commit and restart the merge" exit(0) cleanOWB.clean(trunkPath) vl = version.getVersionLastMerge(trunkPath) if mergeVersion == 0 : vr = version.getVersionCurrentMerge() else : vr = mergeVersion patch.createOWBPatch(trunkPath, vl) patch.createWebkitPatch(trunkPath, vl, vr) patch.applyWebkitPatch(trunkPath, vr) raw_input('Fix the patches rejected and press return to continue...') modification.getListAdded(trunkPath) print "Add files in CMakeList.txt appropriate"