Update for new runtime library approach (no more -runtime -noruntime)

Comment about inline destructors needed for some compilers added


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6535 626c5289-ae23-0410-ae9c-e8d60b6d4f22

6 files changed, 22 insertions, 43 deletions

diff --git a/Examples/ruby/import/README b/Examples/ruby/import/README
index 8020e0b1f..c529cd92c 100644
--- a/Examples/ruby/import/README
+++ b/Examples/ruby/import/README
@@ -13,12 +13,15 @@ a separate C++ class.
      bar.i      -  Bar class derived from Base
      spam.i     -  Spam class derived from Bar
 
-Each module used %import to refer to another module.  For
+Each module uses %import to refer to another module.  For
 example, the 'foo.i' module uses '%import base.i' to get
 definitions for its base class.
 
-If everything is okay, all of the modules will load correctly and
-type checking will work correctly.
+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:
 -----
diff --git a/Examples/ruby/import/bar.dsp b/Examples/ruby/import/bar.dsp
index 2a9357dfc..2212bc608 100644
--- a/Examples/ruby/import/bar.dsp
+++ b/Examples/ruby/import/bar.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # 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 /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 "$(RUBY_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"bar.dll" /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 "$(RUBY_LIB)" /nologo /dll /debug /machine:I386 /out:"bar.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "bar - Win32 Release"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 "$(RUBY_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"bar.dll"
+# 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 "$(RUBY_LIB)" /nologo /dll /machine:I386 /out:"bar.dll"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
@@ -120,7 +120,7 @@ InputName=bar
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	..\..\..\swig -noruntime -c++ -ruby $(InputPath) 
+	..\..\..\swig -c++ -ruby $(InputPath) 
 	
 # End Custom Build
 
@@ -135,7 +135,7 @@ InputName=bar
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	..\..\..\swig -noruntime -c++ -ruby $(InputPath) 
+	..\..\..\swig -c++ -ruby $(InputPath) 
 	
 # End Custom Build
 
diff --git a/Examples/ruby/import/base.dsp b/Examples/ruby/import/base.dsp
index 05c90b7ec..8e71117ad 100644
--- a/Examples/ruby/import/base.dsp
+++ b/Examples/ruby/import/base.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # 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 /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 "$(RUBY_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"base.dll" /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 "$(RUBY_LIB)" /nologo /dll /debug /machine:I386 /out:"base.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "base - Win32 Release"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 "$(RUBY_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"base.dll"
+# 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 "$(RUBY_LIB)" /nologo /dll /machine:I386 /out:"base.dll"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
@@ -120,7 +120,7 @@ InputName=base
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	..\..\..\swig -noruntime -c++ -ruby $(InputPath) 
+	..\..\..\swig -c++ -ruby $(InputPath) 
 	
 # End Custom Build
 
@@ -135,7 +135,7 @@ InputName=base
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	..\..\..\swig -noruntime -c++ -ruby $(InputPath) 
+	..\..\..\swig -c++ -ruby $(InputPath) 
 	
 # End Custom Build
 
diff --git a/Examples/ruby/import/example.dsw b/Examples/ruby/import/example.dsw
index 0c2fe7504..496c21544 100644
--- a/Examples/ruby/import/example.dsw
+++ b/Examples/ruby/import/example.dsw
@@ -11,9 +11,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name runtime
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -26,9 +23,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name runtime
-    End Project Dependency
 }}}
 
 ###############################################################################
@@ -41,21 +35,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name runtime
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Project: "runtime"=.\runtime.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
 }}}
 
 ###############################################################################
@@ -68,9 +47,6 @@ Package=<5>
 
 Package=<4>
 {{{
-    Begin Project Dependency
-    Project_Dep_Name runtime
-    End Project Dependency
 }}}
 
 ###############################################################################
diff --git a/Examples/ruby/import/foo.dsp b/Examples/ruby/import/foo.dsp
index 3d193f4a5..190a444b5 100644
--- a/Examples/ruby/import/foo.dsp
+++ b/Examples/ruby/import/foo.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # 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 /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 "$(RUBY_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"foo.dll" /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 "$(RUBY_LIB)" /nologo /dll /debug /machine:I386 /out:"foo.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "foo - Win32 Release"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 "$(RUBY_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"foo.dll"
+# 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 "$(RUBY_LIB)" /nologo /dll /machine:I386 /out:"foo.dll"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
@@ -120,7 +120,7 @@ InputName=foo
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	..\..\..\swig -noruntime -c++ -ruby $(InputPath) 
+	..\..\..\swig -c++ -ruby $(InputPath) 
 	
 # End Custom Build
 
@@ -135,7 +135,7 @@ InputName=foo
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	..\..\..\swig -noruntime -c++ -ruby $(InputPath) 
+	..\..\..\swig -c++ -ruby $(InputPath) 
 	
 # End Custom Build
 
diff --git a/Examples/ruby/import/spam.dsp b/Examples/ruby/import/spam.dsp
index 8b8246f52..344803880 100644
--- a/Examples/ruby/import/spam.dsp
+++ b/Examples/ruby/import/spam.dsp
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # 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 /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 "$(RUBY_LIB)" runtime.lib /nologo /dll /debug /machine:I386 /out:"spam.dll" /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 "$(RUBY_LIB)" /nologo /dll /debug /machine:I386 /out:"spam.dll" /pdbtype:sept
 # SUBTRACT LINK32 /pdb:none
 
 !ELSEIF  "$(CFG)" == "spam - Win32 Release"
@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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 "$(RUBY_LIB)" runtime.lib /nologo /dll /machine:I386 /out:"spam.dll"
+# 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 "$(RUBY_LIB)" /nologo /dll /machine:I386 /out:"spam.dll"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
@@ -120,7 +120,7 @@ InputName=spam
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	..\..\..\swig -noruntime -c++ -ruby $(InputPath) 
+	..\..\..\swig -c++ -ruby $(InputPath) 
 	
 # End Custom Build
 
@@ -135,7 +135,7 @@ InputName=spam
 	echo RUBY_INCLUDE: %RUBY_INCLUDE% 
 	echo RUBY_LIB: %RUBY_LIB% 
 	echo on 
-	..\..\..\swig -noruntime -c++ -ruby $(InputPath) 
+	..\..\..\swig -c++ -ruby $(InputPath) 
 	
 # End Custom Build