From: William F. <wsf...@us...> - 2004-10-27 20:57:32
|
Update of /cvsroot/swig/SWIG/Examples/tcl/import In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14229/import Modified Files: README bar.dsp base.dsp example.dsw foo.dsp spam.dsp Log Message: Update for new runtime library approach (no more -runtime -noruntime) Comment about inline destructors needed for some compilers added Index: example.dsw =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/tcl/import/example.dsw,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** example.dsw 11 Jul 2004 21:14:45 -0000 1.2 --- example.dsw 27 Oct 2004 20:57:21 -0000 1.3 *************** *** 12,18 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name runtime - End Project Dependency }}} --- 12,15 ---- *************** *** 27,33 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name runtime - End Project Dependency }}} --- 24,27 ---- *************** *** 42,60 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name runtime - End Project Dependency - }}} - - ############################################################################### - - Project: "runtime"=.\runtime.dsp - Package Owner=<4> - - Package=<5> - {{{ - }}} - - Package=<4> - {{{ }}} --- 36,39 ---- *************** *** 69,75 **** Package=<4> {{{ - Begin Project Dependency - Project_Dep_Name runtime - End Project Dependency }}} --- 48,51 ---- Index: bar.dsp =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/tcl/import/bar.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bar.dsp 11 Jul 2004 21:14:45 -0000 1.3 --- bar.dsp 27 Oct 2004 20:57:21 -0000 1.4 *************** *** 54,58 **** 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 /debug /machine:I386 /pdbtype:sept ! # 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 "$(TCL_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"bar.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "bar - Win32 Release" --- 54,58 ---- 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 /debug /machine:I386 /pdbtype:sept ! # 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 "$(TCL_LIB)" /nologo /dll /debug /machine:I386 /out:"bar.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "bar - Win32 Release" *************** *** 80,84 **** 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 "$(TCL_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"bar.dll" !ENDIF --- 80,84 ---- 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 "$(TCL_LIB)" /nologo /dll /machine:I386 /out:"bar.dll" !ENDIF *************** *** 119,123 **** echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -noruntime -c++ -tcl8 $(InputPath) # End Custom Build --- 119,123 ---- echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build *************** *** 134,138 **** echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -noruntime -c++ -tcl8 $(InputPath) # End Custom Build --- 134,138 ---- echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build Index: foo.dsp =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/tcl/import/foo.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** foo.dsp 11 Jul 2004 21:14:45 -0000 1.3 --- foo.dsp 27 Oct 2004 20:57:21 -0000 1.4 *************** *** 54,58 **** 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 /debug /machine:I386 /pdbtype:sept ! # 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 "$(TCL_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"foo.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "foo - Win32 Release" --- 54,58 ---- 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 /debug /machine:I386 /pdbtype:sept ! # 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 "$(TCL_LIB)" /nologo /dll /debug /machine:I386 /out:"foo.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "foo - Win32 Release" *************** *** 80,84 **** 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 "$(TCL_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"foo.dll" !ENDIF --- 80,84 ---- 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 "$(TCL_LIB)" /nologo /dll /machine:I386 /out:"foo.dll" !ENDIF *************** *** 119,123 **** echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -noruntime -c++ -tcl8 $(InputPath) # End Custom Build --- 119,123 ---- echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build *************** *** 134,138 **** echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -noruntime -c++ -tcl8 $(InputPath) # End Custom Build --- 134,138 ---- echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build Index: spam.dsp =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/tcl/import/spam.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** spam.dsp 11 Jul 2004 21:14:45 -0000 1.3 --- spam.dsp 27 Oct 2004 20:57:21 -0000 1.4 *************** *** 54,58 **** 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 /debug /machine:I386 /pdbtype:sept ! # 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 "$(TCL_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"spam.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "spam - Win32 Release" --- 54,58 ---- 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 /debug /machine:I386 /pdbtype:sept ! # 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 "$(TCL_LIB)" /nologo /dll /debug /machine:I386 /out:"spam.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "spam - Win32 Release" *************** *** 80,84 **** 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 "$(TCL_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"spam.dll" !ENDIF --- 80,84 ---- 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 "$(TCL_LIB)" /nologo /dll /machine:I386 /out:"spam.dll" !ENDIF *************** *** 119,123 **** echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -noruntime -c++ -tcl8 $(InputPath) # End Custom Build --- 119,123 ---- echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build *************** *** 134,138 **** echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -noruntime -c++ -tcl8 $(InputPath) # End Custom Build --- 134,138 ---- echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build Index: base.dsp =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/tcl/import/base.dsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** base.dsp 11 Jul 2004 21:14:45 -0000 1.3 --- base.dsp 27 Oct 2004 20:57:21 -0000 1.4 *************** *** 54,58 **** 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 /debug /machine:I386 /pdbtype:sept ! # 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 "$(TCL_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"base.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "base - Win32 Release" --- 54,58 ---- 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 /debug /machine:I386 /pdbtype:sept ! # 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 "$(TCL_LIB)" /nologo /dll /debug /machine:I386 /out:"base.dll" /pdbtype:sept !ELSEIF "$(CFG)" == "base - Win32 Release" *************** *** 80,84 **** 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 "$(TCL_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"base.dll" !ENDIF --- 80,84 ---- 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 "$(TCL_LIB)" /nologo /dll /machine:I386 /out:"base.dll" !ENDIF *************** *** 119,123 **** echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -noruntime -c++ -tcl8 $(InputPath) # End Custom Build --- 119,123 ---- echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build *************** *** 134,138 **** echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -noruntime -c++ -tcl8 $(InputPath) # End Custom Build --- 134,138 ---- echo TCL_LIB: %TCL_LIB% echo on ! ..\..\..\swig -c++ -tcl8 $(InputPath) # End Custom Build Index: README =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/tcl/import/README,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** README 17 Oct 2004 19:56:35 -0000 1.7 --- README 27 Oct 2004 20:57:21 -0000 1.8 *************** *** 18,23 **** definitions for its base class. ! If everything is okay, all of the modules will load correctly and ! type checking will work correctly. Unix: --- 18,26 ---- definitions for its base class. ! If everything is okay, all of the modules will load properly and ! type checking will work correctly. Caveat: Some compilers, for example ! gcc-3.2.x, generate broken vtables with the inline methods in this test. ! This is not a SWIG problem and can usually be solved with non-inlined ! destructors compiled into separate shared objects/DLLs. Unix: *************** *** 28,36 **** Windows: -------- ! - Use the Visual C++ 6 workspace file (example.dsw). Build the runtime ! project DLL first followed by the other 4 DLLs as they all have a ! dependency on the runtime DLL. The Batch build option in the Build menu ! is usually the easiest way to do this. Only use the Release builds not ! the Debug builds. - Run the test as described above --- 31,37 ---- Windows: -------- ! - Use the Visual C++ 6 workspace file (example.dsw). The Batch build option ! in the Build menu is usually the easiest way to do this. Only use the Release ! builds not the Debug builds. - Run the test as described above |