Bug #142 fixed svn/git version checking

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5691 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 86d2717d43785cb7e80e1b2266d2f5436db4755d
Former-commit-id: 608c9069f400246620ff5dbc86a8645d6c9d550f
This commit is contained in:
mungewell 2013-08-29 02:35:21 +00:00
parent 75f9d8b3a5
commit 09fc1d9522
2 changed files with 25 additions and 20 deletions

View file

@ -38,9 +38,9 @@ def check_version(myfile):
# Return GIT revision
if _has_pygit and options.git:
repo = Repo(myfile)
commits = repo.commits(path=myfile, max_count=1)
if commits:
for line in commits[0].message.splitlines():
headcommit = repo.head.commit
if headcommit:
for line in headcommit.message.splitlines():
if line.startswith("git-svn-id:"):
return int(line.split("@", 1)[1].split(" ",1)[0])
else:
@ -78,19 +78,20 @@ def get_screenshot(module, index, car, skin, skintargets):
j = i.find("section")
# modify attributes
for k in list(j):
if k.attrib["name"] == "idx":
k.set("val", index)
if k.attrib["name"] == "module":
k.set("val", module)
if k.attrib["name"] == "skin targets":
k.set("val", skintargets)
if k.attrib["name"] == "skin name":
skin_done = True
if skin:
k.set("val", skin)
else:
j.remove(k)
if j is not None:
for k in list(j):
if k.attrib["name"] == "idx":
k.set("val", index)
if k.attrib["name"] == "module":
k.set("val", module)
if k.attrib["name"] == "skin targets":
k.set("val", skintargets)
if k.attrib["name"] == "skin name":
skin_done = True
if skin:
k.set("val", skin)
else:
j.remove(k)
if not skin_done and skin:
# Need to add skin attribute

View file

@ -1,12 +1,12 @@
# Script to scan through all robots
# Uncommet for SVN version checking
# Uncomment for SVN version checking
versioning="-s"
# of for Git-svn version checking
# or for Git-svn version checking
#versioning="-g"
# Process all files regardless of versions
# Process all files regardless of versioning
#versioning="-a"
drivers="`pwd`/../../../data/drivers"
@ -14,7 +14,7 @@ cars="`pwd`/../../../data/cars/models/"
# Enable the screen shots
config="-C $HOME/.speed-dreams-2"
run="-r /usr/local/games/speed-dreams-2"
run="-r /storage/speed-dreams-git-svn/games/speed-dreams-2"
# Use alternative script to process images
#proc="-p my_script.sh"
@ -26,6 +26,7 @@ python check_car_skins.py -c $cars $versioning $config $run $proc
python check_robot_skins.py -d $drivers/usr_36GP -c $cars $versioning $config $run $proc usr_36GP.xml
python check_robot_skins.py -d $drivers/usr_ls1 -c $cars $versioning $config $run $proc usr_ls1.xml
python check_robot_skins.py -d $drivers/usr_ls2 -c $cars $versioning $config $run $proc usr_ls2.xml
python check_robot_skins.py -d $drivers/usr_ls1 -c $cars $versioning $config $run $proc usr_lp1.xml
python check_robot_skins.py -d $drivers/usr_mpa1 -c $cars $versioning $config $run $proc usr_mpa1.xml
python check_robot_skins.py -d $drivers/usr_sc -c $cars $versioning $config $run $proc usr_sc.xml
python check_robot_skins.py -d $drivers/usr_trb1 -c $cars $versioning $config $run $proc usr_trb1.xml
@ -35,11 +36,14 @@ python check_robot_skins.py -d $drivers/usr_rs -c $cars $versioning $config $r
python check_robot_skins.py -d $drivers/simplix_36GP -c $cars $versioning $config $run $proc simplix_36GP.xml
python check_robot_skins.py -d $drivers/simplix_ls1 -c $cars $versioning $config $run $proc simplix_ls1.xml
python check_robot_skins.py -d $drivers/simplix_ls2 -c $cars $versioning $config $run $proc simplix_ls2.xml
python check_robot_skins.py -d $drivers/simplix_lp1 -c $cars $versioning $config $run $proc simplix_lp1.xml
python check_robot_skins.py -d $drivers/simplix_mp5 -c $cars $versioning $config $run $proc simplix_mp5.xml
python check_robot_skins.py -d $drivers/simplix_sc -c $cars $versioning $config $run $proc simplix_sc.xml
python check_robot_skins.py -d $drivers/simplix_trb1 -c $cars $versioning $config $run $proc simplix_trb1.xml
python check_robot_skins.py -d $drivers/simplix_mpa1 -c $cars $versioning $config $run $proc simplix_mpa1.xml
python check_robot_skins.py -d $drivers/simplix_ref -c $cars $versioning $config $run $proc simplix_ref.xml
# Kilo2008
python check_robot_skins.py -d $drivers/kilo2008/ -c $cars $versioning $config $run $proc kilo2008.xml