axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r409555 - in /webservices/axis2/trunk/c: axiom/src/attachments/mime_parser.c axiom/src/parser/libxml2/libxml2_reader_wrapper.c build/win32/configure.in build/win32/makefile
Date Fri, 26 May 2006 04:38:54 GMT
Author: nandika
Date: Thu May 25 21:38:53 2006
New Revision: 409555

URL: http://svn.apache.org/viewvc?rev=409555&view=rev
Log:
makefile updated and build problems fixed

Modified:
    webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
    webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
    webservices/axis2/trunk/c/build/win32/configure.in
    webservices/axis2/trunk/c/build/win32/makefile

Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?rev=409555&r1=409554&r2=409555&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Thu May 25 21:38:53 2006
@@ -154,7 +154,7 @@
     int mime_binary_len = 0;
     axis2_char_t *pos = NULL;
     
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     mime_parser_impl = AXIS2_INTF_TO_IMPL(mime_parser);
     
         buffer = AXIS2_MALLOC((*env)->allocator, sizeof(axis2_char_t) * (size + 1));
@@ -425,7 +425,7 @@
 axis2_mime_parser_get_mime_parts_map(axis2_mime_parser_t *mime_parser, 
     axis2_env_t **env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     return AXIS2_INTF_TO_IMPL(mime_parser)->mime_parts_map;
 }
 

Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c?rev=409555&r1=409554&r2=409555&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c Thu May 25
21:38:53 2006
@@ -156,10 +156,15 @@
     int namespace_map[AXIS2_ATTR_NS_MAX];
     int attribute_map[AXIS2_ATTR_NS_MAX];
     /******************************************/
-    /* read callback function */
+    /* read callback function 
     int (*read_input_callback)(char *buffer, int size,void* ctx);
 
     int (*close_input_callback)(void *ctx);
+    */
+    
+    AXIS2_READ_INPUT_CALLBACK read_input_callback;
+    
+    AXIS2_CLOSE_INPUT_CALLBACK close_input_callback;
     
 } axis2_libxml2_reader_wrapper_impl_t;
 

Modified: webservices/axis2/trunk/c/build/win32/configure.in
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/configure.in?rev=409555&r1=409554&r2=409555&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build/win32/configure.in (original)
+++ webservices/axis2/trunk/c/build/win32/configure.in Thu May 25 21:38:53 2006
@@ -1,4 +1,5 @@
 LIBXML2_INSTALL_DIR = E:\libxml2-2.6.23.win32
 ICONV_INSTALL_DIR = E:\iconv-1.9.1.win32
+ZLIB_INSTALL_DIR=E:\zlib-1.2.3.win32
 APACHE_INSTALL_DIR = E:\Apache2
 RELEASE_VER = 0.91

Modified: webservices/axis2/trunk/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/build/win32/makefile?rev=409555&r1=409554&r2=409555&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build/win32/makefile (original)
+++ webservices/axis2/trunk/c/build/win32/makefile Thu May 25 21:38:53 2006
@@ -80,9 +80,9 @@
 #The compiler and its options
 
 # include path
-GUTHTHILA_INCP = /I$(AXIS2_SOURCE_DIR)\\guththila\impl\src
+GUTHTHILA_INCP = /I$(AXIS2_SOURCE_DIR)\guththila\impl\src
 APACHE_INCP = /I$(APACHE_INSTALL_DIR)\include
-AXIS2_INCP = /I$(AXIS2_SOURCE_DIR)\util\include /I$(AXIS2_SOURCE_DIR)\axiom\include /I$(AXIS2_SOURCE_DIR)\axiom\src\om
/I$(AXIS2_SOURCE_DIR)\axiom\src\soap  /I$(AXIS2_SOURCE_DIR)\util\include\platforms /I$(AXIS2_SOURCE_DIR)\modules\wsdl
/I$(AXIS2_SOURCE_DIR)\modules\core\clientapi /I$(AXIS2_SOURCE_DIR)\modules\core\deployment
/I$(AXIS2_SOURCE_DIR)\modules\core\description /I$(AXIS2_SOURCE_DIR)\modules\core\transport
/I$(AXIS2_SOURCE_DIR)\include /I$(LIBXML2_INSTALL_DIR)\include /I$(ICONV_INSTALL_DIR)\include
/I$(AXIS2_SOURCE_DIR)\modules\core\engine /I$(AXIS2_SOURCE_DIR)\modules\core\context /I$(AXIS2_SOURCE_DIR)\modules\core\util
/I$(AXIS2_SOURCE_DIR)\include\platforms /I$(AXIS2_SOURCE_DIR)\include\platforms\windows /I$(AXIS2_SOURCE_DIR)\modules\xml\om
/I$(AXIS2_SOURCE_DIR)\modules\xml\soap  /I$(AXIS2_SOURCE_DIR)\modules\core\transport\http\server\apache2
/I$(AXIS2_SOURCE_DIR)\axiom\src\attachments
+AXIS2_INCP = /I$(AXIS2_SOURCE_DIR)\util\include /I$(AXIS2_SOURCE_DIR)\util\src\ /I$(AXIS2_SOURCE_DIR)\util\src\minizip\
/I$(AXIS2_SOURCE_DIR)\axiom\include /I$(AXIS2_SOURCE_DIR)\axiom\src\om /I$(AXIS2_SOURCE_DIR)\axiom\src\soap
 /I$(AXIS2_SOURCE_DIR)\util\include\platforms /I$(AXIS2_SOURCE_DIR)\modules\wsdl /I$(AXIS2_SOURCE_DIR)\modules\core\clientapi
/I$(AXIS2_SOURCE_DIR)\modules\core\deployment /I$(AXIS2_SOURCE_DIR)\modules\core\description
/I$(AXIS2_SOURCE_DIR)\modules\core\transport /I$(AXIS2_SOURCE_DIR)\include /I$(LIBXML2_INSTALL_DIR)\include
/I$(ICONV_INSTALL_DIR)\include /I$(ZLIB_INSTALL_DIR)\include /I$(AXIS2_SOURCE_DIR)\modules\core\engine
/I$(AXIS2_SOURCE_DIR)\modules\core\context /I$(AXIS2_SOURCE_DIR)\modules\core\util /I$(AXIS2_SOURCE_DIR)\include\platforms
/I$(AXIS2_SOURCE_DIR)\include\platforms\windows /I$(AXIS2_SOURCE_DIR)\modules\xml\om /I$(AXIS2_SOURCE_DIR)\modules\xml\soap
 /I$(AXIS2_SOURCE_DIR)\modules\core\transport\http\server\apache2 /I$(AXIS2_SOURCE_D
 IR)\axiom\src\attachments
 
 
 
@@ -95,7 +95,7 @@
 # linker options
 
 LD = link.exe
-LDFLAGS = /nologo /LIBPATH:$(AXIS2_LIBS) /LIBPATH:$(LIBXML2_INSTALL_DIR)\lib /LIBPATH:$(APACHE_INSTALL_DIR)\lib
+LDFLAGS = /nologo /LIBPATH:$(AXIS2_LIBS) /LIBPATH:$(LIBXML2_INSTALL_DIR)\lib /LIBPATH:$(APACHE_INSTALL_DIR)\lib
/LIBPATH:$(ZLIB_INSTALL_DIR)\lib
 LIBS =  Rpcrt4.lib Ws2_32.lib
 APACHE_LIBS = apr.lib xml.lib libhttpd.lib aprutil.lib libapr.lib
 
@@ -106,7 +106,7 @@
 #debug symbols
 !if "$(DEBUG)" == "1"
 CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
-LDFLAGS = $(LDFLAGS) /DEBUG
+LDFLAGS = $(LDFLAGS) /DEBUG /NODEFAULTLIB:LIBCMTD.lib
 !else
 CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
 LDFLAGS = $(LDFLAGS)
@@ -142,8 +142,8 @@
 	xcopy /E /I /Y $(AXIS2_SOURCE_DIR)\util\include $(AXIS2_INSTALL_DIR)\include\
 
 axis2_util: 
-	$(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\util\src\platforms\windows\*.c $(AXIS2_SOURCE_DIR)\util\src\*.c
 /c
-	$(LD) $(LDFLAGS) *.obj $(LIBS) /DLL /OUT:$(AXIS2_UTIL).dll /IMPLIB:$(AXIS2_UTIL).lib
+	$(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\util\src\platforms\windows\*.c $(AXIS2_SOURCE_DIR)\util\src\minizip\*.c
$(AXIS2_SOURCE_DIR)\util\src\*.c  /c
+	$(LD) $(LDFLAGS) *.obj $(LIBS) $(ZLIB_INSTALL_DIR)\lib\zdll.lib /DLL  /OUT:$(AXIS2_UTIL).dll
/IMPLIB:$(AXIS2_UTIL).lib
 	del *.obj
 	copy $(AXIS2_UTIL).* $(AXIS2_LIBS)\
 	
@@ -151,7 +151,7 @@
 
 axis2_parser: 
 	$(CC) $(CFLAGS) $(AXIS2_SOURCE_DIR)\axiom\src\parser\libxml2\*.c /c
-	$(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(LIBS) $(LIBXML2_INSTALL_DIR)\lib\libxml2.lib
/DLL /OUT:$(AXIS2_PARSER).dll /IMPLIB:$(AXIS2_PARSER).lib
+	$(LD) $(LDFLAGS) *.obj $(AXIS2_UTIL).lib $(LIBS) $(LIBXML2_INSTALL_DIR)\lib\libxml2.lib
 /DLL /OUT:$(AXIS2_PARSER).dll /IMPLIB:$(AXIS2_PARSER).lib
 	del *.obj
 	copy $(AXIS2_PARSER).* $(AXIS2_LIBS)\
 



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message