[Jboss-svn-commits] JBL Code SVN: r4384 - in labs/jbossweb/trunk/src/share/native/srclib: . zlib

[<jbo...@li...>]

Author: mla...@jb...
Date: 2006-05-23 13:27:01 -0400 (Tue, 23 May 2006)
New Revision: 4384

Added:
   labs/jbossweb/trunk/src/share/native/srclib/zlib/
   labs/jbossweb/trunk/src/share/native/srclib/zlib/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/srclib/zlib/zlib1.rc
Log:
Added zlib library build repository

Added: labs/jbossweb/trunk/src/share/native/srclib/zlib/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/zlib/NMAKEmakefile	2006-05-23 17:25:52 UTC (rev 4383)
+++ labs/jbossweb/trunk/src/share/native/srclib/zlib/NMAKEmakefile	2006-05-23 17:27:01 UTC (rev 4384)
@@ -0,0 +1,129 @@
+# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile   Master Zlib makefile.
+# Usage:
+#                 DLL=1     Build DLL version
+#                 ASM=1     Use Masm
+#                 DEBUG=1   Build DEBUG version of Zlib
+#
+# Originally contributed by Mladen Turk <mturk jboss.com>
+#
+# ====================================================================
+#
+
+!IFDEF DLL
+TARGET = DLL
+PROJECT = zlib1
+!ELSE
+TARGET = LIB
+PROJECT = zlib1
+!ENDIF
+
+CFLAGS = -wd4996 $(CFLAGS)
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <../../build/NMAKEcommon.inc>
+
+INCLUDES = -I$(SRCDIR)
+PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src
+OBJECTS = \
+	$(BUILDIR)\adler32.obj \
+	$(BUILDIR)\compress.obj \
+	$(BUILDIR)\crc32.obj \
+	$(BUILDIR)\deflate.obj \
+	$(BUILDIR)\gzio.obj \
+	$(BUILDIR)\infback.obj \
+	$(BUILDIR)\inffast.obj \
+	$(BUILDIR)\inflate.obj \
+	$(BUILDIR)\inftrees.obj \
+	$(BUILDIR)\trees.obj \
+	$(BUILDIR)\uncompr.obj \
+	$(BUILDIR)\zutil.obj
+
+!IFDEF ASM
+CFLAGS = -DASMV -DASMINF $(CFLAGS)
+!IF "$(CPU)" == "AMD64"
+ASM_OBJECTS = \
+	$(BUILDIR)\inffas8664.obj \
+	$(BUILDIR)\gvmat64.obj \
+	$(BUILDIR)\inffas64.obj
+
+!ELSE
+ASM_OBJECTS = \
+	$(BUILDIR)\gvmat32c.obj \
+	$(BUILDIR)\gvmat32.obj \
+	$(BUILDIR)\inffas32.obj
+
+!ENDIF
+!ELSE
+ASM_OBJECTS =
+!ENDIF
+
+!IFDEF DLL
+BUILDLIB = $(BUILDIR)\$(PROJECT).dll
+BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
+BUILDRES = $(BUILDIR)\$(PROJECT).res
+BUILDMAN = $(BUILDLIB).manifest
+!ELSE
+BUILDLIB = $(BUILDIR)\$(PROJECT).lib
+!ENDIF
+
+all : $(BUILDIR) $(BUILDLIB)
+
+$(BUILDIR) :
+	@$(MAKETARGET)
+
+{$(SRCDIR)}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+!IF "$(CPU)" == "AMD64"
+{$(SRCDIR)/contrib/masmx64}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/contrib/masmx64}.asm{$(BUILDIR)}.obj:
+	$(ML) $(AFLAGS) /Fo$@ $<
+
+!ELSE
+{$(SRCDIR)/contrib/masmx86}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/contrib/masmx86}.asm{$(BUILDIR)}.obj:
+	$(ML) $(AFLAGS) /Fo$@ $<
+
+!ENDIF
+
+
+$(OBJECTS): $(SRCDIR)/*.h
+
+!IFDEF DLL
+$(BUILDRES): win32/zlib1.rc
+	$(RC) $(RCFLAGS) /fo $(BUILDRES) win32/zlib1.rc
+$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES)
+	$(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) $(BUILDRES) $(LIBS) /def:win32/zlib.def /pdb:$(BUILDPDB) /out:$(BUILDLIB)
+	IF EXIST $(BUILDMAN) \
+		mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
+!ELSE
+$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(ASM_OBJECTS)
+	$(LINK) $(LFLAGS) $(OBJECTS) $(ASM_OBJECTS) /out:$(BUILDLIB)
+!ENDIF
+
+clean:
+	@$(CLEANTARGET)


Property changes on: labs/jbossweb/trunk/src/share/native/srclib/zlib/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
   + CRLF

Added: labs/jbossweb/trunk/src/share/native/srclib/zlib/zlib1.rc
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/zlib/zlib1.rc	2006-05-23 17:25:52 UTC (rev 4383)
+++ labs/jbossweb/trunk/src/share/native/srclib/zlib/zlib1.rc	2006-05-23 17:27:01 UTC (rev 4384)
@@ -0,0 +1,39 @@
+#include <windows.h>
+
+#ifdef GCC_WINDRES
+VS_VERSION_INFO		VERSIONINFO
+#else
+VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
+#endif
+  FILEVERSION		1,2,3,0
+  PRODUCTVERSION	1,2,3,0
+  FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
+#ifdef _DEBUG
+  FILEFLAGS		1
+#else
+  FILEFLAGS		0
+#endif
+  FILEOS		VOS__WINDOWS32
+  FILETYPE		VFT_DLL
+  FILESUBTYPE		0	// not used
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    //language ID = U.S. English, char set = Windows, Multilingual
+    BEGIN
+      VALUE "FileDescription",	"zlib data compression library\0"
+      VALUE "FileVersion",	"1.2.3\0"
+      VALUE "InternalName",	"zlib1.dll\0"
+      VALUE "LegalCopyright",	"(C) 1995-2004 Jean-loup Gailly & Mark Adler\0"
+      VALUE "OriginalFilename",	"zlib1.dll\0"
+      VALUE "ProductName",	"zlib\0"
+      VALUE "ProductVersion",	"1.2.3\0"
+      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
+    END
+  END
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x0409, 1252
+  END
+END


Property changes on: labs/jbossweb/trunk/src/share/native/srclib/zlib/zlib1.rc
___________________________________________________________________
Name: svn:eol-style
   + CRLF