You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/06/13 10:54:53 UTC
svn commit: r413840 - in /webservices/axis2/trunk/c/util: build/
build/win32/ build/win32/configure.in build/win32/makefile
src/minizip/archive_extract.c
Author: nandika
Date: Tue Jun 13 01:54:53 2006
New Revision: 413840
URL: http://svn.apache.org/viewvc?rev=413840&view=rev
Log:
nmake makefile added for axis2_utils
Added:
webservices/axis2/trunk/c/util/build/
webservices/axis2/trunk/c/util/build/win32/
webservices/axis2/trunk/c/util/build/win32/configure.in
webservices/axis2/trunk/c/util/build/win32/makefile
Modified:
webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
Added: webservices/axis2/trunk/c/util/build/win32/configure.in
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/build/win32/configure.in?rev=413840&view=auto
==============================================================================
--- webservices/axis2/trunk/c/util/build/win32/configure.in (added)
+++ webservices/axis2/trunk/c/util/build/win32/configure.in Tue Jun 13 01:54:53 2006
@@ -0,0 +1,5 @@
+AXIS2_UTIL_MAJOR_VERSION = M
+AXIS2_UTIL_MINOR_VERSION = 9
+AXIS2_UTIL_MICRO_VERSION = 2
+ZLIB_INSTALL_DIR = E:\zlib-1.2.3.win32
+
Added: webservices/axis2/trunk/c/util/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/build/win32/makefile?rev=413840&view=auto
==============================================================================
--- webservices/axis2/trunk/c/util/build/win32/makefile (added)
+++ webservices/axis2/trunk/c/util/build/win32/makefile Tue Jun 13 01:54:53 2006
@@ -0,0 +1,85 @@
+#################################################
+# Makefile for axis2 utils [ 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
+#define folders
+
+UTILSRC = ..\..
+UTIL_DIST_DIR= ..\axis2_util
+AXIS2_UTIL = axis2_util
+
+
+#versioning information
+#AXIS2_UTIL_DIST_VERSION = $(AXIS2_UTIL_MAJOR_VERSION).$(AXIS2_UTIL_MINOR_VERSION).$(AXIS2_UTIL_MICRO_VERSION)
+
+#compiler options
+CC = cl.exe
+CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" /D "AXIS2_SVR_MULTI_THREADED" /w /nologo
+CFLAGS = $(CFLAGS) /I$(UTILSRC)\include /I$(UTILSRC)\include\platforms /I$(UTILSRC)\src /I$(UTILSRC)\src\minizip /I$(ZLIB_INSTALL_DIR)\include
+
+
+#linker options
+LD = link.exe
+LDFLAGS = /nologo /LIBPATH:$(ZLIB_INSTALL_DIR)\lib
+LIBS = Rpcrt4.lib Ws2_32.lib zdll.lib
+
+#debug symbols
+!if "$(DEBUG)" == "1"
+CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
+LDFLAGS = $(LDFLAGS) /DEBUG /NODEFAULTLIB:LIBCMTD.lib
+!else
+CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
+LDFLAGS = $(LDFLAGS)
+!endif
+
+#create the director structure
+
+distdir:
+ if not exist $(UTIL_DIST_DIR) mkdir $(UTIL_DIST_DIR)
+ if not exist $(UTIL_DIST_DIR)\bin mkdir $(UTIL_DIST_DIR)\bin
+ if not exist $(UTIL_DIST_DIR)\lib mkdir $(UTIL_DIST_DIR)\lib
+ if not exist $(UTIL_DIST_DIR)\include mkdir $(UTIL_DIST_DIR)\include
+ if not exist $(UTIL_DIST_DIR)\tests mkdir $(UTIL_DIST_DIR)\tests
+ if not exist $(UTIL_DIST_DIR)\tests\unit mkdir $(UTIL_DIST_DIR)\tests\unit
+
+clean :
+ if exist $(UTIL_DIST_DIR) rmdir /S /Q $(UTIL_DIST_DIR)
+
+copy_include:
+ xcopy /E $(UTILSRC)\include $(UTIL_DIST_DIR)\include
+
+
+build_util:
+ $(CC) $(CFLAGS) $(UTILSRC)\src\platforms\windows\*.c $(UTILSRC)\src\minizip\*.c $(UTILSRC)\src\*.c /c
+ $(LD) $(LDFLAGS) $(LIBS) *.obj /DLL /OUT:$(AXIS2_UTIL).dll /IMPLIB:$(AXIS2_UTIL).lib
+ copy $(AXIS2_UTIL).dll $(UTIL_DIST_DIR)\bin
+ copy $(AXIS2_UTIL).lib $(UTIL_DIST_DIR)\lib
+ del *.obj
+ del *.dll
+ del *.obj
+ del *.exp
+ del *.lib
+
+install : clean distdir build_util copy_include
+
+all: install
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified: webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/archive_extract.c?rev=413840&r1=413839&r2=413840&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/archive_extract.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/archive_extract.c Tue Jun 13 01:54:53 2006
@@ -255,17 +255,17 @@
if (zipfilename!=NULL)
{
-/* zlib_filefunc_def ffunc; */
+ zlib_filefunc_def ffunc;
strncpy(filename_try, zipfilename,MAXFILENAME-1);
filename_try[ MAXFILENAME ] = '\0';
- axis2_fill_win32_filefunc(&zlib_filefunc_def);
- uf = AXIS2_UNZOPEN2(zipfilename,zlib_filefunc_def);
+ axis2_fill_win32_filefunc(&ffunc);
+ uf = AXIS2_UNZOPEN2(zipfilename,ffunc);
if (uf==NULL)
{
strcat(filename_try,".zip");
- uf = AXIS2_UNZOPEN2(zipfilename,zlib_filefunc_def);
+ uf = AXIS2_UNZOPEN2(zipfilename,ffunc);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org