wrowe 2002/12/28 21:56:00
Modified: test Makefile.win
Added: test testall.dsp testall.dsw
Log:
Get testall building within the studio environment for debugging on win32.
This is BS to maintain two build files, but as long as everyone shares the
responsibility for keeping them in sync, I can ignore this from now on.
Revision Changes Path
1.4 +18 -17 apr/test/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/apr/test/Makefile.win,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.win 13 Dec 2002 03:51:57 -0000 1.3
+++ Makefile.win 29 Dec 2002 05:56:00 -0000 1.4
@@ -1,4 +1,5 @@
+LINK=link /nologo
NONPORTABLE = \
testshm.exe \
@@ -13,13 +14,15 @@
testshmconsumer.exe \
testatomic.exe \
testmutexscope.exe \
- testall.exe
+ testall.exe \
+ mod_test.so
-TARGETS = $(PROGRAMS) $(NONPORTABLE) client.exe sendfile.exe \
+TARGETS = $(PROGRAMS) client.exe sendfile.exe \
server.exe
LOCAL_LIBS=..\LibD\apr.lib
+ALL_LIBS=kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib
shell32.lib rpcrt4.lib
CLEAN_TARGETS = mod_test.slo proc_child.exe occhild.exe \
testprocmutex.exe testglobalmutex.exe testshm.exe
@@ -27,8 +30,10 @@
INCDIR=../include
INCLUDES=/I "$(INCDIR)"
+all: $(TARGETS)
+
clean:
- del $(CLEAN_TARGETS) $(PROGRAMS) *.obj
+ -del $(CLEAN_TARGETS) $(PROGRAMS) *.obj 2>NUL
.c.obj:
cl /nologo /c /MDd /W3 /GX /Zi /Od /DWIN32 /D_DEBUG /D_WINDOWS
/DAPR_DECLARE_STATIC $(INCLUDES) $<
@@ -42,15 +47,12 @@
proc_child.exe: proc_child.obj $(LOCAL_LIBS)
$(LINK) proc_child.obj $(LOCAL_LIBS) $(ALL_LIBS)
-# FIXME: -prefer-pic is only supported with libtool-1.4+
-mod_test.so: $(srcdir)/mod_test.c
- $(LIBTOOL) --mode=compile $(COMPILE) -prefer-pic -c
$(srcdir)/mod_test.c && touch $@
-
-mod_test.la: mod_test.slo $(LOCAL_LIBS)
- $(LINK) --mode=link $(COMPILE) -rpath `pwd` -avoid-version -module
mod_test.obj $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
-
-libmod_test.la: mod_test.slo $(LOCAL_LIBS)
- $(LINK) --mode=link $(COMPILE) -rpath `pwd` -avoid-version mod_test.obj
$(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
+# FIXME: This is BS ... we should deal with namespace decoration within the
+# apr_dso_sym() function or within the test (take y'r pick) since many
platforms
+# have decoration and decoration issues.
+mod_test.so: mod_test.obj
+ $(LINK) mod_test.obj /dll /out:mod_test.so $(LOCAL_LIBS) $(ALL_LIBS) \
+ /export:print_hello /export:count_reps
testlockperf.exe: testlockperf.obj $(LOCAL_LIBS)
$(LINK) testlockperf.obj $(LOCAL_LIBS) $(ALL_LIBS)
@@ -95,10 +97,9 @@
testpoll.obj testlock.obj testsockopt.obj testpipe.obj testthread.obj \
testhash.obj testargs.obj testnames.obj testuser.obj
-testall: $(TESTS) \
- CuTest.obj $(LOCAL_LIBS)
- link /nologo /debug /subsystem:console /machine:I386 $(TESTS)
CuTest.obj \
- $(LOCAL_LIBS) kernel32.lib advapi32.lib ws2_32.lib mswsock.lib
ole32.lib shell32.lib rpcrt4.lib
-
+testall.exe: $(TESTS) CuTest.obj $(LOCAL_LIBS)
+ $(LINK) /debug /subsystem:console /machine:I386 $(TESTS) CuTest.obj \
+ $(LOCAL_LIBS) $(ALL_LIBS)
+
# DO NOT REMOVE
1.1 apr/test/testall.dsp
Index: testall.dsp
===================================================================
# Microsoft Developer Studio Project File - Name="testall" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) External Target" 0x0106
CFG=testall - 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 "testall.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 "testall.mak" CFG="testall - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "testall - Win32 Release" (based on "Win32 (x86) External Target")
!MESSAGE "testall - Win32 Debug" (based on "Win32 (x86) External Target")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
!IF "$(CFG)" == "testall - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir ""
# PROP BASE Intermediate_Dir ""
# PROP BASE Cmd_Line "NMAKE /f Makefile.win testall.exe"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "testall.exe"
# PROP BASE Bsc_Name "testall.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ""
# PROP Intermediate_Dir ""
# PROP Cmd_Line "NMAKE /f Makefile.win testall.exe"
# PROP Rebuild_Opt "/a"
# PROP Target_File "testall.exe"
# PROP Bsc_Name ""
# PROP Target_Dir ""
!ELSEIF "$(CFG)" == "testall - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir ""
# PROP BASE Intermediate_Dir ""
# PROP BASE Cmd_Line "NMAKE /f Makefile.win testall.exe"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "testall.exe"
# PROP BASE Bsc_Name "testall.bsc"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ""
# PROP Intermediate_Dir ""
# PROP Cmd_Line "NMAKE /f Makefile.win testall.exe"
# PROP Rebuild_Opt "/a"
# PROP Target_File "testall.exe"
# PROP Bsc_Name ""
# PROP Target_Dir ""
!ENDIF
# Begin Target
# Name "testall - Win32 Release"
# Name "testall - Win32 Debug"
!IF "$(CFG)" == "testall - Win32 Release"
!ELSEIF "$(CFG)" == "testall - Win32 Debug"
!ENDIF
# Begin Source File
SOURCE=.\Makefile.win
# End Source File
# Begin Source File
SOURCE=.\testall.c
# End Source File
# Begin Source File
SOURCE=.\testapp.c
# End Source File
# Begin Source File
SOURCE=.\testargs.c
# End Source File
# Begin Source File
SOURCE=.\testatomic.c
# End Source File
# Begin Source File
SOURCE=.\testdir.c
# End Source File
# Begin Source File
SOURCE=.\testdso.c
# End Source File
# Begin Source File
SOURCE=.\testdup.c
# End Source File
# Begin Source File
SOURCE=.\testfile.c
# End Source File
# Begin Source File
SOURCE=.\testfileinfo.c
# End Source File
# Begin Source File
SOURCE=.\testflock.c
# End Source File
# Begin Source File
SOURCE=.\testfmt.c
# End Source File
# Begin Source File
SOURCE=.\testglobalmutex.c
# End Source File
# Begin Source File
SOURCE=.\testhash.c
# End Source File
# Begin Source File
SOURCE=.\testipsub.c
# End Source File
# Begin Source File
SOURCE=.\testlock.c
# End Source File
# Begin Source File
SOURCE=.\testlockperf.c
# End Source File
# Begin Source File
SOURCE=.\testmmap.c
# End Source File
# Begin Source File
SOURCE=.\testmutexscope.c
# End Source File
# Begin Source File
SOURCE=.\testnames.c
# End Source File
# Begin Source File
SOURCE=.\testoc.c
# End Source File
# Begin Source File
SOURCE=.\testpipe.c
# End Source File
# Begin Source File
SOURCE=.\testpoll.c
# End Source File
# Begin Source File
SOURCE=.\testpools.c
# End Source File
# Begin Source File
SOURCE=.\testproc.c
# End Source File
# Begin Source File
SOURCE=.\testprocmutex.c
# End Source File
# Begin Source File
SOURCE=.\testrand.c
# End Source File
# Begin Source File
SOURCE=.\testshm.c
# End Source File
# Begin Source File
SOURCE=.\testshmconsumer.c
# End Source File
# Begin Source File
SOURCE=.\testshmproducer.c
# End Source File
# Begin Source File
SOURCE=.\testsleep.c
# End Source File
# Begin Source File
SOURCE=.\testsock.c
# End Source File
# Begin Source File
SOURCE=.\testsockets.c
# End Source File
# Begin Source File
SOURCE=.\testsockopt.c
# End Source File
# Begin Source File
SOURCE=.\teststr.c
# End Source File
# Begin Source File
SOURCE=.\testtable.c
# End Source File
# Begin Source File
SOURCE=.\testthread.c
# End Source File
# Begin Source File
SOURCE=.\testtime.c
# End Source File
# Begin Source File
SOURCE=.\testud.c
# End Source File
# Begin Source File
SOURCE=.\testuser.c
# End Source File
# Begin Source File
SOURCE=.\testvsn.c
# End Source File
# End Target
# End Project
1.1 apr/test/testall.dsw
Index: testall.dsw
===================================================================
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "apr"="..\apr.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "apr_app"="..\build\apr_app.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name apr
End Project Dependency
}}}
###############################################################################
Project: "testall"=".\testall.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name apr
End Project Dependency
}}}
###############################################################################
Project: "libapr"="..\libapr.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "libapr_app"="..\build\libapr_app.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libapr
End Project Dependency
}}}
###############################################################################
Project: "testapp"=".\testapp.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name apr
End Project Dependency
Begin Project Dependency
Project_Dep_Name apr_app
End Project Dependency
}}}
###############################################################################
Project: "testappnt"=".\testappnt.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name apr
End Project Dependency
Begin Project Dependency
Project_Dep_Name apr_app
End Project Dependency
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
