Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename rebase-firemind rule to firemind, remove old firemind rule using hg

master
melvinzhang 2014-11-01 10:02:25 +08:00
parent d5bc40b24c
commit 59357ea10a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -686,7 +686,7 @@ update:
git merge --ff-only origin/master
git fetch -v firemind master
rebase-firemind:
firemind:
git checkout -b temp --no-track firemind/master
git rebase base --onto master
git checkout master
@ -695,6 +695,7 @@ rebase-firemind:
git checkout base
git merge --ff-only firemind/master
git checkout master
make normalize_files checks debug
properties.diff:
diff <(cat `grep name= cards/scriptable.txt | sed -f scripts/normalize_name.sed | sed 's/name_/release\/Magarena\/scripts\//;s/$$/.txt/'`) \
@ -730,12 +731,6 @@ parse_missing.txt:
mv release/Magarena/scripts-curr release/Magarena/scripts
patch -p1 -R < parse_missing.patch
firemind:
hg pull firemind
hg merge
hg commit -m "merge cards from firemind"
make normalize_files checks debug
# extract name<tab>image url from gallery page
%.tsv: %.html
grep "alt.*src.*media" $^ | sed 's/.*alt="\([^"]*\)".*src="\([^"]*\)".*/\1\t\2/' > $@