diff options
| author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-02-18 17:47:13 +0000 |
|---|---|---|
| committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2008-02-18 17:47:13 +0000 |
| commit | 5449d7431d9e6af50eb115b1cd9cdeb78035cf46 (patch) | |
| tree | a1a8f0208bec11673f0f5704dcc9dee6f00a560e | |
| parent | Clarified tcp-queue-limit man page entry (diff) | |
| download | openvpn-5449d7431d9e6af50eb115b1cd9cdeb78035cf46.tar.xz | |
Version 2.1_rc7a.
Minor Windows build system changes:
* Fall back to prebuilt-binary if gcc is not available.
* Documentation changes in ./domake-win
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2760 e7ae566f-a301-0410-adde-c780ea21d3b5
| -rw-r--r-- | domake-win | 17 | ||||
| -rw-r--r-- | install-win32/makeopenvpn | 4 | ||||
| -rw-r--r-- | install-win32/makeservice | 2 | ||||
| -rw-r--r-- | install-win32/maketap | 2 | ||||
| -rw-r--r-- | install-win32/maketapinstall | 2 |
5 files changed, 15 insertions, 12 deletions
@@ -51,13 +51,16 @@ # Setting up a complete tool chain to build OpenVPN and all # dependencies on Windows can be an onerous task, so the capability # is provided to reference a directory of pre-built components during -# the build process. This would allow you, for example, to build an -# OpenVPN installer with custom edits to install-win32/settings.in, -# but then avoid needing to build all other components (such as OpenSSL, -# LZO, Pkcs11-helper, TAP driver windows service, etc.). The procedure -# is as follows. First Download and expand the pre-built binaries from: -# -# http://openvpn.net/beta/windows-devel/ (choose the most recent .tbz file) +# the build process. When dependencies are missing to build a given +# component (such as the TAP driver), the build script will auto-detect +# this and use the pre-built version instead. This would allow you, for +# example, to build an OpenVPN installer with custom edits to +# install-win32/settings.in, but then avoid needing to build all other +# components (such as OpenSSL, LZO, Pkcs11-helper, TAP driver windows +# service, etc.). The procedure is as follows. First Download and expand +# the pre-built binaries from: +# +# https://secure.openvpn.net/devel/ (choose the most recent -prebuilt .tbz file) # # After expanding the .tbz file, cd to the top level directory and # expand an OpenVPN source distribution taken from either the subversion diff --git a/install-win32/makeopenvpn b/install-win32/makeopenvpn index be43fdc..234dea5 100644 --- a/install-win32/makeopenvpn +++ b/install-win32/makeopenvpn @@ -3,7 +3,7 @@ # get version.nsi definitions . autodefs/defs.sh -if [ -d "$OPENSSL_DIR" ] && [ -d "$LZO_DIR" ] && [ -d "$PKCS11_HELPER_DIR" ]; then +if gcc --version &>/dev/null && [ -d "$OPENSSL_DIR" ] && [ -d "$LZO_DIR" ] && [ -d "$PKCS11_HELPER_DIR" ]; then # build OpenVPN binary [ "$CLEAN" = "yes" ] && make -f makefile.w32 clean make -f makefile.w32 -j $MAKE_JOBS @@ -13,5 +13,5 @@ if [ -d "$OPENSSL_DIR" ] && [ -d "$LZO_DIR" ] && [ -d "$PKCS11_HELPER_DIR" ]; th cp $PRODUCT_UNIX_NAME.exe $GENOUT/bin strip $GENOUT/bin/$PRODUCT_UNIX_NAME.exe else - echo DID NOT BUILD openvpn.exe because one or more of OPENSSL_DIR, LZO_DIR, or PKCS11_HELPER_DIR directories were missing + echo DID NOT BUILD openvpn.exe because one or more of gcc, OPENSSL_DIR, LZO_DIR, or PKCS11_HELPER_DIR directories were missing fi diff --git a/install-win32/makeservice b/install-win32/makeservice index 081ee0a..688e0f5 100644 --- a/install-win32/makeservice +++ b/install-win32/makeservice @@ -26,5 +26,5 @@ if [ -d "$SVC_TEMPLATE" ] ; then cp service-win32/${PRODUCT_UNIX_NAME}serv.exe $GENOUT/bin strip $GENOUT/bin/${PRODUCT_UNIX_NAME}serv.exe else - echo OpenVPN service template directory $SVC_TEMPLATE NOT FOUND + echo OpenVPN service not built -- template directory $SVC_TEMPLATE NOT FOUND fi diff --git a/install-win32/maketap b/install-win32/maketap index ef9db13..9263f68 100644 --- a/install-win32/maketap +++ b/install-win32/maketap @@ -96,5 +96,5 @@ if [ -n "$DRVBINDEST" ] ; then fi else - echo Not building TAP driver -- DDK version $DDKVER NOT INSTALLED + echo Not building TAP driver -- DDK version $DDKVER NOT FOUND fi diff --git a/install-win32/maketapinstall b/install-win32/maketapinstall index a5aaf47..11cb915 100644 --- a/install-win32/maketapinstall +++ b/install-win32/maketapinstall @@ -73,5 +73,5 @@ fi title openvpn-build &>/dev/null else - echo Not building tapinstall -- DDK version $DDKVER NOT INSTALLED + echo Not building tapinstall -- DDK version $DDKVER NOT BUILT fi |