This commit was manufactured by cvs2svn to create tag 'build'.

git-svn-id: svn://10.0.0.236/tags/build@7070 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/directory/c-sdk/ldap/libraries/libprldap/Makefile.client

@@ -1,168 +0,0 @@
-# 
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (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.mozilla.org/NPL/
-#  
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#  
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-#
-
-DEPTH		= ../../../../..
-NS_DEPTH	= ../../../..
-LDAP_SRC	= ../..
-NSCP_DISTDIR    = ../../../../../dist
-NSPR_TREE = ../../..
-MOD_DEPTH = ../../..
-
-include $(NSPR_TREE)/config/rules.mk
-include		../../../build.mk
-
-SRCS		= ldappr-dns.c \
-		  ldappr-error.c \
-		  ldappr-io.c \
-		  ldappr-public.c \
-		  ldappr-threads.c
-
-ifeq ($(OS_ARCH), WINNT)
-REALOBJS        = $(SRCS:.c=.obj)
-else
-REALOBJS	= $(SRCS:.c=.o)
-endif
-
-PROBJDEST 	= $(OBJDIR_NAME)
-OBJS		= $(addprefix $(PROBJDEST)/, $(REALOBJS)) 
-
-DISTHDIR	= $(NSCP_DISTDIR)/public/ldap
-HDIR		= $(LDAP_SRC)/include
-
-ifeq ($(OS_ARCH), WINNT)
-LIBPRLDAP	= $(addprefix $(PROBJDEST)/, \
-			nsldappr32v$(PRLDAPVERS).$(DLL_SUFFIX))
-DLLPRLDAP	= $(addprefix $(PROBJDEST)/, \
-			nsldappr32v$(PRLDAPVERS).$(LIB_SUFFIX))
-else
-LIBPRLDAP	= $(addprefix $(PROBJDEST)/, lib$(PRLDAP_LIBNAME).$(DLL_SUFFIX))
-endif
-INSTALLDIR      = $(DEPTH)/dist/$(OBJDIR_NAME)
-
-LOCAL_INCLUDES  = -I$(PUBLIC)/nspr
-INCLUDES	+= -I$(DISTHDIR) -I$(HDIR) -I$(INSTALLDIR)/include \
-		   -I../../../../../dist/include
-DEFINES		+= $(DEFS)
-
-PLATFORMCFLAGS	= -DUSE_WAITPID -DNEEDPROTOS
-PLATFORMLIBS	=
-THREADS		=
-THREADSLIB	=
-
-#
-# shared library symbol export definitions
-#
-ifeq ($(USE_DLL_EXPORTS_FILE), 1)
-ifeq ($(OS_ARCH), WINNT)
-GENEXPORTS=cmd /c  $(PERL) $(LDAP_SRC)/build/genexports.pl
-else
-GENEXPORTS=$(PERL) $(LDAP_SRC)/build/genexports.pl
-endif
-
-# variable definitions for exported symbols
-ifeq ($(OS_ARCH), WINNT)
-        PRLDAP_EXPORT_DEFS=../msdos/winsock/nsldappr32.def
-else
-        PRLDAP_EXPORT_DEFS= $(PROBJDEST)/libprldap.exp
-endif
-
-PRLDAP_EXPORT_FLAGS=$(addprefix $(DLLEXPORTS_PREFIX), $(PRLDAP_EXPORT_DEFS))
-
-GENEXPARGS=$(BUILD_DEBUG) $(PRLDAPVERS_SUFFIX) $(PRLDAPVERS)
-endif # USE_DLL_EXPORTS_FILE
-
-ifeq ($(OS_ARCH), SunOS)
-EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME)
-EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
-endif
-
-ifeq ($(OS_ARCH), WINNT)
-EXTRA_LIBS =wsock32.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
-            comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
-            rpcrt4.lib uuid.lib odbc32.lib odbccp32.lib winmm.lib
-EXTRA_LIBS += $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/$(LDAP_LIBNAME).lib
-EXTRA_LIBS += $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/$(PLC_BASENAME).lib
-EXTRA_LIBS += $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/$(PLDS_BASENAME).lib
-EXTRA_LIBS += $(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib/$(NSPR_BASENAME).lib
-endif
-
-ifeq ($(OS_ARCH), OSF1)
-EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME)
-EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
-EXTRA_LIBS += -lcxx -lpthread -lrt -lmach -lexc
-endif
-
-ifeq ($(OS_ARCH), AIX)
-EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LDAP_LIBNAME)
-EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib $(DYNAMICNSPR)
-EXTRA_LIBS += -ldl -brtl -lpthreads -lc_r -lm
-endif
-
-OBJDEST = $(OBJDIR_NAME)
-
-###########################################################################
-
-# recursive gmake rule to create exported symbols file
-$(PROBJDEST)/libprldap.exp:: libprldap.ex
-ifeq ($(OS_ARCH), WINNT)
-	$(GENEXPORTS) Win32 Standard $< $(GENEXPARGS) > $@
-else
-	$(GENEXPORTS) $(OS_ARCH) Standard $< $(GENEXPARGS) > $@
-endif
-
-versiont.c:	Makefile.client Version.c
-	@$(RM) $@
-	@(u="$${USER-root}" v="$(shell cat ../../build/version)" d="$(shell pwd)" \
-	h="$(shell hostname)" t="$(shell date)"; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< Version.c > $@)
-
-all::    $(OBJDEST) $(LIBDIR) $(OBJS) $(LIBPRLDAP)
-
-$(LIBDIR):
-	$(MKDIR) $(LIBDIR)
-
-$(LIBPRLDAP): $(OBJS) $(LIBDIR) $(PRLDAP_EXPORT_DEFS)
-	@echo ======= making $(LIBPRLDAP)
-ifdef SO_FILES_TO_REMOVE
-	-$(RM) $(SO_FILES_TO_REMOVE)
-endif
-	$(LINK_DLL) $(DSO_LDOPTS) $(PRLDAP_EXPORT_FLAGS) $(EXTRA_LIBS)
-
-veryclean:: clean
-
-clean::
-	$(RM) $(OBJS) $(LIBPRLDAP)
-	$(RM) -r $(PROBJDEST)
-
-$(OBJDEST):
-	$(MKDIR) $(OBJDEST)
-
-install:: $(LIBPRLDAP)	
-ifeq ($(OS_ARCH), WINNT)
-	$(INSTALL) -m 555 $(LIBPRLDAP) $(INSTALLDIR)/lib
-	$(INSTALL) -m 555 $(DLLPRLDAP) $(INSTALLDIR)/lib
-endif
-ifdef MKSHLIB
-	$(INSTALL) -m 555 $(LIBPRLDAP) $(INSTALLDIR)/lib
-endif

mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-dns.c

@@ -1,117 +0,0 @@
-/*
- * The contents of this file are subject to the Netscape Public
- * License Version 1.1 (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.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- */
-
-/*
- * DNS callback functions for libldap that use the NSPR (Netscape
- * Portable Runtime) thread API.
- *
- */
-
-#include "ldappr-int.h"
-
-static LDAPHostEnt *prldap_gethostbyname( const char *name,
-	LDAPHostEnt *result, char *buffer, int buflen, int *statusp,
-	void *extradata );
-static LDAPHostEnt *prldap_gethostbyaddr( const char *addr, int length,
-	int type, LDAPHostEnt *result, char *buffer, int buflen,
-	int *statusp, void *extradata );
-static LDAPHostEnt *prldap_convert_hostent( LDAPHostEnt *ldhp,
-	PRHostEnt *prhp );
-
-
-/*
- * Install NSPR DNS functions into ld (if ld is NULL, they are installed
- * as the default functions for new LDAP * handles).
- *
- * Returns 0 if all goes well and -1 if not.
- */
-int
-prldap_install_dns_functions( LDAP *ld )
-{
-    struct ldap_dns_fns			dnsfns;
-
-    memset( &dnsfns, '\0', sizeof(struct ldap_dns_fns) );
-    dnsfns.lddnsfn_bufsize = PR_NETDB_BUF_SIZE;
-    dnsfns.lddnsfn_gethostbyname = prldap_gethostbyname;
-    dnsfns.lddnsfn_gethostbyaddr = prldap_gethostbyaddr;
-    if ( ldap_set_option( ld, LDAP_OPT_DNS_FN_PTRS, (void *)&dnsfns ) != 0 ) {
-	return( -1 );
-    }
-
-    return( 0 );
-}
-
-
-static LDAPHostEnt *
-prldap_gethostbyname( const char *name, LDAPHostEnt *result,
-	char *buffer, int buflen, int *statusp, void *extradata )
-{
-    PRHostEnt	prhent;
-
-    if( !statusp || ( *statusp = (int)PR_GetIPNodeByName( name,
-		PRLDAP_DEFAULT_ADDRESS_FAMILY, PR_AI_DEFAULT,
-		buffer, buflen, &prhent )) == PR_FAILURE ) {
-	return( NULL );
-    }
-
-    return( prldap_convert_hostent( result, &prhent ));
-}
-
-
-static LDAPHostEnt *
-prldap_gethostbyaddr( const char *addr, int length, int type,
-	LDAPHostEnt *result, char *buffer, int buflen, int *statusp,
-	void *extradata )
-{
-    PRHostEnt	prhent;
-    PRNetAddr	iaddr;
-
-    if ( PR_SetNetAddr(PR_IpAddrNull, PRLDAP_DEFAULT_ADDRESS_FAMILY,
-		0, &iaddr) == PR_FAILURE
-		|| PR_StringToNetAddr( addr, &iaddr ) == PR_FAILURE ) {
-	return( NULL );
-    }
-
-    if( !statusp || (*statusp = PR_GetHostByAddr(&iaddr, buffer,
-	     buflen, &prhent )) == PR_FAILURE ) {
-	return( NULL );
-    }
-
-    return( prldap_convert_hostent( result, &prhent ));
-}
-
-
-/*
- * Function: prldap_convert_hostent()
- * Description: copy the fields of a PRHostEnt struct to an LDAPHostEnt
- * Returns: the LDAPHostEnt pointer passed in.
- */
-static LDAPHostEnt *
-prldap_convert_hostent( LDAPHostEnt *ldhp, PRHostEnt *prhp )
-{
-	ldhp->ldaphe_name = prhp->h_name;
-	ldhp->ldaphe_aliases = prhp->h_aliases;
-	ldhp->ldaphe_addrtype = prhp->h_addrtype;
-	ldhp->ldaphe_length =  prhp->h_length;
-	ldhp->ldaphe_addr_list =  prhp->h_addr_list;
-	return( ldhp );
-}

mozilla/nglayout.mk

@@ -0,0 +1,171 @@
+#!gmake
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+#
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+#
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+
+DEPTH=.
+
+#
+# Command macro defines
+#
+
+CVSCO = cvs -q co -P
+
+THIS_MAKEFILE = nglayout.mk
+
+# Branch tags we use
+NETLIB_BRANCH = 
+LIBPREF_BRANCH = XPCOM_BRANCH
+PLUGIN_BRANCH =
+
+# CVS commands to pull the appropriate branch versions
+CVSCO_LIBPREF = $(CVSCO) -r $(LIBPREF_BRANCH)
+CVSCO_IMGLIB = $(CVSCO)
+CVSCO_NETLIB = $(CVSCO)
+CVSCO_NGLAYOUT = $(CVSCO)
+CVSCO_LIZARD = $(CVSCO)
+CVSCO_PLUGIN = $(CVSCO) -A
+
+# The list of directories that need to be built to build the standalone
+# nglayout test program. The order is important.
+DIRS =				\
+  config			\
+  dbm				\
+  nsprpub			\
+  jpeg				\
+  modules/libreg		\
+  xpcom				\
+  modules/zlib			\
+  modules/libutil		\
+  sun-java			\
+  nav-java			\
+  js				\
+  modules/security/freenav	\
+  modules/libpref		\
+  modules/libimg		\
+  modules/plugin		\
+  base				\
+  lib/xp			\
+  lib/libpwcac			\
+  network			\
+  lib/liblayer/include		\
+  htmlparser			\
+  dom				\
+  gfx				\
+  view				\
+  widget			\
+  layout			\
+  webshell
+
+include $(DEPTH)/config/config.mk
+
+include $(DEPTH)/config/rules.mk
+
+real_all: all
+
+real_export: export
+
+real_libs: libs
+
+real_install: install
+
+real_clobber: clobber
+
+real_depend: depend
+
+#
+# Rules for pulling the source from the cvs repository
+#
+
+pull_all: pull_lizard pull_xpcom pull_imglib pull_netlib pull_nglayout pull_plugin
+
+pull_lizard:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_LIZARD) mozilla/config; \
+	$(CVSCO_LIZARD) mozilla/dbm; \
+	$(CVSCO_LIZARD) mozilla/build/build_number; \
+	$(CVSCO_LIZARD) mozilla/cmd/xfe/icons/icondata.h; \
+	$(CVSCO_LIZARD) mozilla/lib/liblayer; \
+	$(CVSCO_LIZARD) mozilla/modules/zlib; \
+	$(CVSCO_LIZARD) mozilla/modules/libutil; \
+	$(CVSCO_LIZARD) mozilla/nsprpub; \
+	$(CVSCO_LIZARD) mozilla/sun-java; \
+	$(CVSCO_LIZARD) mozilla/nav-java; \
+	$(CVSCO_LIZARD) mozilla/js; \
+	$(CVSCO_LIZARD) mozilla/modules/security/freenav; \
+
+pull_xpcom:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO) -A mozilla/modules/libreg; \
+	$(CVSCO) -A mozilla/xpcom; \
+	$(CVSCO_LIBPREF) mozilla/modules/libpref
+
+pull_imglib:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_IMGLIB) mozilla/jpeg; \
+	$(CVSCO_IMGLIB) mozilla/modules/libutil; \
+	$(CVSCO_IMGLIB) mozilla/modules/libimg 
+
+pull_plugin:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_PLUGIN) mozilla/modules/plugin
+
+pull_netlib:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_NETLIB) mozilla/lib/xp; \
+	$(CVSCO_NETLIB) mozilla/lib/libpwcac; \
+	$(CVSCO_NETLIB) mozilla/network; \
+	$(CVSCO_NETLIB) mozilla/include
+
+pull_nglayout:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_NGLAYOUT) mozilla/base; \
+	$(CVSCO_NGLAYOUT) mozilla/dom; \
+	$(CVSCO_NGLAYOUT) mozilla/gfx; \
+	$(CVSCO_NGLAYOUT) mozilla/htmlparser; \
+	$(CVSCO_NGLAYOUT) mozilla/layout; \
+	$(CVSCO_NGLAYOUT) mozilla/view; \
+	$(CVSCO_NGLAYOUT) mozilla/webshell; \
+	$(CVSCO_NGLAYOUT) mozilla/widget
+
+pull_doc:
+	cd $(MOZ_SRC)/.; \
+	$(CVSCO_NGLAYOUT) README/nglayout; \
+	$(CVSCO_NGLAYOUT) mozilla/LICENSE; \
+	$(CVSCO_NGLAYOUT) mozilla/LEGAL
+
+######################################################################
+#
+# Build tarball
+
+DATE_CMD=date
+DATE=$(shell $(DATE_CMD) +%Y%m%d)
+
+TAR = tar
+GZIP = gzip
+
+TARBALL = $(MOZ_SRC)/unix-$(DATE).tar
+
+TARFILES = mozilla README/nglayout
+
+tarball: pull_all pull_doc clobber clobber_all real_tar
+
+real_tar:
+	@echo Making $(TARBALL)
+	cd $(MOZ_SRC)/.; \
+	rm -f $(TARBALL) $(TARBALL).gz; \
+	$(TAR) cf $(TARBALL) $(TARFILES)
+	@echo Making gzip of $(TARBALL); \
+	cd $(MOZ_SRC)/.; \
+	$(GZIP) -9 -q $(TARBALL)