From 5a594c2b199e8a7ef90ebd2be88bc4e0194c2eee Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 24 Jul 2006 11:46:29 +0000 Subject: * Merge HEAD into cv-branch. --- winsup/ChangeLog | 10 ++++++++-- winsup/Makefile.in | 9 +++++++-- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/include/cygwin/version.h | 2 +- winsup/testsuite/ChangeLog | 8 ++++++++ winsup/testsuite/Makefile.in | 30 ++++-------------------------- 6 files changed, 32 insertions(+), 31 deletions(-) diff --git a/winsup/ChangeLog b/winsup/ChangeLog index 28df2bc..eca3381 100644 --- a/winsup/ChangeLog +++ b/winsup/ChangeLog @@ -1,4 +1,10 @@ -2006-06-14 Corinna Vinschen +2006-07-23 Christopher Faylor + + * Makefile.in: Update copyright. Fix 'check' target so that it will + once-again create a working testsuite directory. Add a comment this + time to explain the unusual behavior. + +2006-07-14 Corinna Vinschen * configure.in: Reenable building the subauth subdir. * configure: Regenerate. @@ -58,7 +64,7 @@ gcc won't be able to find .exp files on other hosts. 2003-07-18 Vaclav Haisman - + * Makefile.common (CFLAGS_COMMON): Remove -march=i386. 2003-07-01 Christopher Faylor diff --git a/winsup/Makefile.in b/winsup/Makefile.in index 348b66a..61d49d5 100644 --- a/winsup/Makefile.in +++ b/winsup/Makefile.in @@ -1,5 +1,6 @@ # Makefile.in for windows stuff -# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Red Hat, Inc. +# Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006 +# Red Hat, Inc. # # This file is part of Cygwin. # @@ -95,13 +96,17 @@ Makefile: Makefile.in $(srcdir)/configure.in config.status config.status: configure $(SHELL) config.status --recheck +# The below rule is intended to run configure only when "make check" is +# actually specified, i.e., not in a cross-compilation environment. The +# cygwin configuration is copied and modified to ensure that the same configuration +# parameters are passed when the testsuite is configured as when cygwin was configured. check: cygwin @if [ -f testsuite/config.status ]; then \ cd testsuite; \ else \ (mkdir testsuite 2>/dev/null || exit 0); \ cd testsuite; \ - sed -n -e '1,/^done/{' -e 's%winsup/cygwin\([ /]\)%winsup/testsuite\1%g; ' -e 'p; }' ../cygwin/config.status > config.status; \ + sed -e 's%winsup/cygwin\>%winsup/testsuite%g' ../cygwin/config.status > config.status; \ chmod a+x config.status; \ sh ./config.status --recheck; \ sh ./config.status; \ diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index b53417d..9b6a3f2 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2006-07-23 Christopher Faylor + + * include/cygwin/version.h: Bump DLL minor version number to 22. + 2006-07-20 Corinna Vinschen * fhandler.h (class fhandler_socket): Rearrange slightly to keep diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h index 293e106..2924385 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -43,7 +43,7 @@ details. */ changes to the DLL and is mainly informative in nature. */ #define CYGWIN_VERSION_DLL_MAJOR 1005 -#define CYGWIN_VERSION_DLL_MINOR 21 +#define CYGWIN_VERSION_DLL_MINOR 22 /* Major numbers before CYGWIN_VERSION_DLL_EPOCH are incompatible. */ diff --git a/winsup/testsuite/ChangeLog b/winsup/testsuite/ChangeLog index 8e8cdda..cc4165f 100644 --- a/winsup/testsuite/ChangeLog +++ b/winsup/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2006-07-23 Christopher Faylor + + * Makefile.in: Update copyrigh. Remove unused stuff. + +2006-07-17 Christopher Faylor + + * Makefile.in: Simplify a little. + 2006-06-12 Pierre Humblet Pierre.Humblet@ieee.org * winsup.api/user_malloc.c: New file. diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in index 70bf30c..da7c560 100644 --- a/winsup/testsuite/Makefile.in +++ b/winsup/testsuite/Makefile.in @@ -1,5 +1,5 @@ # Makefile.in for Cygwin's testsuite. -# Copyright 2000, 2001, 2002, 2003 Red Hat, Inc. +# Copyright 2000, 2001, 2002, 2003, 2005, 2006 Red Hat, Inc. # # This file is part of Cygwin. # @@ -40,9 +40,6 @@ includedir:=@includedir@ TESTSUP_INCLUDES:=-I$(libltp_srcdir)/include -INSTALL:=@INSTALL@ -INSTALL_PROGRAM:=@INSTALL_PROGRAM@ - # # --enable options from configure # @@ -55,15 +52,9 @@ ifneq (,$(CFLAGS)) else CFLAGS:=@CFLAGS@ -MD $(TESTSUP_INCLUDES) endif -CXXFLAGS:=@CXXFLAGS@ AR:=@AR@ AR_FLAGS:=qv -RANLIB:=@RANLIB@ -LD:=@LD@ -DLLTOOL:=@DLLTOOL@ -WINDRES:=@WINDRES@ -AS:=@AS@ # # Include common definitions for winsup directory @@ -73,16 +64,6 @@ include $(srcdir)/../Makefile.common override CC:=$(CC) $(GCC_INCLUDE) export CC -INSTALL_DATA:=$(SHELL) $(updir1)/install-sh -c - -# Setup the testing framework, if you have one -EXPECT = `if [ -f $${rootme}/../../expect/expect$(EXEEXT) ] ; then \ - echo $${rootme}/../../expect/expect$(EXEEXT) ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f ${srcdir}/../../dejagnu/runtest ] ; then \ - echo ${srcdir}/../../dejagnu/runtest ; \ - else echo runtest; fi` RUNTESTFLAGS = ifdef VERBOSE @@ -99,14 +80,11 @@ override COMPILE_CC:=${filter-out -O%,$(COMPILE_CC)} override CFLAGS:=${filter-out -O%,$(CFLAGS)} export CFLAGS -.PHONY: all force dll_ofiles install all_target install_target all_host install_host +.PHONY: all force dll_ofiles install all_target install_target install_host .SUFFIXES: .SUFFIXES: .c .cc .def .a .o .d -all_host=@all_host@ -install_host=@install_host@ - all: $(TESTSUP_LIB_NAME) force: @@ -181,12 +159,12 @@ testsuite/site.exp: site.exp check: $(TESTSUP_LIB_NAME) $(RUNTIME) cygrun.exe testsuite/site.exp cd testsuite; \ - EXPECT=${EXPECT} ; export EXPECT ; \ + export EXPECT=expect ; \ if [ -f $(bupdir2)/expect/expect ] ; then \ TCL_LIBRARY=`cd .. ; cd ${srcdir}/../../tcl/library ; pwd` ; \ export TCL_LIBRARY ; fi ; \ PATH=$(bupdir)/cygwin:$${PATH} ;\ - $(RUNTEST) --tool winsup $(RUNTESTFLAGS) ;\ + runtest --tool winsup $(RUNTESTFLAGS) ;\ cygrun.o: cygrun.c $(CC) $(MINGW_CFLAGS) -o $@ -c $< -- cgit v1.1