RE: [PHP-DEV] fix for ext/notes
On Thu, 6 Feb 2003, [iso-8859-1] Kai Schröder wrote: Attached diff will fix compiling problems for ext/notes on Windows (wrong includes, wrong output dir). It tested with Notes C API R5 and R6. Please commit. empty attachment Next try with other name. Regards, Kai Index: notes.dsp === RCS file: /repository/php4/ext/notes/notes.dsp,v retrieving revision 1.1 diff -u -r1.1 notes.dsp --- notes.dsp 16 Feb 2001 21:36:28 - 1.1 +++ notes.dsp 6 Feb 2003 19:33:32 - @@ -56,7 +56,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4nts.lib /nologo /dll /machine:I386 /out:Release/php_notes.dll /libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib +shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib +php4nts.lib /nologo /dll /machine:I386 /out:..\..\Release/php_notes.dll +/libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release !ELSEIF $(CFG) == notes - Win32 Debug @@ -135,7 +135,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib notes.lib /nologo /dll /machine:I386 /out:Release_TS/php_notes.dll /libpath:..\..\Release_TS +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib +shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib +notes.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_notes.dll +/libpath:..\..\Release_TS # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == notes - Win32 Release_TS_inline @@ -162,8 +162,8 @@ # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:Release_TS/php_notes.dll /libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release_TS -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:Release_TS_inline/php_notes.dll /libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release_TS_inline +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib +advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib +libmySQL.lib php4ts.lib /nologo /dll /machine:I386 +/out:..\..\Release_TS/php_notes.dll /libpath:..\..\..\MySQL\lib\opt +/libpath:..\..\Release_TS +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib +shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib +php4ts.lib /nologo /dll /machine:I386 /out:..\..\Release_TS_inline/php_notes.dll +/libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release_TS_inline !ENDIF Index: php_notes.c === RCS file: /repository/php4/ext/notes/php_notes.c,v retrieving revision 1.15.8.1 diff -u -r1.15.8.1 php_notes.c --- php_notes.c 31 Dec 2002 16:35:02 - 1.15.8.1 +++ php_notes.c 6 Feb 2003 19:33:44 - @@ -31,7 +31,12 @@ #include php_notes.h #include ext/standard/info.h -#include notes_global.h +#ifdef PHP_WIN32 +#include global.h +#else +#include notes_global.h +#endif + #include nsfdb.h #include nsfdata.h #include osmisc.h @@ -60,7 +65,11 @@ #include fcntl.h #include globerr.h -#include notes_mail.h +#ifdef PHP_WIN32 +#include mail.h +#else +#include notes_mail.h +#endif #include mailserv.h #include nsf.h #include osfile.h /* OSPathNetConstruct */ -- PHP Development Mailing List http://www.php.net/ To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-DEV] fix for ext/notes
Next try with other name. This version is without indendations (thanks Derick). Regards, Kai Index: notes.dsp === RCS file: /repository/php4/ext/notes/notes.dsp,v retrieving revision 1.1 diff -u -r1.1 notes.dsp --- notes.dsp 16 Feb 2001 21:36:28 - 1.1 +++ notes.dsp 6 Feb 2003 19:33:32 - @@ -56,7 +56,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4nts.lib /nologo /dll /machine:I386 /out:Release/php_notes.dll /libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib +shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib +php4nts.lib /nologo /dll /machine:I386 /out:..\..\Release/php_notes.dll +/libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release !ELSEIF $(CFG) == notes - Win32 Debug @@ -135,7 +135,7 @@ # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib notes.lib /nologo /dll /machine:I386 /out:Release_TS/php_notes.dll /libpath:..\..\Release_TS +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib +shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib +notes.lib /nologo /dll /machine:I386 /out:..\..\Release_TS/php_notes.dll +/libpath:..\..\Release_TS # SUBTRACT LINK32 /pdb:none !ELSEIF $(CFG) == notes - Win32 Release_TS_inline @@ -162,8 +162,8 @@ # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:Release_TS/php_notes.dll /libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release_TS -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib php4ts.lib /nologo /dll /machine:I386 /out:Release_TS_inline/php_notes.dll /libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release_TS_inline +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib +advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib +libmySQL.lib php4ts.lib /nologo /dll /machine:I386 +/out:..\..\Release_TS/php_notes.dll /libpath:..\..\..\MySQL\lib\opt +/libpath:..\..\Release_TS +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib +shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libmySQL.lib +php4ts.lib /nologo /dll /machine:I386 /out:..\..\Release_TS_inline/php_notes.dll +/libpath:..\..\..\MySQL\lib\opt /libpath:..\..\Release_TS_inline !ENDIF Index: php_notes.c === RCS file: /repository/php4/ext/notes/php_notes.c,v retrieving revision 1.15.8.1 diff -u -r1.15.8.1 php_notes.c --- php_notes.c 31 Dec 2002 16:35:02 - 1.15.8.1 +++ php_notes.c 6 Feb 2003 19:33:44 - @@ -31,7 +31,12 @@ #include php_notes.h #include ext/standard/info.h -#include notes_global.h +#ifdef PHP_WIN32 +#include global.h +#else +#include notes_global.h +#endif + #include nsfdb.h #include nsfdata.h #include osmisc.h @@ -60,7 +65,11 @@ #include fcntl.h #include globerr.h -#include notes_mail.h +#ifdef PHP_WIN32 +#include mail.h +#else +#include notes_mail.h +#endif #include mailserv.h #include nsf.h #include osfile.h /* OSPathNetConstruct */ -- PHP Development Mailing List http://www.php.net/ To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-DEV] RfC: version names
I suppose we can have the snapshot generator do that, but it would still hard to differentiate between CVS versions then. Sounds a little bit stupid, but why the snapshot generator can't simply commit a changed /main/php_version.h every 2 hours? The php-cvs mailer should ignore the commits (ignore all from user vercommt for instance) and there must be a secure way to make commits for this special file without having full dev karma. Regards, Kai -- PHP Development Mailing List http://www.php.net/ To unsubscribe, visit: http://www.php.net/unsub.php
RE: [PHP-DEV] RfC: version names
That can be done, but that means 12 commits a day for a single file. I dont think that's a good idea. That's true. Now we have round about 30 commits each day. 12 more will make less than 5.000 blocks (5MB for 1k-blocks) more disk usage per year. Where do you see the real problem if the commits are not mailed to php-cvs list? Regards, Kai -- PHP Development Mailing List http://www.php.net/ To unsubscribe, visit: http://www.php.net/unsub.php
