q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 21:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make resync_svn.sh remove binary diffs

Browse source 
patch stops when binary diff sections are reached.
This commit is contained in:
zturtleman 2017-08-07 04:21:36 +00:00
parent 3df75e2afd
commit 3a54e2d53b
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
engine/resync_svn.sh
View file

@ -318,12 +318,26 @@ fi
#
PATCH="$OUTPREFIX${CURRENT_REV}to$RESYNC_REV.patch"
PATCH_NOBINARY="$OUTPREFIX${CURRENT_REV}to$RESYNC_REV-nobinary.patch"
# Get patch from CURRENT_REV to RESYNC_REV in $SVN_PATH
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
fi
#
# Output svn log messages
@ -352,14 +366,20 @@ fi
if [ "$APPLY_PATCH" -eq 1 ]
then
if [ -f "$PATCH_NOBINARY" ]
then
APPLY_PATCH_FILE=$PATCH_NOBINARY
else
APPLY_PATCH_FILE=$PATCH
fi
#
# Apply patch
#
# TODO: Can I check the return value to see if patching failed? (So I can tell user to fix it manually)
#
# Only shows warnings/errors about failed patching [a existing file].
patch -p0 -i $PATCH | grep -v "patching file" | grep -v "Hunk #"
patch -p0 -i $APPLY_PATCH_FILE | grep -v "patching file" | grep -v "Hunk #"
#
# Remove patch?
@ -367,6 +387,7 @@ then
# unless there is no source to patch.
#
#rm $PATCH
#rm $PATCH_NOBINARY
if [ "$USED_CFGFILE" -eq 1 ]