MySQL Lists: commits: Connector/ODBC 5 commit: r498 - in trunk: . Driver Driver/Driver Driver/Driver/Library Driver/Driver/Tests Driver/Setup Driver/Setup/Library Driver/Se...

List:	Commits	« Previous Message Next Message »
From:	pharvey	Date:	August 29 2006 10:28pm
Subject:	Connector/ODBC 5 commit: r498 - in trunk: . Driver Driver/Driver Driver/Driver/Library Driver/Driver/Tests Driver/Setup Driver/Setup/Library Driver/Se...
View as plain text
Added:
   trunk/Driver/Setup.pro
Modified:
   trunk/Build.bat
   trunk/CreateVisualStudioProjects.bat
   trunk/Driver/Driver/Driver.pro
   trunk/Driver/Driver/Library/MYODBCDriverLib.vpj
   trunk/Driver/Driver/MYODBCDriver.vpj
   trunk/Driver/Driver/Tests/MYODBCDriverTest.vpj
   trunk/Driver/Setup/Library/MYODBCSetupLib.vpj
   trunk/Driver/Setup/MYODBCSetup.vpj
   trunk/Driver/Setup/Tests/MYODBCSetupTest.vpj
   trunk/connector-odbc.vpw
Log:


Modified: trunk/Build.bat
===================================================================
--- trunk/Build.bat	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Build.bat	2006-08-29 22:28:42 UTC (rev 498)
@@ -1,7 +1,7 @@
 @ECHO OFF
 REM ########################################################
 REM 
-REM \brief  Build myodbc.
+REM \brief  Build C/ODBC.
 REM
 REM         This exists for those working with the Windows source
 REM         distribution.

Modified: trunk/CreateVisualStudioProjects.bat
===================================================================
--- trunk/CreateVisualStudioProjects.bat	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/CreateVisualStudioProjects.bat	2006-08-29 22:28:42 UTC (rev 498)
@@ -20,42 +20,51 @@
 REM #########################################################
 
 ECHO "+-----------------------------------------------------+"
+ECHO "| TODO: Update this script!                           |"
+ECHO "+-----------------------------------------------------+"
+EXIT /B 0
+
+ECHO "+-----------------------------------------------------+"
 ECHO "| CREATING VISUAL STUDIO PROJECTS                     |"
 ECHO "+-----------------------------------------------------+"
 
-ECHO dltest...
-cd dltest
-qmake -t vcapp
-cd ..
 
+cd SDK
+
 ECHO MYODBCC...
-cd MYODBCC\MYODBCCLib
+cd C\Library
 qmake -t vclib
-cd ..\MYODBCCTest
+cd ..\Tests
 qmake -t vcapp
 
 ECHO MYODBCDbg...
-cd ..\..\MYODBCDbg\MYODBCDbgLib
+cd ..\..\Dbg\Library
 qmake -t vclib
 
 ECHO MYODBCIns...
-cd ..\..\MYODBCIns\MYODBCInsLib
+cd ..\..\Installer\Library
 qmake -t vclib
-cd ..\MYODBCInsTest
+cd ..\Tests
 qmake -t vcapp
 
 ECHO MYSQLPlus...
-cd ..\..\MYSQLPlus\MYSQLPlusLib
+cd ..\..\MYSQLPlus\Library
 qmake -t vclib
-cd ..\MYSQLPlusTest
+cd ..\Tests
 qmake -t vcapp
 
+
+cd ..\Driver
+
 ECHO MYODBCDriver...
-cd ..\..\MYODBCDriver\MYODBCDriverLib
+cd ..\..\Driver\Library
 qmake -t vclib
 cd ..\MYODBCDriverTest
 qmake -t vcapp
 
+
+cd ..\Tools
+
 ECHO MYODBCInstaller...
 cd ..\..\MYODBCInstaller
 qmake -t vcapp
@@ -64,6 +73,12 @@
 cd ..\MYODBCShell
 qmake -t vcapp
 
+ECHO dltest...
+cd dltest
+qmake -t vcapp
+cd ..
+
+
 cd ..\
 
 goto doSuccess

Modified: trunk/Driver/Driver/Driver.pro
===================================================================
--- trunk/Driver/Driver/Driver.pro	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Driver/Driver/Driver.pro	2006-08-29 22:28:42 UTC (rev 498)
@@ -1,6 +1,6 @@
 TEMPLATE        = subdirs
 SUBDIRS		= \
-		MYODBCDriverLib \
-		MYODBCDriverTest
+		Library \
+		Tests
  
 

Modified: trunk/Driver/Driver/Library/MYODBCDriverLib.vpj
===================================================================
--- trunk/Driver/Driver/Library/MYODBCDriverLib.vpj	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Driver/Driver/Library/MYODBCDriverLib.vpj	2006-08-29 22:28:42 UTC (rev 498)
@@ -2,43 +2,24 @@
 <Project
 	Version="10.0"
 	VendorName="SlickEdit"
-	WorkingDir="."
-	VCSProject="Subversion:">
+	WorkingDir=".">
 	<Config
-		Name="Debug"
-		Type="gnuc"
-		DebugCallbackName="gdb"
-		Version="1"
-		OutputFile="%bddriver.so"
+		Name="Release"
+		OutputFile=""
 		CompilerConfigName="Latest Version">
 		<Menu>
 			<Target
 				Name="Compile"
 				MenuCaption="&amp;Compile"
-				Dialog="_gnuc_options_form Compile"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				OutputExts="*.o"
 				SaveOption="SaveCurrent"
 				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi -c %xup  %defd -g -o "%bd%n%oe" %i "%f"'/>
+				<Exec/>
 			</Target>
 			<Target
-				Name="Link"
-				MenuCaption="&amp;Link"
-				ShowOnMenu="Never"
-				Dialog="_gnuc_options_form Link"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi %xup -g -o "%o" %f %libs -shared -fPIC'/>
-			</Target>
-			<Target
 				Name="Build"
 				MenuCaption="&amp;Build"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveWorkspaceFiles"
 				RunFromDir="%rw">
 				<Exec CmdLine="make"/>
@@ -47,137 +28,24 @@
 				Name="Rebuild"
 				MenuCaption="&amp;Rebuild"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveWorkspaceFiles"
 				RunFromDir="%rw">
-				<Exec CmdLine=""/>
+				<Exec/>
 			</Target>
 			<Target
 				Name="Debug"
 				MenuCaption="&amp;Debug"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveNone"
 				RunFromDir="%rw">
-				<Exec CmdLine=""/>
+				<Exec/>
 			</Target>
 			<Target
 				Name="Execute"
 				MenuCaption="E&amp;xecute"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="dash"
-				MenuCaption="-"
-				Deletable="0">
-				<Exec/>
-			</Target>
-			<Target
-				Name="GNU C Options"
-				MenuCaption="GNU C &amp;Options..."
-				ShowOnMenu="HideIfNoCmdLine"
-				Deletable="0"
-				SaveOption="SaveNone">
-				<Exec
-					CmdLine="gnucoptions"
-					Type="Slick-C"/>
-			</Target>
-		</Menu>
-	</Config>
-	<Config
-		Name="Release"
-		Type="gnuc"
-		DebugCallbackName="gdb"
-		Version="1"
-		OutputFile="%bddriver.so"
-		CompilerConfigName="Latest Version">
-		<Menu>
-			<Target
-				Name="Compile"
-				MenuCaption="&amp;Compile"
-				Dialog="_gnuc_options_form Compile"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				OutputExts="*.o"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi -c %xup %defd -o "%bd%n%oe" %i "%f"'/>
-			</Target>
-			<Target
-				Name="Link"
-				MenuCaption="&amp;Link"
-				ShowOnMenu="Never"
-				Dialog="_gnuc_options_form Link"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi %xup -o "%o" %f %libs -shared -fPIC'/>
-			</Target>
-			<Target
-				Name="Build"
-				MenuCaption="&amp;Build"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine="make"/>
-			</Target>
-			<Target
-				Name="Rebuild"
-				MenuCaption="&amp;Rebuild"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="Debug"
-				MenuCaption="&amp;Debug"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveNone"
 				RunFromDir="%rw">
-				<Exec CmdLine=""/>
+				<Exec CmdLine='"MYODBCDriverLib.exe"'/>
 			</Target>
-			<Target
-				Name="Execute"
-				MenuCaption="E&amp;xecute"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="dash"
-				MenuCaption="-"
-				Deletable="0">
-				<Exec/>
-			</Target>
-			<Target
-				Name="GNU C Options"
-				MenuCaption="GNU C &amp;Options..."
-				ShowOnMenu="HideIfNoCmdLine"
-				Deletable="0"
-				SaveOption="SaveNone">
-				<Exec
-					CmdLine="gnucoptions"
-					Type="Slick-C"/>
-			</Target>
 		</Menu>
 	</Config>
 	<Files>
@@ -260,11 +128,8 @@
 			Name="Other Files"
 			Filters="">
 			<F N="CMakeLists.txt"/>
+			<F N="Library.pro"/>
 			<F N="MYODBCDriverExports.def"/>
-			<F N="MYODBCDriverLib.pro"/>
 		</Folder>
 	</Files>
-	<CompatibleVersions>
-		<PrevVersion VersionNumber="9.1"/>
-	</CompatibleVersions>
 </Project>

Modified: trunk/Driver/Driver/MYODBCDriver.vpj
===================================================================
--- trunk/Driver/Driver/MYODBCDriver.vpj	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Driver/Driver/MYODBCDriver.vpj	2006-08-29 22:28:42 UTC (rev 498)
@@ -2,194 +2,59 @@
 <Project
 	Version="10.0"
 	VendorName="SlickEdit"
-	WorkingDir="."
-	VCSProject="Subversion:">
+	WorkingDir=".">
 	<Config
-		Name="Debug"
-		Type="gnuc"
-		DebugCallbackName="gdb"
-		Version="1"
-		OutputFile="%bddriver.so"
+		Name="Release"
+		OutputFile=""
 		CompilerConfigName="Latest Version">
 		<Menu>
 			<Target
 				Name="Compile"
 				MenuCaption="&amp;Compile"
-				Dialog="_gnuc_options_form Compile"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				OutputExts="*.o"
 				SaveOption="SaveCurrent"
 				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi -c %xup  %defd -g -o "%bd%n%oe" %i "%f"'/>
+				<Exec/>
 			</Target>
 			<Target
-				Name="Link"
-				MenuCaption="&amp;Link"
-				ShowOnMenu="Never"
-				Dialog="_gnuc_options_form Link"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi %xup -g -o "%o" %f %libs -shared -fPIC'/>
-			</Target>
-			<Target
 				Name="Build"
 				MenuCaption="&amp;Build"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveWorkspaceFiles"
 				RunFromDir="%rw">
-				<Exec CmdLine="make"/>
+				<Exec/>
 			</Target>
 			<Target
 				Name="Rebuild"
 				MenuCaption="&amp;Rebuild"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveWorkspaceFiles"
 				RunFromDir="%rw">
-				<Exec CmdLine=""/>
+				<Exec/>
 			</Target>
 			<Target
 				Name="Debug"
 				MenuCaption="&amp;Debug"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveNone"
 				RunFromDir="%rw">
-				<Exec CmdLine=""/>
+				<Exec/>
 			</Target>
 			<Target
 				Name="Execute"
 				MenuCaption="E&amp;xecute"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="dash"
-				MenuCaption="-"
-				Deletable="0">
-				<Exec/>
-			</Target>
-			<Target
-				Name="GNU C Options"
-				MenuCaption="GNU C &amp;Options..."
-				ShowOnMenu="HideIfNoCmdLine"
-				Deletable="0"
-				SaveOption="SaveNone">
-				<Exec
-					CmdLine="gnucoptions"
-					Type="Slick-C"/>
-			</Target>
-		</Menu>
-	</Config>
-	<Config
-		Name="Release"
-		Type="gnuc"
-		DebugCallbackName="gdb"
-		Version="1"
-		OutputFile="%bddriver.so"
-		CompilerConfigName="Latest Version">
-		<Menu>
-			<Target
-				Name="Compile"
-				MenuCaption="&amp;Compile"
-				Dialog="_gnuc_options_form Compile"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				OutputExts="*.o"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi -c %xup %defd -o "%bd%n%oe" %i "%f"'/>
-			</Target>
-			<Target
-				Name="Link"
-				MenuCaption="&amp;Link"
-				ShowOnMenu="Never"
-				Dialog="_gnuc_options_form Link"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi %xup -o "%o" %f %libs -shared -fPIC'/>
-			</Target>
-			<Target
-				Name="Build"
-				MenuCaption="&amp;Build"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine="make"/>
-			</Target>
-			<Target
-				Name="Rebuild"
-				MenuCaption="&amp;Rebuild"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="Debug"
-				MenuCaption="&amp;Debug"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveNone"
 				RunFromDir="%rw">
-				<Exec CmdLine=""/>
+				<Exec CmdLine='"MYODBCDriver.exe"'/>
 			</Target>
-			<Target
-				Name="Execute"
-				MenuCaption="E&amp;xecute"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="dash"
-				MenuCaption="-"
-				Deletable="0">
-				<Exec/>
-			</Target>
-			<Target
-				Name="GNU C Options"
-				MenuCaption="GNU C &amp;Options..."
-				ShowOnMenu="HideIfNoCmdLine"
-				Deletable="0"
-				SaveOption="SaveNone">
-				<Exec
-					CmdLine="gnucoptions"
-					Type="Slick-C"/>
-			</Target>
 		</Menu>
 	</Config>
 	<Files>
 		<Folder
 			Name="Source Files"
-			Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl">
-		</Folder>
+			Filters="*.c;*.C;*.cc;*.cpp;*.cp;*.cxx;*.prg;*.pas;*.dpr;*.asm;*.s;*.bas;*.java;*.cs;*.sc;*.e;*.cob;*.html;*.rc;*.tcl;*.py;*.pl"/>
 		<Folder
 			Name="Header Files"
-			Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if">
-			<F N="include/MYODBCDriver.h"/>
-		</Folder>
+			Filters="*.h;*.H;*.hh;*.hpp;*.hxx;*.inc;*.sh;*.cpy;*.if"/>
 		<Folder
 			Name="Resource Files"
 			Filters="*.ico;*.cur;*.dlg"/>
@@ -201,10 +66,8 @@
 			Filters="">
 			<F N="CMakeLists.txt"/>
 			<F N="doxygen.config"/>
-			<F N="MYODBCDriver.pro"/>
+			<F N="Driver.pro"/>
+			<F N="README.txt"/>
 		</Folder>
 	</Files>
-	<CompatibleVersions>
-		<PrevVersion VersionNumber="9.1"/>
-	</CompatibleVersions>
 </Project>

Modified: trunk/Driver/Driver/Tests/MYODBCDriverTest.vpj
===================================================================
--- trunk/Driver/Driver/Tests/MYODBCDriverTest.vpj	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Driver/Driver/Tests/MYODBCDriverTest.vpj	2006-08-29 22:28:42 UTC (rev 498)
@@ -2,43 +2,24 @@
 <Project
 	Version="10.0"
 	VendorName="SlickEdit"
-	WorkingDir="."
-	VCSProject="Subversion:">
+	WorkingDir=".">
 	<Config
-		Name="Debug"
-		Type="gnuc"
-		DebugCallbackName="gdb"
-		Version="1"
-		OutputFile="%bdmyodbc-3"
+		Name="Release"
+		OutputFile=""
 		CompilerConfigName="Latest Version">
 		<Menu>
 			<Target
 				Name="Compile"
 				MenuCaption="&amp;Compile"
-				Dialog="_gnuc_options_form Compile"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				OutputExts="*.o"
 				SaveOption="SaveCurrent"
 				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi -c %xup  %defd -g -o "%bd%n%oe" %i "%f"'/>
+				<Exec/>
 			</Target>
 			<Target
-				Name="Link"
-				MenuCaption="&amp;Link"
-				ShowOnMenu="Never"
-				Dialog="_gnuc_options_form Link"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi %xup -g -o "%o" %f %libs'/>
-			</Target>
-			<Target
 				Name="Build"
 				MenuCaption="&amp;Build"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveWorkspaceFiles"
 				RunFromDir="%rw">
 				<Exec CmdLine="make"/>
@@ -47,137 +28,24 @@
 				Name="Rebuild"
 				MenuCaption="&amp;Rebuild"
 				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveWorkspaceFiles"
 				RunFromDir="%rw">
-				<Exec CmdLine=""/>
+				<Exec/>
 			</Target>
 			<Target
 				Name="Debug"
 				MenuCaption="&amp;Debug"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveNone"
 				RunFromDir="%rw">
-				<Exec CmdLine='vsdebugio -prog "%o"'/>
+				<Exec/>
 			</Target>
 			<Target
 				Name="Execute"
 				MenuCaption="E&amp;xecute"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine='"%o"'/>
-			</Target>
-			<Target
-				Name="dash"
-				MenuCaption="-"
-				Deletable="0">
-				<Exec/>
-			</Target>
-			<Target
-				Name="GNU C Options"
-				MenuCaption="GNU C &amp;Options..."
-				ShowOnMenu="HideIfNoCmdLine"
-				Deletable="0"
-				SaveOption="SaveNone">
-				<Exec
-					CmdLine="gnucoptions"
-					Type="Slick-C"/>
-			</Target>
-		</Menu>
-	</Config>
-	<Config
-		Name="Release"
-		Type="gnuc"
-		DebugCallbackName="gdb"
-		Version="1"
-		OutputFile="%bdmyodbc-3"
-		CompilerConfigName="Latest Version">
-		<Menu>
-			<Target
-				Name="Compile"
-				MenuCaption="&amp;Compile"
-				Dialog="_gnuc_options_form Compile"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				OutputExts="*.o"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi -c %xup %defd -o "%bd%n%oe" %i "%f"'/>
-			</Target>
-			<Target
-				Name="Link"
-				MenuCaption="&amp;Link"
-				ShowOnMenu="Never"
-				Dialog="_gnuc_options_form Link"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveCurrent"
-				RunFromDir="%rw">
-				<Exec CmdLine='gcc -ansi %xup -o "%o" %f %libs'/>
-			</Target>
-			<Target
-				Name="Build"
-				MenuCaption="&amp;Build"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine="make"/>
-			</Target>
-			<Target
-				Name="Rebuild"
-				MenuCaption="&amp;Rebuild"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine=""/>
-			</Target>
-			<Target
-				Name="Debug"
-				MenuCaption="&amp;Debug"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
 				SaveOption="SaveNone"
 				RunFromDir="%rw">
-				<Exec CmdLine='vsdebugio -prog "%o"'/>
+				<Exec CmdLine='"MYODBCDriverTest.exe"'/>
 			</Target>
-			<Target
-				Name="Execute"
-				MenuCaption="E&amp;xecute"
-				Dialog="_gnuc_options_form Run/Debug"
-				BuildFirst="1"
-				CaptureOutputWith="ProcessBuffer"
-				Deletable="0"
-				SaveOption="SaveWorkspaceFiles"
-				RunFromDir="%rw">
-				<Exec CmdLine='"%o"'/>
-			</Target>
-			<Target
-				Name="dash"
-				MenuCaption="-"
-				Deletable="0">
-				<Exec/>
-			</Target>
-			<Target
-				Name="GNU C Options"
-				MenuCaption="GNU C &amp;Options..."
-				ShowOnMenu="HideIfNoCmdLine"
-				Deletable="0"
-				SaveOption="SaveNone">
-				<Exec
-					CmdLine="gnucoptions"
-					Type="Slick-C"/>
-			</Target>
 		</Menu>
 	</Config>
 	<Files>
@@ -230,10 +98,7 @@
 			Name="Other Files"
 			Filters="">
 			<F N="CMakeLists.txt"/>
-			<F N="MYODBCDriverTest.pro"/>
+			<F N="Tests.pro"/>
 		</Folder>
 	</Files>
-	<CompatibleVersions>
-		<PrevVersion VersionNumber="9.1"/>
-	</CompatibleVersions>
 </Project>

Modified: trunk/Driver/Setup/Library/MYODBCSetupLib.vpj
===================================================================
--- trunk/Driver/Setup/Library/MYODBCSetupLib.vpj	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Driver/Setup/Library/MYODBCSetupLib.vpj	2006-08-29 22:28:42 UTC (rev 498)
@@ -208,6 +208,7 @@
 			Name="Other Files"
 			Filters="">
 			<F N="CMakeLists.txt"/>
+			<F N="Library.pro"/>
 			<F N="MYODBCSetup.def"/>
 			<F N="MYODBCSetupLib.pro"/>
 			<F N="MySQL-16.xpm"/>

Modified: trunk/Driver/Setup/MYODBCSetup.vpj
===================================================================
--- trunk/Driver/Setup/MYODBCSetup.vpj	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Driver/Setup/MYODBCSetup.vpj	2006-08-29 22:28:42 UTC (rev 498)
@@ -199,7 +199,8 @@
 			Name="Other Files"
 			Filters="">
 			<F N="CMakeLists.txt"/>
-			<F N="MYODBCSetup.pro"/>
+			<F N="README.txt"/>
+			<F N="Setup.pro"/>
 		</Folder>
 	</Files>
 	<CompatibleVersions>

Modified: trunk/Driver/Setup/Tests/MYODBCSetupTest.vpj
===================================================================
--- trunk/Driver/Setup/Tests/MYODBCSetupTest.vpj	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Driver/Setup/Tests/MYODBCSetupTest.vpj	2006-08-29 22:28:42 UTC (rev 498)
@@ -200,6 +200,7 @@
 			Filters="">
 			<F N="CMakeLists.txt"/>
 			<F N="MYODBCSetupTest.pro"/>
+			<F N="Tests.pro"/>
 		</Folder>
 	</Files>
 	<CompatibleVersions>

Added: trunk/Driver/Setup.pro
===================================================================
--- trunk/Driver/Setup.pro	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/Driver/Setup.pro	2006-08-29 22:28:42 UTC (rev 498)
@@ -0,0 +1,5 @@
+TEMPLATE	= subdirs
+SUBDIRS	= \
+		Driver \
+		Setup
+

Modified: trunk/connector-odbc.vpw
===================================================================
--- trunk/connector-odbc.vpw	2006-08-29 21:34:35 UTC (rev 497)
+++ trunk/connector-odbc.vpw	2006-08-29 22:28:42 UTC (rev 498)
@@ -1,40 +1,5 @@
 <!DOCTYPE Workspace SYSTEM "http://www.slickedit.com/dtd/vse/10.0/vpw.dtd">
 <Workspace Version="10.0" VendorName="SlickEdit">
 	<Projects>
-		<Project File="dltest/dltest.vpj" />
-		<Project File="examples/CPP/ADO/exampleADO.vpj" />
-		<Project File="MYODBCBrw/MYODBCBrw.vpj" />
-		<Project File="MYODBCBrw/MYODBCBrwApp/MYODBCBrwApp.vpj" />
-		<Project File="MYODBCBrw/MYODBCBrwLib/MYODBCBrwLib.vpj" />
-		<Project File="MYODBCC/MYODBCC.vpj" />
-		<Project File="MYODBCC/MYODBCCLib/MYODBCCLib.vpj" />
-		<Project File="MYODBCCls/MYODBCCls.vpj" />
-		<Project File="MYODBCCls/MYODBCClsApp/MYODBCClsApp.vpj" />
-		<Project File="MYODBCCls/MYODBCClsLib/MYODBCClsLib.vpj" />
-		<Project File="MYODBCC/MYODBCCTest/MYODBCCTest.vpj" />
-		<Project File="MYODBCDbg/MYODBCDbg.vpj" />
-		<Project File="MYODBCDbg/MYODBCDbgLib/MYODBCDbgLib.vpj" />
-		<Project File="MYODBCDbg/MYODBCDbgTest/MYODBCDbgTest.vpj" />
-		<Project File="MYODBCDriver/MYODBCDriver.vpj" />
-		<Project File="MYODBCDriver/MYODBCDriverLib/MYODBCDriverLib.vpj" />
-		<Project File="MYODBCDriver/MYODBCDriverTest/MYODBCDriverTest.vpj" />
-		<Project File="MYODBCIns/MYODBCIns.vpj" />
-		<Project File="MYODBCIns/MYODBCInsLib/MYODBCInsLib.vpj" />
-		<Project File="MYODBCInstaller/MYODBCInstaller.vpj" />
-		<Project File="MYODBCIns/MYODBCInsTest/MYODBCInsTest.vpj" />
-		<Project File="MYODBCSetup/MYODBCSetup.vpj" />
-		<Project File="MYODBCSetup/MYODBCSetupLib/MYODBCSetupLib.vpj" />
-		<Project File="MYODBCSetup/MYODBCSetupTest/MYODBCSetupTest.vpj" />
-		<Project File="MYODBCShell/MYODBCShell.vpj" />
-		<Project File="MYODBCTst/MYODBCTst.vpj" />
-		<Project File="MYODBCTst/MYODBCTstLib/MYODBCTstLib.vpj" />
-		<Project File="MYQTODBCCls/MYQTODBCCls.vpj" />
-		<Project File="MYQTODBCCls/MYQTODBCClsApp/MYQTODBCClsApp.vpj" />
-		<Project File="MYQTODBCCls/MYQTODBCClsLib/MYQTODBCClsLib.vpj" />
-		<Project File="../../mysql-include.vpj" />
-		<Project File="MYSQLPlus/MYSQLPlus.vpj" />
-		<Project File="MYSQLPlus/MYSQLPlusLib/MYSQLPlusLib.vpj" />
-		<Project File="MYSQLPlus/MYSQLPlusTest/MYSQLPlusTest.vpj" />
-		<Project File="root.vpj" />
 	</Projects>
 </Workspace>
Thread
• Connector/ODBC 5 commit: r498 - in trunk: . Driver Driver/Driver Driver/Driver/Library Driver/Driver/Tests Driver/Setup Driver/Setup/Library Driver/Se...	pharvey	30 Aug