Modified:
trunk/Build.bat
trunk/CreateBinaryMsi.bat
trunk/CreateBinaryZip.bat
trunk/CreateMakefiles.bat
trunk/CreateSourceZip.bat
trunk/PostBuildTest.bat
trunk/PostBuildTest.unix
trunk/README.txt
trunk/connector-odbc.vpw
trunk/root.pro
Log:
- update of build scripts to reflect new file layout
Modified: trunk/Build.bat
===================================================================
--- trunk/Build.bat 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/Build.bat 2006-08-30 19:33:02 UTC (rev 501)
@@ -19,14 +19,13 @@
REM * additional libs for distro building.
REM ****
IF EXIST lib (
- rem rmdir /Q /S lib
+ rmdir /Q /S SDK\lib
del /Q lib\MYODBC*
del /Q lib\MYSQL*
)
IF EXIST bin (
- del /Q bin\dltest*
- del /Q bin\MYODBC*
- del /Q bin\MYSQL*
+ rmdir /Q /S SDK\bin
+ rmdir /Q /S bin
)
REM Invoke qmake - without relying upon its mechanism to dive into sub dirs.
Modified: trunk/CreateBinaryMsi.bat
===================================================================
--- trunk/CreateBinaryMsi.bat 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/CreateBinaryMsi.bat 2006-08-30 19:33:02 UTC (rev 501)
@@ -13,6 +13,11 @@
REM
REM #########################################################
+ECHO "+-----------------------------------------------------+"
+ECHO "| TODO: Update this script! |"
+ECHO "+-----------------------------------------------------+"
+EXIT /B 0
+
IF "%1"=="" GOTO doSyntax
IF "%2"=="" GOTO doSyntax
Modified: trunk/CreateBinaryZip.bat
===================================================================
--- trunk/CreateBinaryZip.bat 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/CreateBinaryZip.bat 2006-08-30 19:33:02 UTC (rev 501)
@@ -15,6 +15,11 @@
REM
REM #########################################################
+ECHO "+-----------------------------------------------------+"
+ECHO "| TODO: Update this script! |"
+ECHO "+-----------------------------------------------------+"
+EXIT /B 0
+
IF "%1"=="" GOTO doSyntax
ECHO Building...
Modified: trunk/CreateMakefiles.bat
===================================================================
--- trunk/CreateMakefiles.bat 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/CreateMakefiles.bat 2006-08-30 19:33:02 UTC (rev 501)
@@ -3,20 +3,10 @@
REM
REM \brief Create Makefiles from qmake project files.
REM
-REM Actually; you only want to use this to 'regenerate'
-REM the Makefiles. So do a qmake from the root source for
-REM the first time and then after that you probably want
-REM to use this for regenerating them due to changes in
-REM a qmake project file.
-REM
REM It would appear that under certian circumtsances existing
REM make files will not get regenerated after a qmake project
-REM file has changed.
+REM file has changed - this script handles that.
REM
-REM \note Its probably a good idea to run this twice as I think the
-REM the problem only occurs the first time an attempt is made
-REM to auto recreate the makefile.
-REM
REM #########################################################
ECHO "+-----------------------------------------------------+"
@@ -24,62 +14,104 @@
ECHO "+-----------------------------------------------------+"
qmake
-ECHO dltest...
-cd dltest
+REM
+REM SDK
+REM
+cd SDK
qmake
ECHO MYODBCC...
-cd ..\MYODBCC\MYODBCCLib
+cd C
qmake
-cd ..\MYODBCCTest
+cd Library
qmake
+cd ..\Tests
+qmake
+cd ..\..
ECHO MYODBCDbg...
-cd ..\..\MYODBCDbg\MYODBCDbgLib
+cd Dbg
qmake
-cd ..\MYODBCDbgTest
+cd Library
qmake
+cd ..\Tests
+qmake
+cd ..\..
ECHO MYODBCTst...
-cd ..\..\MYODBCTst\MYODBCTstLib
+cd Tst
qmake
+cd Library
+qmake
+cd ..\..
ECHO MYODBCIns...
-cd ..\..\MYODBCIns\MYODBCInsLib
+cd Installer
qmake
-cd ..\MYODBCInsTest
+cd Library
qmake
+cd ..\Tests
+qmake
+cd ..\..
ECHO MYSQLPlus...
-cd ..\..\MYSQLPlus\MYSQLPlusLib
+cd MYSQLPlus
qmake
-cd ..\MYSQLPlusTest
+cd Library
qmake
+cd ..\Tests
+qmake
+cd ..\..
+cd ..
+
+REM
+REM DRIVER
+REM
+cd Driver
+qmake
+
ECHO MYODBCDriver...
-cd ..\..\MYODBCDriver\MYODBCDriverLib
+cd Driver
qmake
-cd ..\MYODBCDriverTest
+cd Library
qmake
+cd ..\Tests
+qmake
+cd ..\..
ECHO MYODBCSetup...
-cd ..\..\MYODBCSetup
+cd Setup
qmake
-cd MYODBCSetupLib
+cd Library
qmake
-cd ..\MYODBCSetupTest
+cd ..\Tests
qmake
+cd ..\..
+cd ..
+
+REM
+REM TOOLS
+REM
+cd Tools
+qmake
+
+ECHO dltest...
+cd dltest
+qmake
+cd ..
+
ECHO MYODBCInstaller...
-cd ..\..\MYODBCInstaller
+cd Installer
qmake
+cd ..
ECHO MYODBCShell...
-cd ..\MYODBCShell
+cd Shell
qmake
+cd ..
-cd ..\
-
goto doSuccess
:doSuccess
Modified: trunk/CreateSourceZip.bat
===================================================================
--- trunk/CreateSourceZip.bat 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/CreateSourceZip.bat 2006-08-30 19:33:02 UTC (rev 501)
@@ -13,6 +13,11 @@
REM
REM #########################################################
+ECHO "+-----------------------------------------------------+"
+ECHO "| TODO: Update this script! |"
+ECHO "+-----------------------------------------------------+"
+EXIT /B 0
+
IF "%1"=="" GOTO doSyntax
ECHO Clean any existing stage area...
Modified: trunk/PostBuildTest.bat
===================================================================
--- trunk/PostBuildTest.bat 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/PostBuildTest.bat 2006-08-30 19:33:02 UTC (rev 501)
@@ -18,11 +18,20 @@
ECHO "| POST-BUILD TESTS ('smoke' tests) |"
ECHO "+-----------------------------------------------------+"
-cd bin
+REM
+REM SDK
+REM
+cd SDK\bin
REM MYODBCCTest
MYODBCDbgTest
MYODBCInsTest
MYSQLPlusTest
+cd ..\..
+
+REM
+REM DRIVER
+REM
+cd bin
MYODBCDriverTest
cd ..
@@ -35,8 +44,8 @@
ECHO "| |"
ECHO "| Hopefully things went well. If not then you should |"
ECHO "| at least have some useful information to deal with |"
-ECHO "| the problem (see the *.txt files created in the bin |"
-ECHO "| directory). |"
+ECHO "| the problem (see the *.txt files created in the |"
+ECHO "| SDK\bin and bin directories). |"
ECHO "| |"
ECHO "+-----------------------------------------------------+"
EXIT /B 0
Modified: trunk/PostBuildTest.unix
===================================================================
--- trunk/PostBuildTest.unix 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/PostBuildTest.unix 2006-08-30 19:33:02 UTC (rev 501)
@@ -1,6 +1,6 @@
#!/bin/bash
-THIS IS OUT OF DATE
+TODO: BRING THIS UP-TO-DATE
echo "BEGIN: Post build test..."
cd bin
Modified: trunk/README.txt
===================================================================
--- trunk/README.txt 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/README.txt 2006-08-30 19:33:02 UTC (rev 501)
@@ -4,7 +4,6 @@
This is the source for the MySQL ODBC driver. This is
useful for those wishing to build/alter the driver.
-
This is NOT needed for those who wish to simply use
a prebuilt version of C/ODBC.
Modified: trunk/connector-odbc.vpw
===================================================================
--- trunk/connector-odbc.vpw 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/connector-odbc.vpw 2006-08-30 19:33:02 UTC (rev 501)
@@ -3,6 +3,7 @@
<Projects>
<Project File="SDK/C/C.vpj" />
<Project File="SDK/C/Library/CLibrary.vpj" />
+ <Project File="connector-odbc.vpj" />
<Project File="SDK/C/Tests/CTests.vpj" />
<Project File="SDK/Dbg/Dbg.vpj" />
<Project File="SDK/Dbg/Library/DbgLibrary.vpj" />
Modified: trunk/root.pro
===================================================================
--- trunk/root.pro 2006-08-29 22:58:19 UTC (rev 500)
+++ trunk/root.pro 2006-08-30 19:33:02 UTC (rev 501)
@@ -51,9 +51,9 @@
#
# #########################################################
TEMPLATE = subdirs
-SUBDIRS = \
+SUBDIRS = \
SDK \
Driver \
- Tools
+ Tools
| Thread |
|---|
| • Connector/ODBC 5 commit: r501 - trunk | pharvey | 30 Aug |
