Added:
trunk/ChangeLog
trunk/README.binary
trunk/README.source
Removed:
trunk/README.txt
Modified:
trunk/CreateBinaryMsi.bat
trunk/CreateBinaryZip.bat
trunk/connector-odbc.vpj
Log:
ENH: Improve doc (added; ChangeLog, README's).
ENH: Improve scripts for building binary distro.
Added: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-10-31 17:49:31 UTC (rev 640)
+++ trunk/ChangeLog 2006-11-01 11:17:39 UTC (rev 641)
@@ -0,0 +1,11 @@
+ ***************************************
+ * MySQL ODBC 5.00 Driver *
+ * CHANGELOG *
+ ***************************************
+
+---------------------------------------------
+01-NOV-2006 (5.00.06 Beta2): pharvey@stripped
+---------------------------------------------
+--
+
+
Modified: trunk/CreateBinaryMsi.bat
===================================================================
--- trunk/CreateBinaryMsi.bat 2006-10-31 17:49:31 UTC (rev 640)
+++ trunk/CreateBinaryMsi.bat 2006-11-01 11:17:39 UTC (rev 641)
@@ -15,54 +15,59 @@
IF "%1"=="" GOTO doSyntax
IF "%2"=="" GOTO doSyntax
+IF "%MYWIX_DIR%"=="" GOTO doError1
+IF NOT EXIST CreateBinaryMsi.bat GOTO :doError2
+IF NOT EXIST Driver\lib\MYODBCDriver5.dll CALL Build.bat
+IF NOT EXIST Driver\lib\MYODBCDriver5.dll GOTO :doError3
-set TOPDIR=%CD%
+SET TOPDIR=%CD%
-REM Building...
-rem call Build.bat
-
REM Copying files to wix stage area...
-IF NOT EXIST "..\wix-installer\bin\contents" (
- mkdir "..\wix-installer\bin\contents"
+IF NOT EXIST "%MYWIX_DIR%\bin\contents" (
+ mkdir "%MYWIX_DIR%\bin\contents"
)
-IF NOT EXIST "..\wix-installer\bin\contents\Windows" (
- mkdir "..\wix-installer\bin\contents\Windows"
+IF NOT EXIST "%MYWIX_DIR%\bin\contents\Windows" (
+ mkdir "%MYWIX_DIR%\bin\contents\Windows"
)
-IF NOT EXIST "..\wix-installer\bin\contents\Windows\System32" (
- mkdir "..\wix-installer\bin\contents\Windows\System32"
+IF NOT EXIST "%MYWIX_DIR%\bin\contents\Windows\System32" (
+ mkdir "%MYWIX_DIR%\bin\contents\Windows\System32"
)
-IF NOT EXIST "..\wix-installer\bin\contents\Program Files" (
- mkdir "..\wix-installer\bin\contents\Program Files"
+IF NOT EXIST "%MYWIX_DIR%\bin\contents\Program Files" (
+ mkdir "%MYWIX_DIR%\bin\contents\Program Files"
)
-IF NOT EXIST "..\wix-installer\bin\contents\Program Files\MySQL" (
- mkdir "..\wix-installer\bin\contents\Program Files\MySQL"
+IF NOT EXIST "%MYWIX_DIR%\bin\contents\Program Files\MySQL" (
+ mkdir "%MYWIX_DIR%\bin\contents\Program Files\MySQL"
)
-IF NOT EXIST "..\wix-installer\bin\contents\Program Files\MySQL\MySQL Connector ODBC 5.0"
(
- mkdir "..\wix-installer\bin\contents\Program Files\MySQL\MySQL Connector ODBC 5.0"
+IF NOT EXIST "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector ODBC 5.0" (
+ mkdir "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector ODBC 5.0"
)
-copy Tools\bin\*.exe "..\wix-installer\bin\contents\Program Files\MySQL\MySQL Connector
ODBC 5.0"
-copy Driver\lib\*.lib "..\wix-installer\bin\contents\Program Files\MySQL\MySQL Connector
ODBC 5.0"
-rem copy Driver\lib\*.pdb "..\wix-installer\bin\contents\Program Files\MySQL\MySQL
Connector ODBC 5.0"
-copy Driver\lib\*.dll "..\wix-installer\bin\contents\Windows\System32"
-copy LICENSE.commercial "..\wix-installer\bin\contents\Program Files\MySQL\MySQL
Connector ODBC 5.0"
+copy Tools\bin\*.exe "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector ODBC
5.0"
+copy Driver\lib\*.lib "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector ODBC
5.0"
+rem copy Driver\lib\*.pdb "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector
ODBC 5.0"
+copy Driver\lib\*.dll "%MYWIX_DIR%\bin\contents\Windows\System32"
+copy LICENSE.commercial "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector
ODBC 5.0"
REM Removing old installers...
-del /f /q ..\wix-installer\bin\dist\*.*
+del /Q /F %MYWIX_DIR%\bin\dist\*.*
+REM
REM Creating Commercial msi...
-cd ..\wix-installer
+REM
+cd %MYWIX_DIR%
call OdbcMakeSetup.bat %1 %2 commercial
+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
-mv %SOURCE_DIR% bin\contents
-del "..\wix-installer\bin\contents\Program Files\MySQL\MySQL Connector ODBC
5.0\LICENSE.commercial"
-copy %TOPDIR%\LICENSE.gpl "..\wix-installer\bin\contents\Program Files\MySQL\MySQL
Connector ODBC 5.0"
-copy %TOPDIR%\LICENSE.exceptions "..\wix-installer\bin\contents\Program Files\MySQL\MySQL
Connector ODBC 5.0"
+move %SOURCE_DIR% bin\contents
+del "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector ODBC
5.0\LICENSE.commercial"
+copy %TOPDIR%\LICENSE.gpl "%MYWIX_DIR%\bin\contents\Program Files\MySQL\MySQL Connector
ODBC 5.0"
+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
@@ -71,8 +76,57 @@
rename bin\dist\*-win32.zip.md5 *-gpl-win32.zip.md5
cd %TOPDIR%
+
+:doSuccess
+ECHO "+-----------------------------------------------------+"
+ECHO "| DONE |"
+ECHO "+-----------------------------------------------------+"
+ECHO "| |"
+ECHO "| Hopefully things went well; and the Connector/ODBC |"
+ECHO "| distributions are listed below. |"
+ECHO "| |"
+ECHO "+-----------------------------------------------------+"
+DIR %MYWIX_DIR%\bin\dist
EXIT /B 0
+:doError1
+ECHO "+-----------------------------------------------------+"
+ECHO "| ERROR |"
+ECHO "+-----------------------------------------------------+"
+ECHO "| |"
+ECHO "| Please set MYWIX_DIR environment variable to the |"
+ECHO "| installer-wix directory. For example; |"
+ECHO "| |"
+ECHO "| SET MYWIX_DIR=..\installer-wix |"
+ECHO "| |"
+ECHO "+-----------------------------------------------------+"
+PAUSE
+EXIT /B 1
+
+:doError2
+ECHO "+-----------------------------------------------------+"
+ECHO "| ERROR |"
+ECHO "+-----------------------------------------------------+"
+ECHO "| |"
+ECHO "| You must run this from the base directory of the |"
+ECHO "| source code. |"
+ECHO "| |"
+ECHO "+-----------------------------------------------------+"
+PAUSE
+EXIT /B 1
+
+:doError3
+ECHO "+-----------------------------------------------------+"
+ECHO "| ERROR |"
+ECHO "+-----------------------------------------------------+"
+ECHO "| |"
+ECHO "| Failed to build driver. Use Build.bat to build |"
+ECHO "| driver. |"
+ECHO "| |"
+ECHO "+-----------------------------------------------------+"
+PAUSE
+EXIT /B 1
+
:doSyntax
ECHO "+-----------------------------------------------------+"
ECHO "| CreateBinaryMsi.bat |"
@@ -83,6 +137,10 @@
ECHO "| Use this to build sources and create a MSI based |"
ECHO "| installers for commercial and GPL. |"
ECHO "| |"
+ECHO "| NOTES |"
+ECHO "| |"
+ECHO "| You must set MYWIX_DIR env var before using this. |"
+ECHO "| |"
ECHO "| SYNTAX |"
ECHO "| |"
ECHO "| CreateBinaryMsi <version> <build-type> |"
Modified: trunk/CreateBinaryZip.bat
===================================================================
--- trunk/CreateBinaryZip.bat 2006-10-31 17:49:31 UTC (rev 640)
+++ trunk/CreateBinaryZip.bat 2006-11-01 11:17:39 UTC (rev 641)
@@ -16,25 +16,31 @@
REM #########################################################
IF "%1"=="" 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
-ECHO Building...
-call Build.bat
-
+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
+ DEL mysql-connector-odbc-noinstall-%1-win32.zip
)
IF EXIST .\mysql-connector-odbc-noinstall-%1-win32 (
- rmdir /S /Q mysql-connector-odbc-noinstall-%1-win32
+ RMDIR /S /Q mysql-connector-odbc-noinstall-%1-win32
)
IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1-win32.zip (
- del mysql-connector-odbc-commercial-noinstall-%1-win32.zip
+ DEL mysql-connector-odbc-commercial-noinstall-%1-win32.zip
)
IF EXIST .\mysql-connector-odbc-commercial-noinstall-%1-win32 (
- rmdir /S /Q mysql-connector-odbc-commercial-noinstall-%1-win32
+ RMDIR /S /Q mysql-connector-odbc-commercial-noinstall-%1-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
@@ -49,17 +55,21 @@
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 mysql-connector-odbc-noinstall-%1-win32\README.rtf
-copy INSTALL mysql-connector-odbc-noinstall-%1-win32\INSTALL.rtf
-copy INSTALL.win mysql-connector-odbc-noinstall-%1-win32\INSTALL-win.rtf
+copy README.binary mysql-connector-odbc-noinstall-%1-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\*.*
+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-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
ECHO Zipping...
pkzipc -add -maximum -recurse -path=current
mysql-connector-odbc-commercial-noinstall-%1-win32.zip
mysql-connector-odbc-commercial-noinstall-%1-win32/*.*
@@ -67,8 +77,42 @@
rmdir /S /Q mysql-connector-odbc-commercial-noinstall-%1-win32
)
+:doSuccess
+ECHO "+-----------------------------------------------------+"
+ECHO "| DONE |"
+ECHO "+-----------------------------------------------------+"
+ECHO "| |"
+ECHO "| Hopefully things went well; and the Connector/ODBC |"
+ECHO "| distributions are listed below. |"
+ECHO "| |"
+ECHO "+-----------------------------------------------------+"
+DIR mysql-connector-odbc*%1*.zip
EXIT /B 0
+:doError1
+ECHO "+-----------------------------------------------------+"
+ECHO "| ERROR |"
+ECHO "+-----------------------------------------------------+"
+ECHO "| |"
+ECHO "| You must run this from the base directory of the |"
+ECHO "| source code. |"
+ECHO "| |"
+ECHO "+-----------------------------------------------------+"
+PAUSE
+EXIT /B 1
+
+:doError2
+ECHO "+-----------------------------------------------------+"
+ECHO "| ERROR |"
+ECHO "+-----------------------------------------------------+"
+ECHO "| |"
+ECHO "| Failed to build driver. Use Build.bat to build |"
+ECHO "| driver. |"
+ECHO "| |"
+ECHO "+-----------------------------------------------------+"
+PAUSE
+EXIT /B 1
+
:doSyntax
ECHO "+-----------------------------------------------------+"
ECHO "| CreateBinaryZip.bat |"
@@ -85,9 +129,10 @@
ECHO "| |"
ECHO "| <version> must be a 3 number version |"
ECHO "| |"
-ECHO "| EXAMPLE |"
+ECHO "| EXAMPLES |"
ECHO "| |"
ECHO "| CreateBinaryZip 5.00.06 |"
+ECHO "| CreateBinaryZip 5.00.06-beta |"
ECHO "| |"
ECHO "+-----------------------------------------------------+"
Added: trunk/README.binary
===================================================================
--- trunk/README.binary 2006-10-31 17:49:31 UTC (rev 640)
+++ trunk/README.binary 2006-11-01 11:17:39 UTC (rev 641)
@@ -0,0 +1,25 @@
+MySQL Connector/ODBC
+BINARY
+======================================================
+
+This is the binary (noinstaller) distribution of MySQL
+Connector/ODBC (C/ODBC) - our ODBC driver.
+
+MySQL recommends using binary distributions with
+native installer where possible.
+
+Scripts for installing are provided;
+
++-----------+----------------------------------------+
+| SCRIPT | PURPOSE |
++-----------+----------------------------------------+
+| Install | Installs the binaries. |
+| Uninstall | Uninstalls the binaries. |
+| Upgrade | Upgrades an existing install. |
++-----------+----------------------------------------+
+
+======================================================
+Enjoy!
+MySQL Connectors Team
+
+
Copied: trunk/README.source (from rev 640, trunk/README.txt)
===================================================================
--- trunk/README.txt 2006-10-31 17:49:31 UTC (rev 640)
+++ trunk/README.source 2006-11-01 11:17:39 UTC (rev 641)
@@ -0,0 +1,37 @@
+MySQL Connector/ODBC
+SOURCE
+======================================================
+
+This is the source distribution for MySQL
+Connector/ODBC (C/ODBC) - our ODBC driver. This is
+useful for those wishing to build/alter the driver.
+
+MySQL recommends using binary distributions unless you
+need to alter the source code.
+
+This source code includes;
+
++--------+-------------------------------------------+
+| DIR | PROVIDES |
++--------+-------------------------------------------+
+| SDK | Software Development Kit |
+| Driver | Driver and Setup libraries |
+| Tools | useful command-line and GUI applications |
++--------+-------------------------------------------+
+
+Scripts for building and installing are also included;
+
++-----------+----------------------------------------+
+| SCRIPT | PURPOSE |
++-----------+----------------------------------------+
+| Build | Builds the binaries. |
+| Install | Installs the binaries. |
+| Uninstall | Uninstalls the binaries. |
+| Upgrade | Upgrades an existing install. |
++-----------+----------------------------------------+
+
+======================================================
+Enjoy!
+MySQL Connectors Team
+
+
Deleted: trunk/README.txt
===================================================================
--- trunk/README.txt 2006-10-31 17:49:31 UTC (rev 640)
+++ trunk/README.txt 2006-11-01 11:17:39 UTC (rev 641)
@@ -1,21 +0,0 @@
-MySQL Connector/ODBC
-======================================================
-
-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.
-
-This source code includes;
-
-+--------+-------------------------------------------+
-| DIR | PROVIDES |
-+--------+-------------------------------------------+
-| SDK | Software Development Kit |
-| Driver | Driver and Setup libraries |
-| Tools | useful command-line and GUI applications |
-+--------+-------------------------------------------+
-
-======================================================
-
Modified: trunk/connector-odbc.vpj
===================================================================
--- trunk/connector-odbc.vpj 2006-10-31 17:49:31 UTC (rev 640)
+++ trunk/connector-odbc.vpj 2006-11-01 11:17:39 UTC (rev 641)
@@ -70,6 +70,7 @@
Name="Other Files"
Filters="">
<F N="Build.bat"/>
+ <F N="ChangeLog"/>
<F N="CMakeLists.txt"/>
<F N="common.pri"/>
<F N="config.pri"/>
@@ -82,13 +83,17 @@
<F N="defines.cmake"/>
<F N="defines.pri"/>
<F N="Install.bat"/>
+ <F N="LICENSE.commercial"/>
+ <F N="LICENSE.exceptions"/>
+ <F N="LICENSE.gpl"/>
<F N="Maintainer.doxygen"/>
<F N="mysql.cmake"/>
<F N="mysql.pri"/>
<F N="odbc.pri"/>
<F N="PostBuildTest.bat"/>
<F N="PostBuildTest.unix"/>
- <F N="README.txt"/>
+ <F N="README.binary"/>
+ <F N="README.source"/>
<F N="root.pro"/>
<F N="Uninstall.bat"/>
<F N="Upgrade.bat"/>
| Thread |
|---|
| • Connector/ODBC 5 commit: r641 - trunk | pharvey | 1 Nov |
