Index: build.conf
===================================================================
--- build.conf (revision 17645)
+++ build.conf (working copy)
@@ -781,7 +781,7 @@
[neon]
type = lib
external-lib = $(NEON_LIBS)
-external-project = build/win32/neon
+external-project = neon/neon
libs = xml
msvc-libs = ws2_32.lib
msvc-static = yes
Index: build/generator/build_neon.ezt
===================================================================
--- build/generator/build_neon.ezt (revision 17645)
+++ build/generator/build_neon.ezt (working copy)
@@ -1,73 +0,0 @@
-@echo off
-@rem **************************************************************************
-@rem * --== WARNING ==-- This is a generated file. Do not edit!
-@rem *
-@rem * From this directory, run this batch file like so:
-@rem *
-@rem * .\build_neon debug|release (rebuild)
-@rem *
-@rem **************************************************************************
-[if-any zlib_path]
-@rem **************************************************************************
-@rem ZLib support
-set ZLIB_SRC=[zlib_path]
-if not "%1" == "debug" goto zlibend
-set ZLIB_LIB_OPTS=ZLIB_LIBS="$(ZLIB_SRC)\zlibstatD.lib"
-:zlibend[end]
-[if-any openssl_path]
-@rem **************************************************************************
-@rem OpenSSL support
-set OPENSSL_SRC=[openssl_path][end]
-
-@rem **************************************************************************
-@rem Neon is instructed to compile and link against the Expat packages within
-@rem APR. (Note that this option was introduced in Neon 0.24.6).
-set EXPAT_INC=[expat_path]
-
-@rem **************************************************************************
-cd /D [neon_path]
-set exitcode=0
-
-if "%2" == "rebuild" goto clean
-if not "%2" == "" goto pIIerr
-set target=ALL
-goto mode
-
-:clean
-set target=CLEAN ALL
-
-:mode
-if "%1" == "release" goto release
-if "%1" == "debug" goto debug
-goto pIerr
-
-@rem **************************************************************************
-:release
-@echo nmake /f neon.mak %target%
-nmake /nologo /f neon.mak %target%
-if not errorlevel 0 goto err
-goto end
-
-@rem **************************************************************************
-:debug
-@echo nmake /f neon.mak %target% DEBUG_BUILD=Aye %ZLIB_LIB_OPTS%
-nmake /nologo /f neon.mak %target% DEBUG_BUILD=Aye %ZLIB_LIB_OPTS%
-if not errorlevel 0 goto err
-goto end
-
-@rem **************************************************************************
-:pIerr
-echo error: First parameter should be "release" or "debug"
-goto err
-
-@rem **************************************************************************
-:pIIerr
-echo error: Second parameter should be "rebuild" or empty
-goto err
-
-
-@rem **************************************************************************
-:err
-set exitcode=1
-:end
-exit %exitcode%
Index: build/generator/neon.dsp.ezt
===================================================================
--- build/generator/neon.dsp.ezt (revision 17645)
+++ build/generator/neon.dsp.ezt (working copy)
@@ -30,38 +30,35 @@
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "[neon_path]\Release"
-# PROP BASE Intermediate_Dir "[neon_path]\Release"
-# PROP BASE Cmd_Line "build_neon.bat release"
-# PROP BASE Rebuild_Opt "rebuild"
-# PROP BASE Target_File "[neon_path]\libneon.lib"
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_File "libneon.lib"
# PROP BASE Bsc_Name ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "[neon_path]\Release"
-# PROP Intermediate_Dir "[neon_path]\Release"
-# PROP Cmd_Line "cmd /c build_neon.bat release"
-# PROP Rebuild_Opt "rebuild"
-# PROP Target_File "[neon_path]\libneon.lib"
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "nmake /nologo /f neon.mak ALL EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "libneon.lib"
# PROP Bsc_Name ""
!ELSEIF "$(CFG)" == "neon - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "[neon_path]\Debug"
-# PROP BASE Intermediate_Dir "[neon_path]\Debug"
-# PROP BASE Cmd_Line "build_neon.bat debug"
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Rebuild_Opt "rebuild"
-# PROP BASE Target_File "[neon_path]\libneonD.lib"
+# PROP BASE Target_File "libneonD.lib"
# PROP BASE Bsc_Name ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "[neon_path]\Debug"
-# PROP Intermediate_Dir "[neon_path]\Debug"
-# PROP Cmd_Line "cmd /c build_neon.bat debug"
-# PROP Rebuild_Opt "rebuild"
-# PROP Target_File "[neon_path]\libneonD.lib"
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "nmake /nologo /f neon.mak ALL DEBUG=Aye EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+# PROP Rebuild_Opt "/a"
+# PROP Target_File "libneonD.lib"
# PROP Bsc_Name ""
!ENDIF
Index: build/generator/neon.vcproj.ezt
===================================================================
--- build/generator/neon.vcproj.ezt (revision 17645)
+++ build/generator/neon.vcproj.ezt (working copy)
@@ -13,29 +13,29 @@
+ BuildCommandLine="nmake /nologo /f neon.mak ALL DEBUG=Aye EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ ReBuildCommandLine="nmake /nologo /f neon.mak CLEAN ALL DEBUG=Aye EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path] ZLIB_LIBS=[zlib_path]\zlibstatD.lib[end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ Output="libneonD.lib"/>
+ BuildCommandLine="nmake /nologo /f neon.mak ALL EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ ReBuildCommandLine="nmake /nologo /f neon.mak CLEAN ALL EXPAT_INC=[expat_path] [if-any zlib_path]ZLIB_SRC=[zlib_path][end] [if-any openssl_path]OPENSSL_SRC=[openssl_path][end]"
+ Output="libneon.lib"/>
Index: build/generator/gen_win.py
===================================================================
--- build/generator/gen_win.py (revision 17645)
+++ build/generator/gen_win.py (working copy)
@@ -167,17 +167,6 @@
bat = os.path.join('build', 'win32', 'build_zlib.bat')
self.write_with_template(bat, 'build_zlib.ezt', data)
- # Generate the build_neon.bat file
- data = {'neon_path': os.path.abspath(self.neon_path),
- 'expat_path': os.path.join(os.path.abspath(self.apr_util_path),
- 'xml', 'expat', 'lib'),
- 'zlib_path': self.zlib_path
- and os.path.abspath(self.zlib_path),
- 'openssl_path': self.openssl_path
- and os.path.abspath(self.openssl_path)}
- bat = os.path.join('build', 'win32', 'build_neon.bat')
- self.write_with_template(bat, 'build_neon.ezt', data)
-
# Generate the build_locale.bat file
pofiles = []
if self.enable_nls:
@@ -450,6 +439,8 @@
path = self.apr_util_path + target.external_project[8:]
elif target.external_project[:4] == 'apr/':
path = self.apr_path + target.external_project[3:]
+ elif target.external_project[:5] == 'neon/':
+ path = self.neon_path + target.external_project[4:]
else:
path = target.external_project
@@ -762,12 +753,18 @@
def write_neon_project_file(self, name):
neon_path = os.path.abspath(self.neon_path)
- self.move_proj_file(os.path.join('build', 'win32'), name,
- (('neon_path', neon_path),
- ('neon_sources',
+ self.move_proj_file(self.neon_path, name,
+ (('neon_sources',
glob.glob(os.path.join(neon_path, 'src', '*.c'))),
('neon_headers',
glob.glob(os.path.join(neon_path, 'src', '*.h'))),
+ ('expat_path', os.path.join(os.path.abspath(self.apr_util_path),
+ 'xml', 'expat', 'lib')),
+ ('zlib_path', self.zlib_path
+ and os.path.abspath(self.zlib_path)),
+ ('openssl_path', self.openssl_path
+ and os.path.abspath(self.openssl_path)),
+
))
def move_proj_file(self, path, name, params=()):