Small updates to the setup process documentation
Change-Id: Ie6dc3a8254e30495945155f058f1ef10a75c4745 Reviewed-on: https://code.wireshark.org/review/700 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
This commit is contained in:
parent
d8265cd8c6
commit
5f508e8b29
|
@ -5,7 +5,7 @@
|
|||
++++++++++++++++++++++++++++++++++++++
|
||||
<!-- $Id$ -->
|
||||
++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
|
||||
[[ChapterSetup]]
|
||||
|
||||
== Quick Setup
|
||||
|
@ -195,7 +195,7 @@ http://code.google.com/p/gitextensions/.
|
|||
|
||||
===== TortoiseGit
|
||||
|
||||
TortoiseGit is a native Windows graphical Git
|
||||
TortoiseGit is a native Windows graphical Git
|
||||
similar to TortoiseSVN. You can download the installer from
|
||||
http://code.google.com/p/tortoisegit/.
|
||||
|
||||
|
@ -351,7 +351,7 @@ goto usage
|
|||
:usage
|
||||
echo Error in script usage. The correct usage is:
|
||||
echo %0 [option]
|
||||
echo where [option] is: x86 ^| x64
|
||||
echo where [option] is: x86 ^| x64
|
||||
echo:
|
||||
echo For example:
|
||||
echo %0 x86
|
||||
|
@ -537,10 +537,10 @@ depends on the compiler variant used. For variants other than
|
|||
the recommended Visual $$C++$$ 2010 Express Edition SP1 see the table
|
||||
at <<ChToolsMSChain>>.]
|
||||
+
|
||||
To build a 64-bit version, you will need
|
||||
_$$vcredist_x64.exe$$_:
|
||||
To build a 64-bit version, you will need
|
||||
_$$vcredist_x64.exe$$_:
|
||||
http://www.microsoft.com/en-us/download/details.aspx?id=13523[Download] the 64-bit redistributable for Visual $$C++$$ 2010 Express
|
||||
Edition SP1 (__$$vcredist_x64.exe$$__) and copy it into
|
||||
Edition SP1 (__$$vcredist_x64.exe$$__) and copy it into
|
||||
__C:\Wireshark-win64-libs__.footnoteref:[compilerdependent]
|
||||
|
||||
. If you've closed `cmd.exe` prepare it again.
|
||||
|
|
|
@ -197,11 +197,25 @@ your machine. This may take some time depending on the speed of your
|
|||
internet connection.
|
||||
--
|
||||
|
||||
. Change to the Wireshark directory and initialize git-review.
|
||||
. Then set up the git pre-commit hook and the push address:
|
||||
+
|
||||
--
|
||||
----
|
||||
$ cd wireshark
|
||||
$ cp tools/pre-commit .git/hooks/
|
||||
$ git config --add remote.origin.push HEAD:refs/for/master
|
||||
----
|
||||
This will run a few basic checks on commit to make sure that the code
|
||||
does not contain tivial errors. It will also warn if it is out of sync
|
||||
with its master copy in the tools/.
|
||||
The change in the push address is necessary: We have an asymmetric
|
||||
process for pulling and pushing because of gerrit.
|
||||
--
|
||||
|
||||
. Initialize git-review.
|
||||
+
|
||||
--
|
||||
----
|
||||
$ git review -s
|
||||
----
|
||||
This prepares your local repository for use with Gerrit, including
|
||||
|
@ -1118,4 +1132,4 @@ the 'packaging/nsis' directory.
|
|||
<!-- End of WSDG Chapter Sources -->
|
||||
++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
// vim: set syntax=asciidoc:
|
||||
// vim: set syntax=asciidoc:
|
||||
|
|
Loading…
Reference in New Issue