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

diff --git a/domake-win b/domake-win
index ca71f25d03a4ffc65ecc6d2f61fef2da0544283b..fb04f80002a6df2e70d90f44bb2c90536cc01560 100644 (file)
--- a/domake-win
+++ b/domake-win
@@ -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 be43fdcfca52a9b2d1aacf1441a43c018ef2c151..234dea5f71b3bb2fea3266e0a5aff1f472ddd573 100644 (file)
--- 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 081ee0ab93f790ab6076434e06421600882fbb77..688e0f54c3c80dcee75f357ef05e79ca36d3b85d 100644 (file)
--- 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 ef9db134874b3affe6e18b43d58ea9b7a1a73c65..9263f680bd2759c9f1ecad9d21e90352e9771a3f 100644 (file)
--- 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 a5aaf478f0915764a9a525ca0bbdb0a77422b42e..11cb9153407286e2e4a664f94404d45c9e9d36ff 100644 (file)
--- 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