libraries/gtest-1.5.0/nacl-gtest-1.5.0.sh - Issue 11885025: Allow re-targeting of naclports install

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: libraries/gtest-1.5.0/nacl-gtest-1.5.0.sh

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« examples/games/nethack-3.4.3/nacl-nethack-3.4.3.sh ('K') | « libraries/gmock-1.5.0/nacl-gmock-1.5.0.sh ('k') | libraries/jsoncpp-0.5.0/nacl-jsoncpp-0.5.0.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: libraries/gtest-1.5.0/nacl-gtest-1.5.0.sh

diff --git a/libraries/gtest-1.5.0/nacl-gtest-1.5.0.sh b/libraries/gtest-1.5.0/nacl-gtest-1.5.0.sh

index 1f5152d3ce348449ccf128f221034f3836e85cfb..4beed118cb2c63fe6b76a1bf65bc3d560b7242fc 100755

--- a/libraries/gtest-1.5.0/nacl-gtest-1.5.0.sh

+++ b/libraries/gtest-1.5.0/nacl-gtest-1.5.0.sh

@@ -32,11 +32,11 @@ CustomConfigureStep() {

}

CustomInstallStep() {

- Remove ${NACL_SDK_USR_INCLUDE}/gtest

+ Remove ${NACLPORTS_INCLUDE}/gtest

readonly THIS_PACKAGE_PATH=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}

- (ChangeDir include; tar cf - --exclude='gtest-death-test.h' --exclude='gtest-death-test-internal.h' gtest | (ChangeDir ${NACL_SDK_USR_INCLUDE}; tar xfp -))

- Remove ${NACL_SDK_USR_LIB}/${LIB_GTEST}

- install -m 644 ${LIB_GTEST} ${NACL_SDK_USR_LIB}/${LIB_GTEST}

+ (ChangeDir include; tar cf - --exclude='gtest-death-test.h' --exclude='gtest-death-test-internal.h' gtest | (ChangeDir ${NACLPORTS_INCLUDE}; tar xfp -))

+ Remove ${NACLPORTS_LIBDIR}/${LIB_GTEST}

+ install -m 644 ${LIB_GTEST} ${NACLPORTS_LIBDIR}/${LIB_GTEST}

DefaultTouchStep

}