Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v8: update make-v8.sh to use git #9393

Closed
wants to merge 9 commits into from
Closed

v8: update make-v8.sh to use git #9393

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3deb42
v8: update make-v8.sh to use git
Nov 1, 2016
3c54a7e
addressed comments and added a rsync command to copy local
Nov 2, 2016
73e7c69
Using git clean quiet option instead of directing stdout to /dev/null
Nov 3, 2016
7d8effd
perform git cleanup for all branches
Nov 4, 2016
fd9fd66
removed passing branch as an argument instead quering from
Nov 4, 2016
0171280
remove unnecessary branch checking
Nov 5, 2016
60bcadb
Addressed comments
Nov 8, 2016
971ef91
Remove .git directory from fetched copy of v8
Nov 8, 2016
8c995f4
Use git stash to preserve local changes
Nov 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ cctest: all
@out/$(BUILDTYPE)/$@

v8:
tools/make-v8.sh v8
tools/make-v8.sh
$(MAKE) -C deps/v8 $(V8_ARCH).$(BUILDTYPE_LOWER) $(V8_BUILD_OPTIONS)

test: all
Expand Down
49 changes: 29 additions & 20 deletions tools/make-v8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,47 @@
#!/bin/bash


git_origin=$(git config --get remote.origin.url | sed 's/.\+[\/:]\([^\/]\+\/[^\/]\+\)$/\1/')
git_branch=$(git rev-parse --abbrev-ref HEAD)
v8ver=${1:-v8} #default v8
svn_prefix=https://github.com
svn_path="$svn_prefix/$git_origin/branches/$git_branch/deps/$v8ver"
#svn_path="$git_origin/branches/$git_branch/deps/$v8ver"
gclient_string="solutions = [{'name': 'v8', 'url': '$svn_path', 'managed': False}]"
# Get V8 branch from v8/include/v8-version.h
MAJOR=$(grep V8_MAJOR_VERSION deps/v8/include/v8-version.h | cut -d ' ' -f 3)
MINOR=$(grep V8_MINOR_VERSION deps/v8/include/v8-version.h | cut -d ' ' -f 3)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will only work if the cwd when running the script is the Node.js src root.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which should be the case always, since this script is only run by make and the Makefile is in that directory.

BRANCH=$MAJOR.$MINOR

# clean up if someone presses ctrl-c
trap cleanup INT

function cleanup() {
trap - INT

rm .gclient || true
rm .gclient_entries || true
rm -rf _bad_scm/ || true

#if v8ver isn't v8, move the v8 folders
#back to what they were
if [ "$v8ver" != "v8" ]; then
mv v8 $v8ver
mv .v8old v8
fi
echo "git cleanup"
git reset --hard HEAD
git clean -e .v8old -ffdq
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there subdirectories with .git directories in them?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the original code there are no directories with .git, but deps/v8 will have .git directory when this script is run more than once, because after the script is run, deps/v8 is the fetched copy from google which contains the .git directory.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although, the directory which would contain ".git" I'm excluding explicitly, so the extra -f option could be removed. I would personally keep it for completeness, such that no directory is skipped in case.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Anyway, we are syncing every time. So removing .git directories would be okay, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, every time the script is run, a new copy of v8 is fetched from google and old one with .git is removed ( which is only untracked directory with .git).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I am thinking is, why should we have the .git directory at all, during the cleanup we can remove that as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, git clean won't delete .git files since git won't track .git directory. I can manually delete deps/v8/.git before git clean and remove the extra -f option.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

# Copy local files
rsync -a .v8old/ v8/
rm -rf .v8old
exit 0
}

cd deps
echo $gclient_string > .gclient
if [ "$v8ver" != "v8" ]; then
mv v8 .v8old
mv $v8ver v8
# Preserve local changes
mv v8 .v8old

echo "Fetching v8 from chromium.googlesource.com"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: We may not have to mention the location.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for someone looking at the job's console log, this would be useful information?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: in the echo below, it is V8

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, thanks.

fetch v8
if [ "$?" -ne 0 ]; then
echo "V8 fetch failed"
exit 1
fi
echo "V8 fetched"

cd v8

echo "Checking out branch:$BRANCH"
git fetch
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I am not wrong, fetch v8 will fetch everything. So this may not be necessary.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this fetch is not necessary, updated. Thanks.

git checkout remotes/branch-heads/$BRANCH

echo "Sync dependencies"
gclient sync

cd ..
cleanup