Message-ID: <4CF5178D.2010303@...515...> Date: Tue, 30 Nov 2010 17:26:05 +0200 From: =?ISO-8859-15?Q?Samuli_Sepp=E4nen?= MIME-Version: 1.0 References: <4CEFC866.6010005@...515...> <4CEFCC52.6080008@...515...> <4CEFD459.9030707@...1114...> In-Reply-To: <4CEFD459.9030707@...1114...> Subject: Re: [Openvpn-devel] [PATCH] Added fake configure.h generation to Python-based build system List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="ISO-8859-15" Content-Transfer-Encoding: quoted-printable To: David Sommerseth Cc: "openvpn-devel@lists.sourceforge.net" Hi David, > On 26/11/10 16:03, Samuli Sepp=E4nen wrote: > > One clarification... this is how configure.h will look: > > > /* Automatically generated by OpenVPN Windows build system */ > > > #define CONFIGURE_DEFINES " DIST=3Ddist, PRODUCT_TAP_RELDATE=3D04/19/20= 10, > > PRODUCT_TAP_MINOR_VER=3D7, DDKVER=3D7600.16385.1, > > OPENVPN_GUI_DIR=3D../openvpn-gui, PRODUCT_TAP_DEVICE_DESCRIPTION=3DTAP-= Win32 > > Adapter V9, OUTFILE_LABEL=3D, PRODUCT_NAME=3DOpenVPN, TISRC=3D../tapins= tall, > > PRODUCT_TAP_CHARACTERISTICS=3D0x81, PRODUCT_TAP_MAJOR_VER=3D9, > > SIGNTOOL=3D../signtool, TITLE_LABEL=3D, PRODUCT_UNIX_NAME=3Dopenvpn, > > PRODUCT_TAP_ID=3Dtap0901, PRODUCT_VERSION=3D2.2-beta, > > PRODUCT_TAP_PROVIDER=3DTAP-Win32 Provider V9, OPENSSL_DIR=3D../openssl, > > PRODUCT_FILE_EXT=3Dovpn, DDK_PATH=3Dc:/winddk/7600.16385.1, > > DDKVER_MAJOR=3D7600, MSVC=3DC:/Program Files/Microsoft Visual Studio 9.= 0, > > LZO_DIR=3D../lzo, OPENVPN_GUI=3Dopenvpn-gui-1.0.3.exe, TAP_DIST=3Dtap_d= ist, > > PRODUCT_TAP_WIN32_MIN_MINOR=3D1, PKCS11_HELPER_DIR=3D../pkcs11-helper, > > PRODUCT_SIGN_CN=3Dopenvpn, PRODUCT_TAP_WIN32_MIN_MAJOR=3D9, > > MSVC_CRT=3D../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. --=20 Samuli Sepp=E4nen Community Manager OpenVPN Technologies, Inc irc freenode net: mattock