Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 96617 invoked from network); 17 Jul 2009 15:03:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Jul 2009 15:03:29 -0000 Received: (qmail 70254 invoked by uid 500); 17 Jul 2009 15:04:35 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 70192 invoked by uid 500); 17 Jul 2009 15:04:35 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 70183 invoked by uid 99); 17 Jul 2009 15:04:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2009 15:04:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Jul 2009 15:04:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8A3B923888D2; Fri, 17 Jul 2009 15:04:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r795109 - in /apr/apr/branches/1.4.x: NWGNUmakefile build/NWGNUenvironment.inc Date: Fri, 17 Jul 2009 15:04:12 -0000 To: commits@apr.apache.org From: fuankg@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090717150412.8A3B923888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fuankg Date: Fri Jul 17 15:04:12 2009 New Revision: 795109 URL: http://svn.apache.org/viewvc?rev=795109&view=rev Log: backport NetWare build improvements. Modified: apr/apr/branches/1.4.x/NWGNUmakefile apr/apr/branches/1.4.x/build/NWGNUenvironment.inc Modified: apr/apr/branches/1.4.x/NWGNUmakefile URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/NWGNUmakefile?rev=795109&r1=795108&r2=795109&view=diff ============================================================================== --- apr/apr/branches/1.4.x/NWGNUmakefile (original) +++ apr/apr/branches/1.4.x/NWGNUmakefile Fri Jul 17 15:04:12 2009 @@ -350,23 +350,20 @@ install :: nlms $(INSTDIRS) FORCE copy $(OBJDIR)\aprlib.nlm $(INSTALLBASE)\*.* ifndef DEST - -copy $(subst /,\,$(APR))\STATUS $(INSTALLBASE)\*.apr - -copy $(subst /,\,$(APR))\LICENSE $(INSTALLBASE)\* - -copy $(subst /,\,$(APR))\CHANGES $(INSTALLBASE)\*.apr - -copy $(subst /,\,$(APRUTIL))\STATUS $(INSTALLBASE)\*.apu - -copy $(subst /,\,$(APRUTIL))\CHANGES $(INSTALLBASE)\*.apu - @echo rem copying the docs directories > xc.bat - @echo xcopy docs $(INSTALLBASE)\docs\*.* $(XCOPYSW) >> xc.bat - $(CMD) xc.bat - $(DEL) xc.bat + -$(CP) $(subst /,\,$(APR))\STATUS $(INSTALLBASE)\*.apr + -$(CP) $(subst /,\,$(APR))\LICENSE $(INSTALLBASE)\* + -$(CP) $(subst /,\,$(APR))\CHANGES $(INSTALLBASE)\*.apr + -$(CP) $(subst /,\,$(APRUTIL))\STATUS $(INSTALLBASE)\*.apu + -$(CP) $(subst /,\,$(APRUTIL))\CHANGES $(INSTALLBASE)\*.apu + @-$(XCP) $(subst /,\,$(APR))\docs $(INSTALLBASE)\docs\*.* endif ifndef DEST installdev :: $(INSTDEVDIRS) FORCE - -copy $(subst /,\,$(APR))\include\*.h $(INSTALLBASE)\include\*.* - -copy $(subst /,\,$(APRUTIL))\include\*.h $(INSTALLBASE)\include\*.* - -copy $(subst /,\,$(APR))\*.imp $(INSTALLBASE)\lib\*.* - -copy $(subst /,\,$(APR))\misc\netware\*.xdc $(INSTALLBASE)\lib\*.* + -$(CP) $(subst /,\,$(APR))\include\*.h $(INSTALLBASE)\include\*.* + -$(CP) $(subst /,\,$(APRUTIL))\include\*.h $(INSTALLBASE)\include\*.* + -$(CP) $(subst /,\,$(APR))\*.imp $(INSTALLBASE)\lib\*.* + -$(CP) $(subst /,\,$(APR))\misc\netware\*.xdc $(INSTALLBASE)\lib\*.* $(INSTDEVDIRS) :: $(CHKNOT) $@\NUL mkdir $@ @@ -382,11 +379,10 @@ vpath %.c dso/netware:memory/unix:mmap/unix:user/netware # Use the win32 network_io if Winsock is being used -ifdef USE_STDSOCKETS -vpath %.c network_io/unix -else -vpath %.c network_io/win32:network_io/unix +ifndef USE_STDSOCKETS +vpath %.c network_io/win32 endif +vpath %.c network_io/unix $(OBJDIR)/%.o: file_io/netware/%.c $(OBJDIR)\$(NLM_NAME)_cc.opt @echo Compiling $< Modified: apr/apr/branches/1.4.x/build/NWGNUenvironment.inc URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/NWGNUenvironment.inc?rev=795109&r1=795108&r2=795109&view=diff ============================================================================== --- apr/apr/branches/1.4.x/build/NWGNUenvironment.inc (original) +++ apr/apr/branches/1.4.x/build/NWGNUenvironment.inc Fri Jul 17 15:04:12 2009 @@ -38,11 +38,16 @@ ifndef NOVELLLIBC NOVELLLIBC = C:/novell/ndk/libc endif +ifneq "$(wildcard $(NOVELLLIBC)/include/ndkvers.h)" "$(NOVELLLIBC)/include/ndkvers.h" +$(error NOVELLLIBC does not point to a valid Novell LIBC SDK) +endif -# This is a placeholder -# ifndef LDAPSDK -# LDAPSDK = C:/novell/ndk/cldapsdk -# endif +ifndef LDAPSDK +LDAPSDK = C:/novell/ndk/cldapsdk/NetWare/libc +endif +ifneq "$(wildcard $(LDAPSDK)/inc/ldap.h)" "$(LDAPSDK)/inc/ldap.h" +$(error LDAPSDK does not point to a valid Novell CLDAP SDK) +endif ifndef METROWERKS METROWERKS = C:\Program Files\Metrowerks\CodeWarrior @@ -254,22 +259,19 @@ endif ifeq "$(OS)" "Windows_NT" -CMD=cmd /C -CHK=cmd /C if exist -CHKNOT=cmd /C if not exist -DEL = del /F -DELTREE = cmd /C rd /s/q -WINNT=1 -XCOPYSW = /E +CMD = cmd /C +DEL = del /F +DELTREE = $(CMD) rd /s/q +WINNT = 1 else -CMD=command /C -CHK=command /C if exist -CHKNOT=command /C if not exist -DEL = del -DELTREE = deltree /y -XCOPYSW = /E /Y -endif - +CMD = command /C +DEL = del +DELTREE = deltree /y +endif +CP = copy /Y +XCP = xcopy /E /Y +CHK = $(CMD) if exist +CHKNOT = $(CMD) if not exist # # Setup base C compiler flags