On 03.09.2018 12:02, Bert Huijben wrote: > Since this change the Serf Windows buildbots are broken, as this assumes > that the directories do have this suffix as it has on other plaforms. > (First fail in https://ci.apache.org/builders/serf-windows-x64/builds/208 > src\config_store.c(21) : fatal error C1083: Cannot open include file: > 'apr_strings.h': No such file or directory > scons: building terminated because of errors. > scons: *** [src\config_store.obj] Error 2)
Ah, sorry I didn't notice that. > I will see how this can be fixed in the build scripts on the server that > have these files in this location for years. Would it be an option to just > allow both forms here? We could, by putting both variants in the include path. The simple fact is, however, that APR's CMake build does not use the version suffix in the install location for include files; and, as far as I can see, nor does the Visual Studio build. That's why I changed SConstruct, to conform with what you're actually likely to see in an "installed" APR on Windows. By the way, our CMake build makes the same assumption. I'd really recommend updating the layout on the build machine. -- Brane > On Sat, Jun 9, 2018 at 2:19 PM, <br...@apache.org> wrote: > >> Author: brane >> Date: Sat Jun 9 12:19:41 2018 >> New Revision: 1833230 >> >> URL: http://svn.apache.org/viewvc?rev=1833230&view=rev >> Log: >> Fix non-source layout APR include paths on Windows. >> >> APR builds on Windows (both CMake- and the old Makefile.win-based) do not >> install include files in $PREFIX/include/apr-1 but just in $PREFIX/include. >> >> * SConstruct: Omit the '.../apr-1' directory from APR and APR-Util include >> paths on Windows. >> >> Modified: >> serf/trunk/SConstruct >> >> Modified: serf/trunk/SConstruct >> URL: http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev= >> 1833230&r1=1833229&r2=1833230&view=diff >> ============================================================ >> ================== >> --- serf/trunk/SConstruct (original) >> +++ serf/trunk/SConstruct Sat Jun 9 12:19:41 2018 >> @@ -356,7 +356,7 @@ if sys.platform == 'win32': >> env.Append(LIBS=[apr_libs, apu_libs]) >> if not env.get('SOURCE_LAYOUT', None): >> env.Append(LIBPATH=['$APR/lib', '$APU/lib'], >> - CPPPATH=['$APR/include/apr-1', '$APU/include/apr-1']) >> + CPPPATH=['$APR/include', '$APU/include']) >> elif aprstatic: >> env.Append(LIBPATH=['$APR/LibR','$APU/LibR'], >> CPPPATH=['$APR/include', '$APU/include']) >> >> >>
