apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr/build apr_app.dsp libapr_app.dsp
Date Mon, 08 Sep 2003 14:49:13 GMT
wrowe       2003/09/08 07:49:13

  Modified:    .        apr.dsp libapr.dsp
               build    apr_app.dsp libapr_app.dsp
  Log:
    Several users (especially those building jk/ant) had observed that
    the APR 0.9 files didn't match on Win32 - they were explicitly trying
    to locate and bind to libapr-0.dll (to match unix libapr-0.so.)  While
    binary compatibility prevented us from 'fixing' this discrepancy for
    our existing users - nothing prevents us from fixing this going forwards.
  
    This change allows us to locate APR 0.9 and 1.0 binaries and libraries
    in the same tree structure, as an added bonus.  It would also allow the
    APR library to be installed in a common location, such as \windows\system32,
    without introducing conflicts between 0.9 and 1.0.
  
  Revision  Changes    Path
  1.126     +2 -2      apr/apr.dsp
  
  Index: apr.dsp
  ===================================================================
  RCS file: /home/cvs/apr/apr.dsp,v
  retrieving revision 1.125
  retrieving revision 1.126
  diff -u -r1.125 -r1.126
  --- apr.dsp	23 Aug 2003 10:01:22 -0000	1.125
  +++ apr.dsp	8 Sep 2003 14:49:13 -0000	1.126
  @@ -49,7 +49,7 @@
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +# ADD LIB32 /nologo /out:"LibR\apr-1.lib"
   
   !ELSEIF  "$(CFG)" == "apr - Win32 Debug"
   
  @@ -73,7 +73,7 @@
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +# ADD LIB32 /nologo /out:"LibD\apr-1.lib"
   
   !ENDIF 
   
  
  
  
  1.92      +2 -2      apr/libapr.dsp
  
  Index: libapr.dsp
  ===================================================================
  RCS file: /home/cvs/apr/libapr.dsp,v
  retrieving revision 1.91
  retrieving revision 1.92
  diff -u -r1.91 -r1.92
  --- libapr.dsp	23 Aug 2003 10:01:22 -0000	1.91
  +++ libapr.dsp	8 Sep 2003 14:49:13 -0000	1.92
  @@ -53,7 +53,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386
/opt:ref
  -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /opt:ref
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Release/libapr-1.dll"
/opt:ref
   
   !ELSEIF  "$(CFG)" == "libapr - Win32 Debug"
   
  @@ -79,7 +79,7 @@
   # ADD BSC32 /nologo
   LINK32=link.exe
   # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib
rpcrt4.lib /nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386
  -# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386
  +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib
/nologo /base:"0x6EEC0000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/libapr-1.dll"
   
   !ENDIF 
   
  
  
  
  1.6       +2 -2      apr/build/apr_app.dsp
  
  Index: apr_app.dsp
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_app.dsp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- apr_app.dsp	6 Feb 2003 22:54:55 -0000	1.5
  +++ apr_app.dsp	8 Sep 2003 14:49:13 -0000	1.6
  @@ -49,7 +49,7 @@
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +# ADD LIB32 /nologo /out:"LibR\apr_app-1.lib"
   
   !ELSEIF  "$(CFG)" == "apr_app - Win32 Debug"
   
  @@ -73,7 +73,7 @@
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +# ADD LIB32 /nologo /out:"LibD\apr_app-1.lib"
   
   !ENDIF 
   
  
  
  
  1.7       +2 -2      apr/build/libapr_app.dsp
  
  Index: libapr_app.dsp
  ===================================================================
  RCS file: /home/cvs/apr/build/libapr_app.dsp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- libapr_app.dsp	11 Feb 2003 21:57:45 -0000	1.6
  +++ libapr_app.dsp	8 Sep 2003 14:49:13 -0000	1.7
  @@ -49,7 +49,7 @@
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +# ADD LIB32 /nologo /out:"Release\libapr_app-1.lib"
   
   !ELSEIF  "$(CFG)" == "libapr_app - Win32 Debug"
   
  @@ -73,7 +73,7 @@
   # ADD BSC32 /nologo
   LIB32=link.exe -lib
   # ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +# ADD LIB32 /nologo /out:"Debug\libapr_app-1.lib"
   
   !ENDIF 
   
  
  
  

Mime
View raw message