This is an archive of the discontinued LLVM Phabricator instance.

Differential D49776

Update framework-header-fix to force system sed
ClosedPublic

Authored by keith on Jul 24 2018, 10:53 PM.

Details

Reviewers
kastiglione
beanz
Commits
rG3d2de274c7b0: Update framework-header-fix to force system sed
rLLDB346099: Update framework-header-fix to force system sed
rL346099: Update framework-header-fix to force system sed
Summary

There are 2 changes here:

  1. Use system sed instead of the sed found in the user's path. This fixes this script in the case the user has gnu-sed in their $PATH before bsd sed since -i '' isn't compatible and you need -i instead.
  1. set -e in this script so it fails as soon as one of these commands fail instead of throwing errors for each file if they fail

Since this is only ran on macOS, and we're already using this
absolute path below, this seems like a safe addition

Diff Detail

Repository
rL LLVM

Event Timeline

keith created this revision.Jul 24 2018, 10:53 PM
Harbormaster completed remote builds in B20681: Diff 157194.Jul 24 2018, 10:53 PM
keith added a reviewer: lldb-commits.Jul 24 2018, 10:54 PM
keith removed a reviewer: lldb-commits.Jul 24 2018, 11:00 PM
keith added a subscriber: lldb-commits.
keith added a reviewer: beanz.Jul 24 2018, 11:22 PM
keith edited the summary of this revision. (Show Details)Jul 25 2018, 12:22 AM
keith edited the summary of this revision. (Show Details)
keith removed a subscriber: lldb-commits.Jul 25 2018, 12:46 AM
keith added a subscriber: lldb-commits.
kastiglione accepted this revision.Jul 26 2018, 7:24 AM

LGTM

This revision is now accepted and ready to land.Jul 26 2018, 7:24 AM
Closed by commit rL346099: Update framework-header-fix to force system sed (authored by kastiglione). · Explain WhyNov 4 2018, 7:59 AM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptNov 4 2018, 7:59 AM
kastiglione added a comment.EditedNov 4 2018, 8:02 AM

@keith I screwed up and committed without amending the commit message to attribute you as the author :( – I'm sorry

keith added a subscriber: kastiglione.Nov 4 2018, 8:48 AM

No worries, thanks!

Keith Smiley

Revision Contents

PathSize
lldb/
trunk/
scripts/
13 lines

Diff 172523

lldb/trunk/scripts/framework-header-fix.sh

#!/bin/sh #!/bin/sh
# Usage: framework-header-fix.sh <source header dir> <LLDB Version> # Usage: framework-header-fix.sh <source header dir> <LLDB Version>
set -e
for file in `find $1 -name "*.h"` for file in `find $1 -name "*.h"`
do do
sed -i.bak 's/\(#include\)[ ]*"lldb\/\(API\/\)\{0,1\}\(.*\)"/\1 <LLDB\/\3>/1' "$file" /usr/bin/sed -i.bak 's/\(#include\)[ ]*"lldb\/\(API\/\)\{0,1\}\(.*\)"/\1 <LLDB\/\3>/1' "$file"
sed -i.bak 's|<LLDB/Utility|<LLDB|' "$file" /usr/bin/sed -i.bak 's|<LLDB/Utility|<LLDB|' "$file"
LLDB_VERSION=`echo $2 | /usr/bin/sed -E 's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\1/g'` LLDB_VERSION=`echo $2 | /usr/bin/sed -E 's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\1/g'`
LLDB_REVISION=`echo $2 | /usr/bin/sed -E 's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\3/g'` LLDB_REVISION=`echo $2 | /usr/bin/sed -E 's/^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?$/\\3/g'`
LLDB_VERSION_STRING=`echo $2` LLDB_VERSION_STRING=`echo $2`
sed -i.bak "s|//#define LLDB_VERSION$|#define LLDB_VERSION $LLDB_VERSION |" "$file" /usr/bin/sed -i.bak "s|//#define LLDB_VERSION$|#define LLDB_VERSION $LLDB_VERSION |" "$file"
sed -i.bak "s|//#define LLDB_REVISION|#define LLDB_REVISION $LLDB_REVISION |" "$file" /usr/bin/sed -i.bak "s|//#define LLDB_REVISION|#define LLDB_REVISION $LLDB_REVISION |" "$file"
sed -i.bak "s|//#define LLDB_VERSION_STRING|#define LLDB_VERSION_STRING \"$LLDB_VERSION_STRING\" |" "$file" /usr/bin/sed -i.bak "s|//#define LLDB_VERSION_STRING|#define LLDB_VERSION_STRING \"$LLDB_VERSION_STRING\" |" "$file"
rm -f "$file.bak" rm -f "$file.bak"
done done