diff --git a/documentation/getting.sgml b/documentation/getting.sgml index 9113fa00bba..ad6f5e05a0e 100644 --- a/documentation/getting.sgml +++ b/documentation/getting.sgml @@ -61,9 +61,9 @@ In most cases on a Debian system, you can install Wine with a single command, as root: - -# apt-get install wine - + +# apt-get install wine + apt-get will connect to a Debian archive across the Internet (thus, you must be online), then download @@ -94,12 +94,12 @@ For example, if you saved the file to your home directory, you might perform the following actions to install it: - -$ su - -<Type in root password> -# cd /home/user -# dpkg -i wine_0.0.20021031-1.deb - + +$ su - +Password: +# cd /home/user +# dpkg -i wine_0.0.20021031-1.deb + You may also want to install the wine-doc package, and if you are @@ -130,9 +130,9 @@ $ su - and then switch to the directory you downloaded the rpm file to. Once there, type this one command as root: - -# rpm -ivh wine-20020605-2.i386.rpm - + +# rpm -ivh wine-20020605-2.i386.rpm + You may also want to install the wine-devel package. @@ -218,23 +218,24 @@ $ su - The official releases are tagged by date with the format - "Wine-YYYYMMDD.tar.gz". Your best bet is to grab the latest - one. + "Wine-YYYYMMDD.tar.gz". Your best bet is to grab + the latest one. - Once you have downloaded this, you must first compile wine, and then install it. - To do this is not very hard. First switch to the directory containing the file - you just downloaded. Then extract the source with (e.g.): + Once you have downloaded this, you must first compile wine, and then + install it. This is not very hard to do. First switch to the + directory containing the file you just downloaded. Then extract the + source with (e.g.): + +# tar xzvf wine-20021031.tar.gz + - -# tar xzvf wine-20021031.tar.gz - Then, switch to the directory that was created and compile it by typing (e.g.): + +# ./tools/wineinstall + - -# ./tools/wineinstall - NOTE: You must make sure that you are not the superuser (root) when doing this, and that you have write permission to the directory that was created by the tar @@ -248,21 +249,21 @@ $ su - The official web page for Wine CVS is - http://www.winehq.com/development/. + http://www.winehq.com/development/. First, you need to get a copy of the latest Wine sources using CVS. You can tell it where to find the source tree by setting the CVSROOT environment variable. You also have to log in anonymously to the wine CVS server. In - bash, it might look something like this: + bash, it might look something like this: + +$ export CVSROOT=:pserver:cvs@cvs.winehq.com:/home/wine +$ cvs login +Password: +$ cvs checkout wine + - -$ export CVSROOT=:pserver:cvs@cvs.winehq.com:/home/wine -$ cvs login -Password: cvs -$ cvs checkout wine - That'll pull down the entire Wine source tree from winehq.com and place it in the current directory (actually @@ -270,37 +271,37 @@ $ cvs checkout wine parameters, so there are many ways to pull down files, from anywhere in the revision history. Later, you can grab just the updates: + +$ cvs -PAd update + - -$ cvs -PAd update - - cvs update works from inside the source tree. - You don't need the CVSROOT environment variable + cvs update works from inside the source tree. + You don't need the CVSROOT environment variable to run it either. You just have to be inside the source tree. - The -P, -A and -d + The -P, -A and -d options make sure your local Wine tree directory structure stays in sync with the remote repository. After you've made changes, you can create a patch with - cvs diff -u, which sends output to stdout - (the -u controls the format of the - patch). So, to create an my_patch.diff + cvs diff -u, which sends output to stdout + (the -u controls the format of the + patch). So, to create an my_patch.diff file, you would do this: + +$ cvs diff -u >my_patch.diff + - -$ cvs diff -u > my_patch.diff - You can call cvs diff from anywhere in the tree (just like cvs update), and it will always grab recursively from that point. You can also specify single files or subdirectories: + +$ cvs diff -u dlls/winaspi >my_aspi_patch.diff + - -$ cvs diff -u dlls/winaspi > my_aspi_patch.diff - Experiment around a little. It's fairly intuitive. @@ -313,55 +314,54 @@ $ cvs diff -u dlls/winaspi > my_aspi_patch.diff distribution, you have the option of applying patches to the source tree to fix bugs and add experimental features. Perhaps you've found a bug, reported it to the Wine mailing list, + url="mailto:wine-devel@winehq.com">Wine mailing list, and received a patch file to fix the bug. You can apply the - patch with the patch command, which takes a - streamed patch from stdin: + patch with the patch command, which takes a + streamed patch from stdin: + +$ cd wine +$ patch -p0 <../patch_to_apply.diff + - -$ cd wine -$ patch -p0 < ../patch_to_apply.diff - - To remove the patch, use the -R option: + To remove the patch, use the -R option: + +$ patch -p0 -R <../patch_to_apply.diff + - -$ patch -p0 -R < ../patch_to_apply.diff - If you want to do a test run to see if the patch will apply successfully (e.g., if the patch was created from an older or newer version of the tree), you can use the - --dry-run parameter to run the patch + --dry-run parameter to run the patch without writing to any files: + +$ patch -p0 --dry-run <../patch_to_apply.diff + - -$ patch -p0 --dry-run < ../patch_to_apply.diff - - patch is pretty smart about extracting + patch is pretty smart about extracting patches from the middle of a file, so if you save an email with an inlined patch to a file on your hard drive, you can invoke patch on it without stripping out the email headers and other - text. patch ignores everything that doesn't + text. patch ignores everything that doesn't look like a patch. - The -p0 option to patch + The -p0 option to patch tells it to keep the full file name from the patch file. For example, if the file name in the patch file was - wine/programs/clock/main.c. - Setting the -p0 option would apply the patch + wine/programs/clock/main.c. + Setting the -p0 option would apply the patch to the file of the same name i.e. - wine/programs/clock/main.c . - Setting the -p1 option would strip off the + wine/programs/clock/main.c . + Setting the -p1 option would strip off the first part of the file name and apply - the patch instead to programs/clock/main.c . - The -p1 option would be useful if you named + the patch instead to programs/clock/main.c . + The -p1 option would be useful if you named your top level wine directory differently to the person who sent you - the patch. For the -p1 option - patch should be run from the top level wine directory. - + the patch. For the -p1 option + patch should be run from the top level wine directory.