Author: dushshantha
Date: Wed Apr 4 01:57:52 2007
New Revision: 525466
URL: http://svn.apache.org/viewvc?view=rev&rev=525466
Log:
Fixed windows build for mod_rampart.dll
Modified:
webservices/rampart/trunk/c/build/win32/configure.in
webservices/rampart/trunk/c/build/win32/makefile
Modified: webservices/rampart/trunk/c/build/win32/configure.in
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/build/win32/configure.in?view=diff&rev=525466&r1=525465&r2=525466
==============================================================================
--- webservices/rampart/trunk/c/build/win32/configure.in (original)
+++ webservices/rampart/trunk/c/build/win32/configure.in Wed Apr 4 01:57:52
2007
@@ -1,6 +1,6 @@
-AXIS2_INSTALL_DIR = %AXIS2C_HOME%
-OPENSSL_BIN_DIR = %OPENSSL_HOME%
-
+AXIS2_BIN_DIR = d:\dummy\axis2c\build\deploy
+OPENSSL_BIN_DIR = D:\OpenSSL
+DEBUG = 1
Modified: webservices/rampart/trunk/c/build/win32/makefile
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/build/win32/makefile?view=diff&rev=525466&r1=525465&r2=525466
==============================================================================
--- webservices/rampart/trunk/c/build/win32/makefile (original)
+++ webservices/rampart/trunk/c/build/win32/makefile Wed Apr 4 01:57:52 2007
@@ -1,103 +1,133 @@
-#################################################
-# Makefile for rampart module [ msvc]
-# you can do
-# nmake all = bulid the library and tests
-# nmake clean - remove all compiler output files
-# nmake install - install the library and header files
-# nmake tests - build tests
-#################################################
-!include configure.in
+AUTOCONF = configure.in
+!include $(AUTOCONF)
-#define folders
+RAMPART = rampart
+RAMPART_SOURCE_DIR = ..\..\
-RAMPART = mod_rampart
-RAMPART_SOURCE_DIR = ..\..
+RAMPART_INTDIR = .\int.msvc
+
+
+#rampart module
+
+OMXMLSEC_SRC = $(RAMPART_SOURCE_DIR)\src\omxmlsec\*.c \
+ $(RAMPART_SOURCE_DIR)\src\omxmlsec\tokens\*.c \
+ $(RAMPART_SOURCE_DIR)\src\omxmlsec\c14n\*.c \
+ $(RAMPART_SOURCE_DIR)\src\omxmlsec\openssl\*.c
+
+SECPOLICY_SRC = $(RAMPART_SOURCE_DIR)\src\secpolicy\builder\*.c \
+ $(RAMPART_SOURCE_DIR)\src\secpolicy\model\*.c
+
+MOD_RAMPART_SRC = $(RAMPART_SOURCE_DIR)\src\core\*.c \
+ $(RAMPART_SOURCE_DIR)\src\handlers\*.c \
+ $(RAMPART_SOURCE_DIR)\src\util\*.c
+
+MOD_RAMPART_INCLUDE_PATH = /I$(RAMPART_SOURCE_DIR)\include \
+ /I$(OPENSSL_BIN_DIR)\include \
+ /I$(AXIS2_BIN_DIR)\include
APPLINK_FILE = $(OPENSSL_BIN_DIR)\include\openssl\applink.c
-#compiler options
-CC = cl.exe
-CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" /w
/nologo
-CFLAGS = $(CFLAGS) /I$(AXIS2_INSTALL_DIR)\include /I$(OPENSSL_BIN_DIR)\include
+AXIS2_LIBS = $(AXIS2_BIN_DIR)\lib
+AXIS2_MODS = $(AXIS2_BIN_DIR)\modules
+
+##################### compiler options
+
+CC = cl.exe
+CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" \
+ /D "AXIS2_SVR_MULTI_THREADED" /w /nologo $(AXIS2_INCLUDE_PATH)
+
+################### linker options
-#linker options
LD = link.exe
-LDFLAGS = /nologo /LIBPATH:$(AXIS2_INSTALL_DIR)\lib
/LIBPATH:$(OPENSSL_BIN_DIR)\lib
-LIBS = axis2_util.lib axis2_parser.lib axiom.lib axis2_engine.lib
+LDFLAGS = /nologo /LIBPATH:$(AXIS2_LIBS) /LIBPATH:$(OPENSSL_BIN_DIR)\lib\VC \
+ /LIBPATH:$(AXIS2_BIN_DIR)\lib
#debug symbols
!if "$(DEBUG)" == "1"
+LIBS = $(LIBS) libeay32MTd.lib ssleay32MTd.lib
+!else
+LIBS = $(LIBS) libeay32MT.lib ssleay32MT.lib
+!endif
+
+#################### debug symbol
+
+!if "$(DEBUG)" == "1"
CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
-LDFLAGS = $(LDFLAGS) /DEBUG
-LIBS= $(LIBS) libeay32MTd.lib ssleay32MTd.lib
+LDFLAGS = $(LDFLAGS) /DEBUG /NODEFAULTLIB:LIBCMTD.lib
!else
-CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
+CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 /MT
LDFLAGS = $(LDFLAGS)
-LIBS= $(LIBS) libeay32MT.lib ssleay32MT.lib
!endif
+#################### hack!
+CFLAGS = $(CFLAGS) /D "_WINSOCKAPI_"
-APPLINK_FILE = $(OPENSSL_BIN_DIR)\include\openssl\applink.c
+rampart_do_nothing:
-RAMPART_BIN_DIR = $(AXIS2_INSTALL_DIR)\bin
+RAMPART_BIN_DIR = $(AXIS2_BINDIR)\bin
+RAMPART_SAMPLES_DIR = $(RAMPART_BIN_DIR)\samples\rampart
RAMPART_SAMPLES_CLIENT_DIR = $(RAMPART_BIN_DIR)\samples\rampart\client
RAMPART_SAMPLES_SERVER_DIR = $(RAMPART_BIN_DIR)\samples\rampart\server
RAMPART_SAMPLES_KEYS_DIR = $(RAMPART_BIN_DIR)\samples\rampart\keys
-RAMPART_SAMPLES_SERVICE_DIR = $(AXIS2_INSTALL_DIR)\services
-RAMPART_MODULES_DIR = $(AXIS2_INSTALL_DIR)\modules\rampart
-MOD_RAMPART_INCLUDE_PATH = /I$(RAMPART_SOURCE_DIR)\include
+RAMPART_SAMPLES_SERVICE_DIR = $(AXIS2_BINDIR)\services
+RAMPART_MODULES_DIR = $(AXIS2_BINDIR)\modules\
-#rampart module
+skel:
+ if not exist $(RAMPART_INTDIR) mkdir $(RAMPART_INTDIR)
-OMXMLSEC_SRC = $(RAMPART_SOURCE_DIR)\src\omxmlsec\*.c \
- $(RAMPART_SOURCE_DIR)\src\omxmlsec\tokens\*.c \
- $(RAMPART_SOURCE_DIR)\src\omxmlsec\openssl\*.c
+mod_rampart:
+ $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(MOD_RAMPART_SRC)
$(OMXMLSEC_SRC) $(SECPOLICY_SRC) $(APPLINK_FILE) /Fo$(RAMPART_INTDIR)\ /c
+ $(LD) $(LDFLAGS) $(RAMPART_INTDIR)\*.obj \
+ $(LIBS) axutil.lib axiom.lib axis2_parser.lib axis2_engine.lib \
+ /DLL /OUT:$(AXIS2_LIBS)\$(RAMPART).dll /IMPLIB:mod_rampart.lib
-MOD_RAMPART_SRC = $(RAMPART_SOURCE_DIR)\src\core\*.c \
- $(RAMPART_SOURCE_DIR)\src\handlers\*.c \
- $(RAMPART_SOURCE_DIR)\src\util\*.c
+copy_module:
+ if not exist $(AXIS2_MODS)\$(RAMPART)\ mkdir $(AXIS2_MODS)\$(RAMPART)
+ copy $(AXIS2_LIBS)\$(RAMPART).dll $(AXIS2_MODS)\$(RAMPART)
-mod_rampart:
- $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH) $(MOD_RAMPART_SRC)
$(OMXMLSEC_SRC) $(APPLINK_FILE) /c
- $(LD) $(LDFLAGS) /LIBPATH:$(AXIS2_INSTALL_DIR)\rampart\rampart *.obj
$(LIBS) \
- /DLL /OUT:mod_rampart.dll /IMPLIB:mod_rampart.lib
- del *.obj
-
- if not exist $(RAMPART_MODULES_DIR) mkdir $(RAMPART_MODULES_DIR)
+install: skel mod_rampart copy_module
- copy mod_rampart.dll $(RAMPART_MODULES_DIR)
-
- del *.dll
- del *.lib
- del *.exp
- copy $(RAMPART_SOURCE_DIR)\src\data\module.xml $(RAMPART_MODULES_DIR)
+clean:
+ if exist $(RAMPART_INTDIR) rmdir /S /Q $(RAMPART_INTDIR)
+
+
+mod_rampart_pwcb:
+ $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH)
$(RAMPART_SOURCE_DIR)\samples\callback\pwcb.c /Fo$(RAMPART_INTDIR)\ /c
+ $(LD) $(LDFLAGS) $(LIBS) axutil.lib /DLL /OUT:pwcb.dll /IMPLIB:pwcb.lib
+
+# if not exist $(RAMPART_SAMPLES_DIR)\callback mkdir
$(RAMPART_SAMPLES_DIR)\callback
-mod_rampart_pwcb:
- $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH)
$(RAMPART_SOURCE_DIR)\samples\callback\pwcb.c /c
- $(LD) $(LDFLAGS) *.obj $(LIBS) /DLL /OUT:pwcb.dll /IMPLIB:pwcb.lib
+# copy pwcb.dll $(RAMPART_SAMPLES_DIR)\callback\pwcb.dll
+# copy $(RAMPART_SOURCE_DIR)\rampart\samples\callback\pwcb.c
$(RAMPART_SAMPLES_DIR)\callback
+# del pwcb.*
- if not exist $(RAMPART_SAMPLES_CLIENT_DIR)\callback mkdir
$(RAMPART_SAMPLES_CLIENT_DIR)\callback
+mod_rampart_authn:
+ $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH)
$(RAMPART_SOURCE_DIR)\rampart\samples\authn_provider\authn_provider.c /c
+ $(LD) $(LDFLAGS) *.obj $(AXIS2_RAMPART).lib $(AXIS2_UTIL).lib /DLL
/OUT:authn.dll /IMPLIB:authn.lib
+
+ if not exist $(RAMPART_SAMPLES_DIR)\authn_provider mkdir
$(RAMPART_SAMPLES_DIR)\authn_provider
- copy pwcb.dll $(RAMPART_SAMPLES_CLIENT_DIR)\callback\pwcb.dll
- copy $(RAMPART_SOURCE_DIR)\samples\callback\pwcb.c
$(RAMPART_SAMPLES_CLIENT_DIR)\callback
- del pwcb.*
+ copy authn.dll $(RAMPART_SAMPLES_DIR)\authn_provider\authn.dll
+ copy
$(RAMPART_SOURCE_DIR)\rampart\samples\authn_provider\authn_provider.c
$(RAMPART_SAMPLES_DIR)\authn_provider
+ del authn*.*
mod_rampart_htpwcb:
- $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH)
$(RAMPART_SOURCE_DIR)\samples\callback\htpasswd_callback\htpwcb.c /c
- $(LD) $(LDFLAGS) *.obj $(LIBS) /DLL /OUT:htpwcb.dll /IMPLIB:htpwcb.lib
+ $(CC) $(CFLAGS) $(MOD_RAMPART_INCLUDE_PATH)
$(RAMPART_SOURCE_DIR)\rampart\samples\callback\htpasswd_callback\htpwcb.c /c
+ $(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib /DLL /OUT:htpwcb.dll
/IMPLIB:htpwcb.lib
- if not exist $(RAMPART_SAMPLES_CLIENT_DIR)\callback\htpasswd mkdir
$(RAMPART_SAMPLES_CLIENT_DIR)\callback\htpasswd
+ if not exist $(RAMPART_SAMPLES_DIR)\callback\htpasswd mkdir
$(RAMPART_SAMPLES_DIR)\callback\htpasswd
- copy htpwcb.dll
$(RAMPART_SAMPLES_CLIENT_DIR)\callback\htpasswd\htpwcb.dll
+ copy htpwcb.dll $(RAMPART_SAMPLES_DIR)\callback\htpasswd\htpwcb.dll
del htpwcb.*
mod_rampart_services_sec_echo:
- $(CC) $(CFLAGS) /I$(RAMPART_SOURCE_DIR)\samples\server\sec_echo \
- $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\*.c /c
- $(LD) $(LDFLAGS) *.obj $(LIBS) axis2_http_receiver.lib \
- axis2_http_sender.lib /DLL /OUT:sec_echo.dll
+ $(CC) $(CFLAGS) /I$(RAMPART_SOURCE_DIR)\rampart\samples\server\sec_echo
\
+ $(RAMPART_SOURCE_DIR)\rampart\samples\server\sec_echo\*.c /c
+ $(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(AXIOM).lib
$(AXIS2_PARSER).lib \
+ $(LIBS) $(AXIS2_ENGINE).lib $(AXIS2_TRANSPORT_RECEIVER).lib \
+ $(AXIS2_TRANSPORT_SENDER).lib /DLL /OUT:sec_echo.dll
del *.obj
if not exist $(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo mkdir
$(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo
@@ -108,39 +138,34 @@
del *.exp
del *.lib
- copy $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\*.c
$(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo
- copy $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\*.h
$(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo
- copy $(RAMPART_SOURCE_DIR)\samples\server\sec_echo\services.xml
$(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo
-
-mod_rampart_samples_enc_echo:
- if not exist $(RAMPART_SAMPLES_CLIENT_DIR)\enc_echo mkdir
$(RAMPART_SAMPLES_CLIENT_DIR)\enc_echo
-
- $(CC) $(CFLAGS) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS"
$(AXIS2_INCLUDE_PATH) $(MOD_RAMPART_INCLUDE_PATH) \
- $(RAMPART_SOURCE_DIR)\samples\client\enc_echo\echo.c /c
- $(LD) $(LDFLAGS) $(LIBS) echo.obj /OUT:enc_echo.exe
+ copy $(RAMPART_SOURCE_DIR)\rampart\samples\server\sec_echo\*.c
$(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo
+ copy $(RAMPART_SOURCE_DIR)\rampart\samples\server\sec_echo\*.h
$(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo
+ copy $(RAMPART_SOURCE_DIR)\rampart\samples\server\sec_echo\services.xml
$(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo
+
+mod_rampart_samples_sec_echo:
+ if not exist $(RAMPART_SAMPLES_CLIENT_DIR)\sec_echo mkdir
$(RAMPART_SAMPLES_CLIENT_DIR)\sec_echo
+
+ $(CC) /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" $(AXIS2_INCLUDE_PATH)
$(MOD_RAMPART_INCLUDE_PATH) \
+ $(RAMPART_SOURCE_DIR)\rampart\samples\client\sec_echo\echo.c /c
+ $(LD) $(LDFLAGS) echo.obj $(AXIS2_UTIL).lib $(AXIOM).lib \
+ $(AXIS2_PARSER).lib $(AXIS2_ENGINE).lib /OUT:echo.exe
del *.obj
- copy enc_echo.exe $(RAMPART_SAMPLES_CLIENT_DIR)\enc_echo
- copy $(RAMPART_SOURCE_DIR)\samples\client\enc_echo\echo.c
$(RAMPART_SAMPLES_CLIENT_DIR)\enc_echo
+ copy echo.exe $(RAMPART_SAMPLES_CLIENT_DIR)\sec_echo
+ copy $(RAMPART_SOURCE_DIR)\rampart\samples\client\sec_echo\echo.c
$(RAMPART_SAMPLES_CLIENT_DIR)\sec_echo
- xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\client\enc_echo\data
$(RAMPART_SAMPLES_CLIENT_DIR)\enc_echo\data
- del enc_echo.exe
+ xcopy /E /I /Y
$(RAMPART_SOURCE_DIR)\rampart\samples\client\sec_echo\data
$(RAMPART_SAMPLES_CLIENT_DIR)\sec_echo\data
+ del echo.exe
-mod_rampart_samples: mod_rampart_samples_enc_echo mod_rampart_services_sec_echo
+mod_rampart_samples: mod_rampart_samples_sec_echo mod_rampart_services_sec_echo
mod_rampart_copy_include:
- xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\include
$(AXIS2_INSTALL_DIR)\rampart\include
- copy $(RAMPART_SOURCE_DIR)\README $(AXIS2_INSTALL_DIR)\rampart
+ xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\rampart\include
$(AXIS2_BINDIR)\rampart\include
+ copy $(RAMPART_SOURCE_DIR)\rampart\README $(AXIS2_BINDIR)\rampart
mod_rampart_copy_keys:
if not exist $(RAMPART_SAMPLES_KEYS_DIR) mkdir
$(RAMPART_SAMPLES_KEYS_DIR)
- xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\samples\keys\*
$(RAMPART_SAMPLES_KEYS_DIR)
-
-mod_rampart_all: mod_rampart mod_rampart_pwcb mod_rampart_htpwcb
mod_rampart_samples mod_rampart_copy_include
+ xcopy /E /I /Y $(RAMPART_SOURCE_DIR)\rampart\samples\keys\*
$(RAMPART_SAMPLES_KEYS_DIR)
-mod_rampart_clean:
- if exist $(RAMPART_BIN_DIR)\samples\rampart rmdir /S /Q
$(RAMPART_BIN_DIR)\samples\rampart
- if exist $(RAMPART_MODULES_DIR) rmdir /S /Q $(RAMPART_MODULES_DIR)
- if exist $(AXIS2_INSTALL_DIR)\rampart rmdir /S /Q
$(AXIS2_INSTALL_DIR)\rampart
- if exist $(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo rmdir /S /Q
$(RAMPART_SAMPLES_SERVICE_DIR)\sec_echo
+mod_rampart_all: mod_rampart mod_rampart_authn mod_rampart_pwcb
mod_rampart_htpwcb mod_rampart_samples mod_rampart_copy_include
