Menu
▾
▴
[Swig-cvs] SWIG/Examples/python/import README,1.5,1.6 bar.dsp,1.2,1.3 base.dsp,1.2,1.3 example.dsw,1.1,1.2 foo.dsp,1.2,1.3 spam.dsp,1.2,1.3
|
From: William F. <wsf...@us...> - 2004-07-11 21:15:04
|
Update of /cvsroot/swig/SWIG/Examples/python/import In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31229/python/import Modified Files: README bar.dsp base.dsp example.dsw foo.dsp spam.dsp Log Message: Windows example no longer uses prebuilt runtime DLL, rather it builds its own runtime DLL Index: example.dsw =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/python/import/example.dsw,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** example.dsw 8 May 2003 15:18:07 -0000 1.1 --- example.dsw 11 Jul 2004 21:14:45 -0000 1.2 *************** *** 12,15 **** --- 12,18 ---- Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} *************** *** 24,27 **** --- 27,33 ---- Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} *************** *** 36,39 **** --- 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> + {{{ }}} *************** *** 48,51 **** --- 69,75 ---- Package=<4> {{{ + Begin Project Dependency + Project_Dep_Name runtime + End Project Dependency }}} Index: bar.dsp =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/python/import/bar.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bar.dsp 25 Nov 2003 21:08:15 -0000 1.2 --- bar.dsp 11 Jul 2004 21:14:45 -0000 1.3 *************** *** 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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.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 "$(PYTHON_LIB)" runtime.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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"_bar.dll" !ENDIF Index: foo.dsp =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/python/import/foo.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** foo.dsp 25 Nov 2003 21:08:15 -0000 1.2 --- foo.dsp 11 Jul 2004 21:14:45 -0000 1.3 *************** *** 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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.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 "$(PYTHON_LIB)" runtime.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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"_foo.dll" !ENDIF Index: spam.dsp =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/python/import/spam.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** spam.dsp 25 Nov 2003 21:08:15 -0000 1.2 --- spam.dsp 11 Jul 2004 21:14:45 -0000 1.3 *************** *** 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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.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 "$(PYTHON_LIB)" runtime.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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"_spam.dll" !ENDIF Index: base.dsp =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/python/import/base.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** base.dsp 25 Nov 2003 21:08:15 -0000 1.2 --- base.dsp 11 Jul 2004 21:14:45 -0000 1.3 *************** *** 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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.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 "$(PYTHON_LIB)" runtime.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 "$(PYTHON_LIB)" ..\..\..\Runtime\swigpy.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 "$(PYTHON_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"_base.dll" !ENDIF Index: README =================================================================== RCS file: /cvsroot/swig/SWIG/Examples/python/import/README,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** README 10 Jul 2004 16:37:36 -0000 1.5 --- README 11 Jul 2004 21:14:45 -0000 1.6 *************** *** 35,41 **** Windows: -------- ! - Use the Visual C++ 6 workspace file (example.dsw). Build each project ! to create the 5 DLLs. The Batch build option in the Build menu is the ! easiest way to do this. Only use the Release builds not the Debug builds. - Run the test as described above --- 35,43 ---- 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 |