q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-22 03:51:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

resync_svn: filterdiff can't remove the binary patch sections

Browse source
This commit is contained in:
zturtleman 2017-08-07 04:57:33 +00:00
parent 3a54e2d53b
commit 5620be89ed
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
engine/resync_svn.sh
View file

@ -325,17 +325,20 @@ if [ ! -f "$PATCH" ] ; then
svn diff $SVN_PATH@$CURRENT_REV $SVN_PATH@$RESYNC_REV > $PATCH
fi
if [ ! -f "$PATCH_NOBINARY" ] ; then
binaryChanges=`grep -e "Index: .*\.a" -e "Index: .*\.dll" -e "Index: .*\.dylib" $PATCH`
if [ "x$binaryChanges" != "x" ]
then
binaryChanges=`echo "$binaryChanges" | sed 's/Index: //g'`
echo "Patch has binary files which need to be updated manually."
echo
echo "$binaryChanges"
echo
filterdiff -x "*.a" -x "*.dll" -x "*.dylib" $PATCH > $PATCH_NOBINARY
fi
binaryChanges=`grep -e "Index: .*\.a" -e "Index: .*\.dll" -e "Index: .*\.dylib" $PATCH`
if [ "x$binaryChanges" != "x" ]
then
binaryChanges=`echo "$binaryChanges" | sed 's/Index: //g'`
echo "Patch has binary files which need to be manually updated."
echo "You need to manually remove their diff sections from patch too."
echo
echo "$binaryChanges"
echo
# filter diff creates a broken patch
#if [ ! -f "$PATCH_NOBINARY" ] ; then
# filterdiff -x "*.a" -x "*.dll" -x "*.dylib" $PATCH > $PATCH_NOBINARY
#fi
fi