sdch/README.chromium - Issue 2204683003: Roll open-vcdiff 21d7d0b9:2b9bd1fe

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: sdch/README.chromium

Issue 2204683003: Roll open-vcdiff 21d7d0b9:2b9bd1fe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 682f6873 -> 2b9bd1fe Created 4 years, 4 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

Index: sdch/README.chromium

diff --git a/sdch/README.chromium b/sdch/README.chromium

index 93ae6a04b1a1ab8f507d2a5026b99a2829525762..bc13166a211c4f96476001574e0ffcbd139cf494 100644

--- a/sdch/README.chromium

+++ b/sdch/README.chromium

@@ -1,19 +1,22 @@

-The linux directory contains a config.h generated from a run of configure on

-Ubuntu 10.04.1 LTS x86_64, with VCDIFF_USE_BLOCK_COMPARE_WORDS manually

-changed to match the $host_cpu test in configure.

+The linux directory contains a config.h generated from Ubuntu 14.04 LTS and

+cmake 2.8.12.2.

-The mac directory contains a config.h generated from a run of configure on a

-Mac, with VCDIFF_USE_BLOCK_COMPARE_WORDS manually changed to match the

-$host_cpu test in configure.

+The mac directory contains a config.h generated from OS X 10.11.6, XCode 7.3,

+and cmake 3.4.

-The ios directory contains a config.h generated from a run of configure

---host=arm-apple-darwin10 on a Mac with the following environment variables:

- CC=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -x c -arch armv6

- CFLAGS=-mno-thumb -miphoneos-version-min=4.2

- CPPFLAGS=-isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS4.3.sdk

- CXX=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/gcc-4.2 -x c++ -arch armv6

- CXXFLAGS=-mno-thumb -miphoneos-version-min=4.2

+The ios directory contains a copy of the mac config.h. Since the mac config.h

+contains almost nothing, this is probably fine.

-The win directory contains a config.h that forwards to one provided with

-open-vcdiff. We have this to avoid putting open-vcdiff's minimal stdint.h hack

-into our include path.

+The win directory contains a config.h generated from Windows 7, VS 2013, and

+cmake 3.6 with 682f68732898c8ec621427fdd734b3b0ac223ec5 checked out. In a shell

+with the VC tools in the path, do:

+ cd \src

+ git clone https://github.com/google/open-vcdiff

+ cd open-vcdiff

+ git submodule update --init --recursive

+ mkdir buildfoo

+ cd buildfoo

+ "C:\Program Files\CMake\bin\cmake.exe" -GNinja ..

+Then copy the generated config.h out of the root of your open-vcdiff checkout.

« no previous file with comments | « sdch/BUILD.gn ('k') | sdch/ios/config.h » ('j') | no next file with comments »