Modified:
trunk/ChangeLog
trunk/CreateBinaryMsi.bat
trunk/CreateBinaryZip.bat
Log:
ENH: Improved scripts for building distros
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-11-13 23:30:28 UTC (rev 669)
+++ trunk/ChangeLog 2006-11-14 02:08:21 UTC (rev 670)
@@ -4,6 +4,25 @@
***************************************
---------------------------------------------
+13-NOV-2006 (5.00.08 Beta4)
+---------------------------------------------
+-- FIX: length now used when handling bind parameter (needed in particular for SQL_WCHAR)
- this enables updating char data in MS Access
+-- FIX: Fixed string length to chars, not bytes, returned by SQLGetDiagRec.
+-- FIX: Fixed using wrong pointer for SQL_MAX_DRIVER_CONNECTIONS in SQLGetInfo.
+-- FIX: Fixed binding using SQL_C_LONG
+-- FIX: Allow SQLDescribeCol to be called to retrieve the length of the column name, but
not the name itself.
+-- FIX: Fix size return from SQLDescribeCol
+-- ENH: Made distinction between CHAR/BINARY (and VAR versions)
+-- ENH: Wildcards now support escaped chars and underscore matching (needed to link
tables with underscores in access)
+-- FIX: Fixed MDiagnostic to use correct v2/v3 error codes.
+-- FIX: Set default return to SQL_SUCCESS if nothing is done for SQLSpecialColumns.
+-- FIX: Updated retrieval of descriptor fields to use the right pointer types.
+-- ENH: Also made SQL_DESC_NAME only fill in the name if there was a data pointer given,
otherwise just the length.
+-- FIX: Fixed hanlding of numeric pointers in SQLColAttribute.
+-- FIX: Fixed type returned for MYSQL_TYPE_LONG to SQL_INTEGER instead of SQL_TINYINT.
+-- ENH: Fixed display size to be length if max length isn't available.
+
+---------------------------------------------
07-NOV-2006 (5.00.07 Beta3)
---------------------------------------------
-- FIX: Fixed SQLDescibeCol returning column name length in bytes rather than chars.
Modified: trunk/CreateBinaryMsi.bat
===================================================================
--- trunk/CreateBinaryMsi.bat 2006-11-13 23:30:28 UTC (rev 669)
+++ trunk/CreateBinaryMsi.bat 2006-11-14 02:08:21 UTC (rev 670)
@@ -21,7 +21,13 @@
IF NOT EXIST Driver\lib\MYODBCDriver5.dll GOTO :doError3
SET TOPDIR=%CD%
+SET DIST_DIR=%TOPDIR%\mysql-connector-odbc-%1
+IF NOT EXIST "%DIST_DIR%" (
+ MKDIR "%DIST_DIR%"
+)
+DEL /Q /F %DIST_DIR%\*.*
+
REM Copying files to wix stage area...
IF NOT EXIST "%MYWIX_DIR%\bin\contents" (
mkdir "%MYWIX_DIR%\bin\contents"
@@ -48,7 +54,7 @@
copy LICENSE.commercial "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector
ODBC 5.0"
REM Removing old installers...
-del /Q /F %MYWIX_DIR%\bin\dist\*.*
+DEL /Q /F %MYWIX_DIR%\bin\dist\*.*
REM
REM Creating Commercial msi...
@@ -59,10 +65,11 @@
REM
REM Creating GPL msi...
REM
-rename bin\dist\*-win32.msi *-commercial-win32.msi
-rename bin\dist\*-win32.msi.md5 *-commercial-win32.msi.md5
-rename bin\dist\*-win32.zip *-commercial-win32.zip
-rename bin\dist\*-win32.zip.md5 *-commercial-win32.zip.md5
+RENAME bin\dist\*-win32.msi *-commercial-win32.msi
+RENAME bin\dist\*-win32.msi.md5 *-commercial-win32.msi.md5
+RENAME bin\dist\*-win32.zip *-commercial-win32.zip
+RENAME bin\dist\*-win32.zip.md5 *-commercial-win32.zip.md5
+MOVE bin\dist\*-commercial-win32* %DIST_DIR%\
move %SOURCE_DIR% bin\contents
del "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector ODBC
5.0\LICENSE.commercial"
@@ -70,10 +77,11 @@
copy %TOPDIR%\LICENSE.exceptions "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL
Connector ODBC 5.0"
call OdbcMakeSetup.bat %1 %2 gpl
-rename bin\dist\*-win32.msi *-gpl-win32.msi
-rename bin\dist\*-win32.msi.md5 *-gpl-win32.msi.md5
-rename bin\dist\*-win32.zip *-gpl-win32.zip
-rename bin\dist\*-win32.zip.md5 *-gpl-win32.zip.md5
+RENAME bin\dist\*-win32.msi *-gpl-win32.msi
+RENAME bin\dist\*-win32.msi.md5 *-gpl-win32.msi.md5
+RENAME bin\dist\*-win32.zip *-gpl-win32.zip
+RENAME bin\dist\*-win32.zip.md5 *-gpl-win32.zip.md5
+MOVE bin\dist\*-gpl-win32* %DIST_DIR%\
cd %TOPDIR%
@@ -86,7 +94,7 @@
ECHO "| distributions are listed below. |"
ECHO "| |"
ECHO "+-----------------------------------------------------+"
-DIR %MYWIX_DIR%\bin\dist
+DIR %DIST_DIR%
EXIT /B 0
:doError1
Modified: trunk/CreateBinaryZip.bat
===================================================================
--- trunk/CreateBinaryZip.bat 2006-11-13 23:30:28 UTC (rev 669)
+++ trunk/CreateBinaryZip.bat 2006-11-14 02:08:21 UTC (rev 670)
@@ -16,67 +16,84 @@
REM #########################################################
IF "%1"=="" GOTO doSyntax
+IF "%2"=="" GOTO doSyntax
+IF "%2"=="b" SET BUILD_TYPE="-beta"
+IF "%BUILD_TYPE%"=="" GOTO doSyntax
+
IF NOT EXIST CreateBinaryMsi.bat GOTO :doError1
IF NOT EXIST Driver\lib\MYODBCDriver5.dll CALL Build.bat
IF NOT EXIST Driver\lib\MYODBCDriver5.dll GOTO :doError2
+SET TOPDIR=%CD%
+SET DIST_DIR=%TOPDIR%\mysql-connector-odbc-%1
+
+IF NOT EXIST "%DIST_DIR%" (
+ MKDIR "%DIST_DIR%"
+)
+
REM
REM CLEAN UP FROM ANY PREVIOUS WORK
REM
ECHO Clean any existing stage area...
-IF EXIST .\mysql-connector-odbc-noinstall-%1-win32.zip (
- DEL mysql-connector-odbc-noinstall-%1-win32.zip
+IF EXIST "%TOPDIR%\dist-%1\mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32.zip" (
+ DEL "%TOPDIR%\dist-%1\mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32.zip"
)
-IF EXIST .\mysql-connector-odbc-noinstall-%1-win32 (
- RMDIR /S /Q mysql-connector-odbc-noinstall-%1-win32
+IF EXIST
"%TOPDIR%\dist-%1\mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32.zip" (
+ DEL
"%TOPDIR%\dist-%1\mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32.zip"
)
-IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1-win32.zip (
- DEL mysql-connector-odbc-commercial-noinstall-%1-win32.zip
+IF EXIST .\mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32 (
+ RMDIR /S /Q mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32
)
-IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1-win32 (
- RMDIR /S /Q mysql-connector-odbc-commercial-noinstall-%1-win32
+IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32 (
+ RMDIR /S /Q mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32
)
REM
REM PREPARE STAGING AREA
REM
ECHO GPL: Create stage area and populate...
-mkdir mysql-connector-odbc-noinstall-%1-win32
-mkdir mysql-connector-odbc-noinstall-%1-win32\Driver
-mkdir mysql-connector-odbc-noinstall-%1-win32\Driver\lib
-mkdir mysql-connector-odbc-noinstall-%1-win32\Tools
-mkdir mysql-connector-odbc-noinstall-%1-win32\Tools\bin
-xcopy /E /Y Driver\lib\* mysql-connector-odbc-noinstall-%1-win32\Driver\lib
-xcopy /E /Y Tools\bin\* mysql-connector-odbc-noinstall-%1-win32\Tools\bin
-copy Install.bat mysql-connector-odbc-noinstall-%1-win32
-copy Uninstall.bat mysql-connector-odbc-noinstall-%1-win32
-copy Upgrade.bat mysql-connector-odbc-noinstall-%1-win32
-copy ChangeLog mysql-connector-odbc-noinstall-%1-win32\ChangeLog.rtf
-copy LICENSE.gpl mysql-connector-odbc-noinstall-%1-win32\LICENSE.rtf
-copy LICENSE.exceptions mysql-connector-odbc-noinstall-%1-win32\EXCEPTIONS.rtf
-copy README.binary mysql-connector-odbc-noinstall-%1-win32\README.rtf
+mkdir mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32
+mkdir mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\Driver
+mkdir mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\Driver\lib
+mkdir mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\Tools
+mkdir mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\Tools\bin
+xcopy /E /Y Driver\lib\* mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\Driver\lib
+xcopy /E /Y Tools\bin\* mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\Tools\bin
+copy Install.bat mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32
+copy Uninstall.bat mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32
+copy Upgrade.bat mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32
+copy ChangeLog mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\ChangeLog.rtf
+copy LICENSE.gpl mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\LICENSE.rtf
+copy LICENSE.exceptions
mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\EXCEPTIONS.rtf
+copy README.binary mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\README.rtf
REM
REM CREATE GPL DISTRO
REM
ECHO Zipping...
-pkzipc -add -maximum -recurse -path=current mysql-connector-odbc-noinstall-%1-win32.zip
mysql-connector-odbc-noinstall-%1-win32\*.*
+pkzipc -add -maximum -recurse -path=current
mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32.zip
mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32\*.*
+%MYWIX_DIR%\utils\md5sum mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32.zip >
mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32.zip.md5
+MOVE mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32.* %DIST_DIR%\
REM
REM CREATE COMMERCIAL DISTRO
REM
ECHO COMMERCIAL: Create stage area and populate...
-MOVE mysql-connector-odbc-noinstall-%1-win32
mysql-connector-odbc-commercial-noinstall-%1-win32
-COPY LICENSE.commercial mysql-connector-odbc-commercial-noinstall-%1-win32\LICENSE.rtf
-DEL mysql-connector-odbc-commercial-noinstall-%1-win32\EXCEPTIONS.rtf
+MOVE mysql-connector-odbc-noinstall-%1%BUILD_TYPE%-win32
mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32
+COPY LICENSE.commercial
mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32\LICENSE.rtf
+DEL mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32\EXCEPTIONS.rtf
ECHO Zipping...
-pkzipc -add -maximum -recurse -path=current
mysql-connector-odbc-commercial-noinstall-%1-win32.zip
mysql-connector-odbc-commercial-noinstall-%1-win32/*.*
-IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1-win32 (
- rmdir /S /Q mysql-connector-odbc-commercial-noinstall-%1-win32
-)
+pkzipc -add -maximum -recurse -path=current
mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32.zip
mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32/*.*
+%MYWIX_DIR%\utils\md5sum
mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32.zip >
mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32.zip.md5
+MOVE mysql-connector-odbc-commercial-noinstall-%1%BUILD_TYPE%-win32.* %DIST_DIR%\
+REM
+REM ZIP INTO ONE FILE FOR ARCHIVE/UPLOAD
+REM
+pkzipc -add -maximum -recurse -path=current mysql-connector-odbc-%1%BUILD_TYPE%-win32.zip
%DIST_DIR%\*.*
+
:doSuccess
ECHO "+-----------------------------------------------------+"
ECHO "| DONE |"
@@ -86,7 +103,7 @@
ECHO "| distributions are listed below. |"
ECHO "| |"
ECHO "+-----------------------------------------------------+"
-DIR mysql-connector-odbc*%1*.zip
+DIR mysql-connector-odbc-%1%BUILD_TYPE%-win32.zip
EXIT /B 0
:doError1
@@ -125,14 +142,20 @@
ECHO "| |"
ECHO "| SYNTAX |"
ECHO "| |"
-ECHO "| CreateBinaryZip <version> |"
+ECHO "| CreateBinaryZip <version> <build-type> |"
ECHO "| |"
ECHO "| <version> must be a 3 number version |"
ECHO "| |"
+ECHO "| <built-type> must be; |"
+ECHO "| a - alpha |"
+ECHO "| b - beta |"
+ECHO "| r - release candidate |"
+ECHO "| p - production |"
+ECHO "| i - internal |"
+ECHO "| |"
ECHO "| EXAMPLES |"
ECHO "| |"
-ECHO "| CreateBinaryZip 5.00.06 |"
-ECHO "| CreateBinaryZip 5.00.06-beta |"
+ECHO "| CreateBinaryZip 5.00.06 b |"
ECHO "| |"
ECHO "+-----------------------------------------------------+"
| Thread |
|---|
| • Connector/ODBC 5 commit: r670 - trunk | pharvey | 14 Nov |
