Hi David, > On 26/11/10 16:03, Samuli Seppänen wrote: > > One clarification... this is how configure.h will look: > > > /* Automatically generated by OpenVPN Windows build system */ > > > #define CONFIGURE_DEFINES " DIST=dist, PRODUCT_TAP_RELDATE=04/19/2010, > > PRODUCT_TAP_MINOR_VER=7, DDKVER=7600.16385.1, > > OPENVPN_GUI_DIR=../openvpn-gui, PRODUCT_TAP_DEVICE_DESCRIPTION=TAP-Win32 > > Adapter V9, OUTFILE_LABEL=, PRODUCT_NAME=OpenVPN, TISRC=../tapinstall, > > PRODUCT_TAP_CHARACTERISTICS=0x81, PRODUCT_TAP_MAJOR_VER=9, > > SIGNTOOL=../signtool, TITLE_LABEL=, PRODUCT_UNIX_NAME=openvpn, > > PRODUCT_TAP_ID=tap0901, PRODUCT_VERSION=2.2-beta, > > PRODUCT_TAP_PROVIDER=TAP-Win32 Provider V9, OPENSSL_DIR=../openssl, > > PRODUCT_FILE_EXT=ovpn, DDK_PATH=c:/winddk/7600.16385.1, > > DDKVER_MAJOR=7600, MSVC=C:/Program Files/Microsoft Visual Studio 9.0, > > LZO_DIR=../lzo, OPENVPN_GUI=openvpn-gui-1.0.3.exe, TAP_DIST=tap_dist, > > PRODUCT_TAP_WIN32_MIN_MINOR=1, PKCS11_HELPER_DIR=../pkcs11-helper, > > PRODUCT_SIGN_CN=openvpn, PRODUCT_TAP_WIN32_MIN_MAJOR=9, > > MSVC_CRT=../Microsoft.VC90.CRT," > > #define CONFIGURE_CALL " config_all.py " > > > This information is stored in the openvpn executable and can be read > > with "openvpn --version". > > In general, the patch looks fine. What I'm wondering about is this > information we're collecting here. > > My question is more: To rebuild a binary with the exact same featureset > as a already prebuilt binary have, is this information sufficient? And > is it the right information? Not sure, I'm not that far in the build process yet :). > > The generated configure.h file when running via autotools will extract > ENABLE and DISABLE macros from config.h. That defines the features > being built into OpenVPN. For Windows builds outside autotools that's > another file, config-win32.h iirc. This is not auto-generated as > config.h is with autotools. Oh, I somehow managed to miss config-win32.h... > > I do see that this information here can also be important and relevant, > but maybe not as a CONFIGURE_DEFINES macro. This is more > WINBUILD_PARAMS information. > > As a user may edit config-win32.h to enable or disable features, would > it be an idea to implement a config-win32.h parser which would extract > the relevant information? Look at configure_h.awk for more information. > I agree it's better to use config-win32.h to populate CONFIGURE_DEFINES. I'll make the modification and send in another patch. Regarding WINBUILD_PARAMS... is that variable used anywhere currently? A quick "grep -r" gave zero results.
-- Samuli Seppänen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock
