apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apr/test aprtest.dsp aprtest.dsw aprtest.win Makefile.in sendfile.c testmmap.c client.dsp htdigest.dsp server.dsp test.dsw testarg.dsp testfile.dsp testproc.dsp testsig.dsp testsock.dsp testsuite.dsw testthread.dsp testucs.dsp timetest.dsp
Date Mon, 04 Dec 2000 22:26:57 GMT
wrowe       00/12/04 14:26:56

  Modified:    test     Makefile.in sendfile.c testmmap.c
  Added:       test     aprtest.dsp aprtest.dsw aprtest.win
  Removed:     test     client.dsp htdigest.dsp server.dsp test.dsw
                        testarg.dsp testfile.dsp testproc.dsp testsig.dsp
                        testsock.dsp testsuite.dsw testthread.dsp
                        testucs.dsp timetest.dsp
  Log:
    A brand new (and -greatly- simplified) test build environment for Win32
  
    nmake /f aprtest.win  will build the project, it's wrapped by the studio
    workspace aprtest.dsw for the IDE folks.
  
  Revision  Changes    Path
  1.30      +2 -7      apr/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/test/Makefile.in,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- Makefile.in	2000/12/03 18:54:08	1.29
  +++ Makefile.in	2000/12/04 22:26:52	1.30
  @@ -8,8 +8,7 @@
   INCLUDES=-I$(INCDIR)
   MKDEP=../helpers/mkdep.sh
   
  -TARGETS= testmd5@EXEEXT@ \
  -	testfile@EXEEXT@ \
  +TARGETS= testfile@EXEEXT@ \
   	testflock@EXEEXT@ \
   	testproc@EXEEXT@ \
   	testsock@EXEEXT@ \
  @@ -26,8 +25,7 @@
   	occhild@EXEEXT@ \
   	mod_test.so
   
  -OBJS= testmd5.o \
  -	testfile.o \
  +OBJS= testfile.o \
   	testflock.o \
   	testproc.o \
   	testsock.o \
  @@ -46,9 +44,6 @@
   	$(CC) -c $(CFLAGS) $(INCLUDES) $<
   
   all: $(TARGETS) 
  -
  -testmd5@EXEEXT@: testmd5.o
  -	$(CC) $(CFLAGS) -o testmd5@EXEEXT@ testmd5.o $(LDFLAGS)
   
   testfile@EXEEXT@: testfile.o
   	$(CC) $(CFLAGS) -o testfile@EXEEXT@ testfile.o $(LDFLAGS) 
  
  
  
  1.2       +0 -1      apr/test/sendfile.c
  
  Index: sendfile.c
  ===================================================================
  RCS file: /home/cvs/apr/test/sendfile.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sendfile.c	2000/12/03 18:54:08	1.1
  +++ sendfile.c	2000/12/04 22:26:52	1.2
  @@ -57,7 +57,6 @@
   #include <signal.h>
   #include <stdlib.h>
   #include <string.h>
  -#include <sys/uio.h>
   #include "apr_network_io.h"
   #include "apr_errno.h"
   #include "apr_general.h"
  
  
  
  1.15      +0 -1      apr/test/testmmap.c
  
  Index: testmmap.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testmmap.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- testmmap.c	2000/11/15 21:46:38	1.14
  +++ testmmap.c	2000/12/04 22:26:53	1.15
  @@ -54,7 +54,6 @@
   
   #include <stdio.h>
   #include <stdlib.h>
  -#include <unistd.h>
   #include <string.h>
   #include "apr_mmap.h"
   #include "apr_errno.h"
  
  
  
  1.1                  apr/test/aprtest.dsp
  
  Index: aprtest.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="aprtest" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) External Target" 0x0106
  
  CFG=aprtest - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "aprtest.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "aprtest.mak" CFG="aprtest - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "aprtest - Win32 Release" (based on "Win32 (x86) External Target")
  !MESSAGE "aprtest - Win32 Debug" (based on "Win32 (x86) External Target")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  
  !IF  "$(CFG)" == "aprtest - Win32 Release"
  
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Cmd_Line "NMAKE /f Makefile"
  # PROP BASE Rebuild_Opt "/a"
  # PROP BASE Target_File "aprtest.exe"
  # PROP BASE Bsc_Name "aprtest.bsc"
  # PROP BASE Target_Dir ""
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Cmd_Line "NMAKE /f aprtest.win /a"
  # PROP Rebuild_Opt ""
  # PROP Bsc_Name ""
  # PROP Target_Dir ""
  
  !ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"
  
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Cmd_Line "NMAKE /f aprtest.mak"
  # PROP BASE Rebuild_Opt "/a"
  # PROP BASE Target_File "aprtest.exe"
  # PROP BASE Bsc_Name "aprtest.bsc"
  # PROP BASE Target_Dir ""
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Cmd_Line "NMAKE /f aprtest.win /a"
  # PROP Rebuild_Opt ""
  # PROP Bsc_Name ""
  # PROP Target_Dir ""
  
  !ENDIF 
  
  # Begin Target
  
  # Name "aprtest - Win32 Release"
  # Name "aprtest - Win32 Debug"
  
  !IF  "$(CFG)" == "aprtest - Win32 Release"
  
  !ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"
  
  !ENDIF 
  
  # Begin Source File
  
  SOURCE=.\aprtest.win
  
  !IF  "$(CFG)" == "aprtest - Win32 Release"
  
  !ELSEIF  "$(CFG)" == "aprtest - Win32 Debug"
  
  !ENDIF 
  
  # End Source File
  # Begin Source File
  
  SOURCE=.\Makefile.in
  # End Source File
  # Begin Source File
  
  SOURCE=.\MakeWin32Make.pl
  # End Source File
  # End Target
  # End Project
  
  
  
  1.1                  apr/test/aprtest.dsw
  
  Index: aprtest.dsw
  ===================================================================
  Microsoft Developer Studio Workspace File, Format Version 5.00
  # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
  
  ###############################################################################
  
  Project: "aprlib"="..\aprlib.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Project: "aprtest"=".\aprtest.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name aprlib
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Global:
  
  Package=<5>
  {{{
  }}}
  
  Package=<3>
  {{{
  }}}
  
  ###############################################################################
  
  
  
  
  1.1                  apr/test/aprtest.win
  
  Index: aprtest.win
  ===================================================================
  # Note:
  #
  # You may need to modify the configuration of Build - Options - Directories
  # for the Executable path to include the perl interpreter within DevStudio.
  # E.g. add c:\program files\perl\bin to the list of directories
  
  !IF "$(TARGET)" == ""
  TARGET=all
  !ENDIF 
  
  all: Makefile
  	$(MAKE) /nologo /f Makefile $(TARGET)
  
  Makefile: Makefile.in
  	perl MakeWin32Make.pl
  
  
  

Mime
View raw message