diff options
author | John Stebbins <[email protected]> | 2015-08-25 09:48:14 -0700 |
---|---|---|
committer | John Stebbins <[email protected]> | 2015-08-25 14:17:11 -0700 |
commit | 4889bc95883dd2cb0eb679d381d15385b930bcfa (patch) | |
tree | 7a20ea87161e790b84b7f1cd4b0d10010201f995 /doc | |
parent | d4d9555eca3048d281d510bd51267ce67142acd6 (diff) |
build: use git version info instead of svn
Migrate from svn to git. Since our build system automatically generates
version info from the svn repo, this needs to change when we move the
repo to git.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/texi/Building.linux.texi | 4 | ||||
-rw-r--r-- | doc/texi/base/handbrake.texi.m4 | 4 | ||||
-rw-r--r-- | doc/texi/building/appendix.repo.texi | 4 | ||||
-rw-r--r-- | doc/texi/building/chapter.via.terminal.texi | 2 | ||||
-rw-r--r-- | doc/texi/building/command.texi | 2 | ||||
-rw-r--r-- | doc/texi/building/prerequisites.common.texi | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/doc/texi/Building.linux.texi b/doc/texi/Building.linux.texi index ddab914ab..015f013e1 100644 --- a/doc/texi/Building.linux.texi +++ b/doc/texi/Building.linux.texi @@ -33,7 +33,7 @@ The @b{GTK UI} introduces some significant extra build requirements. GTK version Ubuntu 14.04 packages: @itemize @bullet -@item subversion (cli/gui) +@item git (cli/gui) @item cmake (cli/gui) @item yasm (cli/gui) @item build-essential (cli/gui) @@ -67,7 +67,7 @@ Ubuntu 14.04 packages: To install these packages: @example -sudo apt-get install subversion cmake yasm build-essential autoconf libtool \ +sudo apt-get install git cmake yasm build-essential autoconf libtool \ zlib1g-dev libbz2-dev libogg-dev libtheora-dev libvorbis-dev \ libsamplerate-dev libxml2-dev libfribidi-dev libfreetype6-dev \ libfontconfig1-dev libass-dev libmp3lame-dev libx264-dev libjansson-dev \ diff --git a/doc/texi/base/handbrake.texi.m4 b/doc/texi/base/handbrake.texi.m4 index 1367c4d58..099e7f78f 100644 --- a/doc/texi/base/handbrake.texi.m4 +++ b/doc/texi/base/handbrake.texi.m4 @@ -20,10 +20,10 @@ dnl @set HB-version-hex __HB_version_hex @set HB-build __HB_build @set HB-repo-url __HB_repo_url -@set HB-repo-root __HB_repo_root @set HB-repo-branch __HB_repo_branch -@set HB-repo-uuid __HB_repo_uuid +@set HB-repo-tag __HB_repo_tag @set HB-repo-rev __HB_repo_rev +@set HB-repo-hash __HB_repo_hash @set HB-repo-date __HB_repo_date @set HB-repo-official __HB_repo_official @set HB-repo-type __HB_repo_type diff --git a/doc/texi/building/appendix.repo.texi b/doc/texi/building/appendix.repo.texi index ea7bf2d8a..59b501ed0 100644 --- a/doc/texi/building/appendix.repo.texi +++ b/doc/texi/building/appendix.repo.texi @@ -1,10 +1,10 @@ @appendix Project Repository Details @example url: @value{HB-repo-url} -root: @value{HB-repo-root} branch: @value{HB-repo-branch} -uuid: @value{HB-repo-uuid} +tag: @value{HB-repo-tag} rev: @value{HB-repo-rev} +hash: @value{HB-repo-hash} date: @value{HB-repo-date} type: @value{HB-repo-type} @end example diff --git a/doc/texi/building/chapter.via.terminal.texi b/doc/texi/building/chapter.via.terminal.texi index b5c61eb38..b98301b66 100644 --- a/doc/texi/building/chapter.via.terminal.texi +++ b/doc/texi/building/chapter.via.terminal.texi @@ -62,7 +62,7 @@ Clean-room procedures dictate that when certain factors change, old builds shoul @itemize @item configure with different options -@item subversion working dir is updated and you want configure to re-evaluate working dir metadata. +@item git working dir is updated and you want configure to re-evaluate working dir metadata. @item build corruption is suspected @end itemize diff --git a/doc/texi/building/command.texi b/doc/texi/building/command.texi index fedb58188..cd97764c0 100644 --- a/doc/texi/building/command.texi +++ b/doc/texi/building/command.texi @@ -1,4 +1,4 @@ @macro COMMAND-checkout{} -svn checkout @value{HB-repo-url} @value{HB-acro-lower}-@value{HB-repo-branch} +git clone @value{HB-repo-url} @value{HB-acro-lower}-@value{HB-repo-branch} cd @value{HB-acro-lower}-@value{HB-repo-branch} @end macro diff --git a/doc/texi/building/prerequisites.common.texi b/doc/texi/building/prerequisites.common.texi index 64c21fd38..30b1621f1 100644 --- a/doc/texi/building/prerequisites.common.texi +++ b/doc/texi/building/prerequisites.common.texi @@ -1,7 +1,7 @@ The following general tools are used on various platforms and it is recommended you use these versions or similar: @itemize @bullet -@item subversion - 1.6.16 +@item git - 2.4.3 @item python - Python 2.7.1 @item curl - curl 7.21.4 (or wget) @item m4 - GNU M4 1.4.6 |