X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=doc%2Fwebserver%2Fuser-manual%2Finstallation.html;h=283ec9a6beaadfda9553ffc2b9e10caa3000eb82;hb=086d4aacf2fe1d729b4f4a67a7167cb6f19db043;hp=e406f26a035aded7686fb96c6a670ee34fe13977;hpb=d9813d602eb59d009d10e6d3861cd99821a6db70;p=privoxy.git diff --git a/doc/webserver/user-manual/installation.html b/doc/webserver/user-manual/installation.html index e406f26a..283ec9a6 100644 --- a/doc/webserver/user-manual/installation.html +++ b/doc/webserver/user-manual/installation.html @@ -8,7 +8,7 @@ - + @@ -128,12 +128,10 @@

2.2. Building from Source

-

The most convenient way to obtain the Privoxy sources is to download the +

The most convenient way to obtain the Privoxy source code is to download the source tarball from our project - download page.

-

If you like to live on the bleeding edge and are not afraid of using possibly unstable development versions, - you can check out the up-to-the-minute version directly from the CVS repository.

+ download page, or you can get the up-to-the-minute, possibly unstable, development version from https://www.privoxy.org/.

To build Privoxy from source, autoconf, GNU make (gmake), and, of course, a C compiler @@ -147,23 +145,19 @@ -

For retrieving the current CVS sources, you'll need a CVS client installed. Note that sources from CVS are - typically development quality, and may not be stable, or well tested. To download CVS source, check the - Sourceforge documentation, which might give commands like:

+

To build the development version, you can get the source code by doing:

-
  cvs -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa login
-  cvs -z3 -d:pserver:anonymous@ijbswa.cvs.sourceforge.net:/cvsroot/ijbswa co current
-  cd current
+
  cd <root-dir>
+  git clone https://www.privoxy.org/git/privoxy.git
-

This will create a directory named current/, which will contain the source tree.

-

You can also check out any Privoxy "branch", just - exchange the current name with the wanted branch name (Example: v_3_0_branch for - the 3.0 cvs tree).

-

It is also strongly recommended to not run Privoxy as root. You should +

This will create a directory named <root-dir>/privoxy/, which will contain + the source tree.

+

Note that source code in GIT is development quality, and may not be stable or well tested.

+

It is strongly recommended to not run Privoxy as root. You should configure/install/run Privoxy as an unprivileged user, preferably by creating a "privoxy" user and group just for this purpose. See your local documentation for the correct command line to do add new users and groups (something like adduser, but the @@ -276,6 +270,139 @@

For more detailed instructions on how to build Redhat RPMs, Windows self-extracting installers, building on platforms with special requirements etc, please consult the developer manual.

+
+

2.2.1. Windows

+
+

2.2.1.1. Setup

+

Install the Cygwin utilities needed to build Privoxy. If you have a 64 + bit CPU (which most people do by now), get the Cygwin setup-x86_64.exe program here (the .sig file is here).

+

Run the setup program and from View / Category select:

+ + + + +
+
  Devel
+    autoconf 2.5
+    automake 1.15
+    binutils
+    cmake
+    gcc-core
+    gcc-g++
+    git
+    make
+    mingw64-i686-gcc-core
+    mingw64-i686-zlib
+  Editors
+    vim
+  Libs
+    libxslt: GNOME XSLT library (runtime)
+  Net
+    curl
+    openssh
+  Text
+    docbook-dssl
+    docbook-sgml31
+    docbook-utils
+    openjade
+  Utils
+    gnupg
+  Web
+    w3m
+
+

If you haven't already downloaded the Privoxy source code, get it now:

+ + + + +
+
  mkdir <root-dir>
+  cd <root-dir>
+  git clone https://www.privoxy.org/git/privoxy.git
+
+

Get the source code (.zip or .tar.gz) for tidy from https://github.com/htacg/tidy-html5/releases, unzip into <root-dir> and build the + software:

+ + + + +
+
  cd <root-dir>
+  cd tidy-html5-x.y.z/build/cmake
+  cmake ../.. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIB:BOOL=OFF -DCMAKE_INSTALL_PREFIX=/usr/local
+  make && make install
+
+

If you want to be able to make a Windows release package, get the NSIS .zip file from https://sourceforge.net/projects/nsis/files/NSIS%203/ and extract the NSIS directory to privoxy/windows. Then edit the windows/GNUmakefile to set the location of the NSIS executable + - eg:

+ + + + +
+
# Path to NSIS
+MAKENSIS = ./nsis/makensis.exe
+
+
+
+

2.2.1.2. Build

+

To build just the Privoxy executable and not the whole installation package, do:

+ + + + +
+
  cd <root-dir>/privoxy
+  ./windows/MYconfigure && make
+
+

Privoxy uses the GNU Autotools + for building software, so the process is:

+ + + + +
+
  $ autoheader              # creates config.h.in
+  $ autoconf                # uses config.h.in to create the configure shell script
+  $ ./configure [options]   # creates GNUmakefile
+  $ make        [options]   # builds the program
+
+

The usual configure options for building a native Windows application under + cygwin are

+ + + + +
+
  --host=i686-w64-mingw32
+  --enable-mingw32
+  --enable-zlib
+  --enable-static-linking
+  --disable-pthread
+  --disable-dynamic-pcre
+
+

You can set the CFLAGS and LDFLAGS envars before running + configure to set compiler and linker flags. For example:

+ + + + +
+
  $ export CFLAGS="-O2"              # set gcc optimization level
+  $ export LDFLAGS="-Wl,--nxcompat"  # Enable DEP
+  $ ./configure --host=i686-w64-mingw32 --enable-mingw32  --enable-zlib \
+  >             --enable-static-linking --disable-pthread --disable-dynamic-pcre
+  $ make                             # build Privoxy
+
+

See the Developer's + Manual for building a Windows release package.

+
+

2.3. Keeping your Installation