From c3da3f320846c5201b6eaf609dd47cf3e5876b0a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 4 Jun 2004 20:25:56 +0000 Subject: [PATCH] r9551: windows updates --- ChangeLog | 6 +++++- db-mysql/Makefile.msvc | 12 ++++++------ db-mysql/mysql-loader.lisp | 3 ++- db-mysql/mysql.dll | Bin 4096 -> 4608 bytes db-mysql/mysql.lib | Bin 2550 -> 3452 bytes uffi/Makefile.msvc | 14 +++++++------- uffi/uffi.dll | Bin 3584 -> 4608 bytes uffi/uffi.lib | Bin 1730 -> 1658 bytes 8 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index b788b27..54955e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,12 @@ 03 Jun 2004 Marcus Pearce + * Version 2.11.5 released * examples/clsql-tutorial.lisp: Remove obsolete :nulls-ok attribute, Select connection-spec based on connection type. Bugs reported by Bill Clementson. - + * uffi/uffi.dll, uffi/uffi.lib: Recompile with Visual Studio 2003 + * db-mysql/mysql-loader.lisp: Update check for zlibwapi library + name on Windows, add \bin\ directory to search path + 31 May 2004 Marcus Pearce * db-odbc/odbc-sql.lisp: DB-TYPE replaced with DATABASE-TYPE in DATABASE-CONNECT. diff --git a/db-mysql/Makefile.msvc b/db-mysql/Makefile.msvc index e7991f1..096bb55 100644 --- a/db-mysql/Makefile.msvc +++ b/db-mysql/Makefile.msvc @@ -2,14 +2,14 @@ ########################################################################### # FILE IDENTIFICATION # -# Name: Makefile.msvc -# Purpose: Makefile for the CLSQL UFFI helper package (MSVC) -# Programer: Kevin M. Rosenberg -# Date Started: Mar 2002 +# Name: Makefile.msvc +# Purpose: Makefile for the CLSQL UFFI helper package (MSVC) +# Author: Kevin M. Rosenberg +# Created: Mar 2002 # # CVS Id: $Id: Makefile.msvc,v 1.1 2002/09/18 07:43:40 kevin Exp $ # -# This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg +# This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg # # CLSQL users are granted the rights to distribute and use this software # as governed by the terms of the Lisp Lesser GNU Public License @@ -17,7 +17,7 @@ ########################################################################### -BASE=clsql-mysql +BASE=mysql # Set to the directory where you have installed mysql's library MYSQL_DIR=c:/mysql diff --git a/db-mysql/mysql-loader.lisp b/db-mysql/mysql-loader.lisp index d93b783..93437e6 100644 --- a/db-mysql/mysql-loader.lisp +++ b/db-mysql/mysql-loader.lisp @@ -29,13 +29,14 @@ (defparameter *libz-library-path* (uffi:find-foreign-library - '("libz" "zlib") + '("libz" "zlibwapi" "zlib") `(,(make-pathname :directory (pathname-directory *load-truename*)) #+64bit "/usr/lib64/" "/usr/lib/" "/sw/lib/" "/usr/local/lib/" "/home/kevin/debian/src/clsql/db-mysql/" + "/bin/" "/mysql/lib/dll32/" "/mysql/lib/opt/") :drive-letters '("C"))) diff --git a/db-mysql/mysql.dll b/db-mysql/mysql.dll index 97259327d48506acdc5f6941b936b957a8079d33..095c0910020f4960799c6a01cc5181b1ba09be9f 100644 GIT binary patch literal 4608 zcmeHKZ)j6j6hEn{rZuV2+94|X)D+y*lDt>eNfk3SqhpPxtx>DfH0^sescBl17p=o; zM=Thg!anTdCKDa_!LbQ4x(Oqgu_{!kx`AxNIjP%YEzIGE))9RB-S-k3rw+%4e(}J$ z=bqpBch9*u_37RA9!()4Gg#Az1|S)^_4S_@73Q*qUzX9ilFN$*O!b!+Z3>0sTz9N% zS1j1cwFRTmE}3hUxL6{}g`?d1jZIue_9)b{?uNvE?}{Y_j!2f2Srd z!?uIEKGk*rvTvSEmxpRCwwR7@w(ZlUKj+t^%f@h9h~><8;PVjGo6O|9mUic{n^d-F zx@lS|O$A~x(B4^)b}*;wc70!D%!eUtPCEIp<`kGg2x4&$q@lJfCVJgO^esokLY_!& zqP`~@Ck;IuQQf4fpVM8a|7~9-OFc5M)9kG5e5}_8O<)h=h+3**Vo(keonVgvfbLTY zSwL<)iz>s7mNMK4X3du|Ws=-P>8h9%>1rc-pTPihKYcz7Fvv}`Hot!%pU(vR%Gdy& zC+)akr6CaXXo*D7bDBdyY|uU37vU^O~3*1mi0 zctzhmEuRAB#P_}Xt7<$`dP*;T`?tan)Y(}}W` z#j~AcKUk&Nm`qNX6x(a4q?Dv=a{weZhWgN|Rxux7f4cc3$3U}?9^Ieh=mgVF&c~u2 z!-a%K%CXyn-JscF1{%T--L6&x(DX9Rqiaxel^)igmW9!B#m1tQlKxBbH0_FRNUmUz zd1WyZ@f$v^q8hc6m8=#u3u!kVT!%GO2T&bEY9J}kh@ho@cfWG))`7J}*6fy}2%f5p887I)(Iuo{@{#zuT*e_~N9LC7ePbT*7p1cytDhL+iLWhPz zAIv7Zcmg5h!{fB4A`bg8@Uojto44Rso|06b;>iwrvgi_bG;z#xM?A^gGm7_)n9~2j zZVv3+eyIU9mm;%Pxg0C=ctQXF1YTWiZ(SOhb=3i%Cq416EF0KUt?Ut#|v zm=U|hyj+978$NJezl{Br0(~Z)Mg^GJANq!2z`r0n9$y-7!h{$+w?}As?rhBP8TJ+q zpCAR;EcAdsgybl|8rd9xJ&ykCjOJ43{`j6qfPFdz;*zwRYH~<4(HV$!?TZt=ltY5; z?NXa8i3aSMd& zta0fDb|V6Xx}s7~Sf&9}Ah$bA>%;M2Yed=_`APsU8e_{5!N%uPQ+TZGNtxPgbKTWFcQn?kfbEJegXM2hZ`L-eSjGuZQFV>H+) zJtjup-~BK=dAEfHCSL~Y?b*?WU)<-PU9}gLp8Evw+X~?jN1a1Xt81rAbalA8U6))} zT;IEHxqf$zyNdZzem2kXmAsQ*#n~S>7RtLWd9+dW2r#r0}Wm zx$vuSSNKzSrMjkieRV_i@#<66D8LcTfv9)-oNqf@oDpZY^PF?Q3Frkq#|iue;Gsr3 literal 4096 zcmeHJe{2(V6o1`1=%AgIF@;FNZFB@9%wCU(DAQ(e20{zn#x{%2(yce!(Y1KJ!j_26 zoCBK+g!n7bzr;>sA{sTA5J<>ng%He02E>Fv3>jvSh7ws!gb|ya?_JxqilB+c_{U!I zzVE%y_x<>O-}kwCl8be`H(9OAO?kh~x@-w`2Px;hcHrRwTm~b2dj9k? z1)p)Ks-16`n`?$Chgue(v?4RQZPoR%oC_h;H=R5<<_(-i!XS#9kvVg+7T^S;5(7XX z_arC!+;j3i6AZw*`%E`TLO1*ggP+L}MvvR89o+|$iXR5~%ZXM*a9>kiJHd9Ob zBlK0ScBTs1OrG>R#qdJLqvYi_Ck$9)S%s4U>mOo-yJH6bDrU{yF|I$2(drjsMXlbd zk7j)|;W#=vc*hy58N9>9<~;Dp$i?xLGRCQcSC(GH2tL#j8qgg_&wW(H&i z4wIE!ghQIgvk9)OM(t75&KPY*M1y$Itmzw+KriFXJc~8g>0v{v#AT`#3q>oHLuaMA z+If9KUPX{`Z3T(gWsg>~5^Kx#R13VE>dZX=txBh|=&6rG$uj%l#rY}#U&n-$* z9$!vQ=Lk^a<+Z$7-fITw!9s46o*RSlY4pAH0zI8t{c2ipBQ02q&(Z2_Xa;FFK^>B8 z=JZMIiG0eO(j=QPeI8eI`_d!o?MvQ`sa|t%Bl@R@(c=t15k&osy}F3i$wC$senJ7< z%Y1DtGZ(v&QiQbZ&T2A0Va$A={tUw?$Mck9M=r;%Tn-X{D@TBG$gkQ=hIqByNKJ(J zJX)z%1DGRs1X?|V`siqI0uMcK7(>8=50y0$wpkA#KQ`Xl-hp=}A*4MDpFP88ahDq2 z%>(>oK>ymM6!&BxVWCJbw(e|mN~>RiISII%)Y=^O6iOTN0^_Vq1m z?0RSfd_GJOjR^fA2~HS%dF>bQ3H{x|F3A`4M*?9%LS3R? z99WN4Vz8NS*}}UxM{Yec?V9=Lan=DC5H{v{5!x$|pF}>0r)WkVLEet+L97>f5cz#% ziY&uF$L=t8Z@fQk`z@=oqwFR2Dw|<{W`AW3jylI`$05fN z$2X1>4%Knmk#XF1OgkRup5~gk0d61nHunK{4c}4p-o`TEvU}_=+IQGdou&Ut2Yv$| C<*@ny diff --git a/db-mysql/mysql.lib b/db-mysql/mysql.lib index 49f942bf49d9c2b8c9423559c9634d6806427bcf..0a2a75b74851219e51820933bc0e170e45b72f8e 100644 GIT binary patch literal 3452 zcmcInTTc@~6#m*$dL?PZH=`*Allp?tyTp*9m`Esvl#=j(S!%n5#$K>3QJ(w*KJm!2 zzk&G3Gx5Phe*oc!h-Y?pc4u#;71(5UcFvhI-<&hwnVFq=RqfRdmclRM=4W9(pH1cR z`Bc&@pVyk%dH%H*1~3iy7lFVo5Ih0GJ8GGV0<46t)Dk@fl#-yDO5{u};S1_dC9=ed zB(1J*Zj>w1%G<3s<<-r~Mp8(#mpWnff=|hmurl zk+C|2RId)IQeT!o!cAWt_|e6gPBETw{3R%a&I6t>t;AX zY`1ANV)v2}}tyH<2RZH&d4-TBrxW>)0UHu~QKH|!#a}~5>b8^Ap zWQ0h$=m&NKz)29;A(lp`fU6L2N{mcUIipS&BwwPM2n-Lrn8XCah#-U@0`S|~KH}8a z>~x^vjVus&>J~^IL^r(KGeCh$>R!2G$^FRO`()xcjWms~(~0r7J$ z)iL5bdqTQX2~5W*b-+erPk`+G(Fg0zTCdyhHU{xT`FXs!T3S=pmNzArV#!7TWfZfI z(VG&IzH|^2YTfoBP1GNKkLzoW#`?2|&CCn#Zvjx|dcY-$XKa2xE=jXKB!J#0V@R0% z343V|8y(1LEmnC^qW6E~_Z=}LnSLoS#H%pmhcYiVJ7r#*pv4q1B8b z_p$P$tmtE!gX>8i*4Z&)UL|uGA!=$~{UHQ(eVwB=B(E|&P>h8vuf#{lt2CFhe!qA_ ztM4+pqeS!(;kuA;?09B!S~%nEX2-I!=wW-+GsU-{`NTKx>iW`QeAJXP>I|WJXpeNc ztlb8YZ^srtX9>}3MKqm72B`iuB3HBgf?~m>t1#_i7B6l0Asx-wK}W>Rq@APtlyE1U uah3D)eh~f6h|0-)3&bG|nzSMsXTAYAK416KyC~BPpc~r5iU> z=u^1x3A!@f_yD?a;RE;(-PCjLy~F*1Lg~*Wch1b2IrGh&^PQPH`@Gz#Y%d1p!_E?q zY00=2PirZsK4x~4sRgsO6##Gp@MZzuJ}`X*sE5YqKLGesL&oP{0kf@e> zWzntGKHx0%pv}%+OLW?wx=s^IJ7`g^*K3tttvbZaH8g13*y+|fJ<+H-;VkvUanY=} z%urymUSQt`98Cj<!`Y|cxYY6PhoW)+ zdq~~|(Sph?*P-TcC&+B#HMwy6ByxMTQR%e1?RqafS9}!C=L#$OsJpsJ3bte`!q!{7 z3!)|ITu{hV+O1vM^hx9%PERE!TXErCdLYl90rY)uOO1X?#_~!{isz65{W+SYVSR)v zv+(M`3$w?eeobR$@N@mXW zG2%QizE3+j^CbwlSTi>35(`glzB97!FCiEaAMU#mS*J;NF)umm?8TOKDXHgqe`Lp$ zSMTHV_;r@hN78a)-=>qMYs366z&V>&_*Q$YpHp={ZO+@-6-G>qtvwr#{gAK~x>Fq& hx^?|uE3U_lYrQX*$Cb~!%hwO+yk0kM{{eHu{s)P)R&oFU diff --git a/uffi/Makefile.msvc b/uffi/Makefile.msvc index 562c3dd..2edbfca 100644 --- a/uffi/Makefile.msvc +++ b/uffi/Makefile.msvc @@ -2,14 +2,14 @@ ########################################################################### # FILE IDENTIFICATION # -# Name: Makefile.msvc -# Purpose: Makefile for the CLSQL UFFI helper package (MSVC) -# Programer: Kevin M. Rosenberg -# Date Started: Mar 2002 +# Name: Makefile.msvc +# Purpose: Makefile for the CLSQL UFFI helper package (MSVC) +# Author: Kevin M. Rosenberg +# Created: Mar 2002 # # CVS Id: $Id: Makefile.msvc,v 1.1 2002/09/18 07:50:01 kevin Exp $ # -# This file, part of CLSQL, is Copyright (c) 2002 by Kevin M. Rosenberg +# This file, part of CLSQL, is Copyright (c) 2002-2004 by Kevin M. Rosenberg # # CLSQL users are granted the rights to distribute and use this software # as governed by the terms of the Lisp Lesser GNU Public License @@ -17,7 +17,7 @@ ########################################################################### -BASE=clsql-uffi +BASE=uffi # Nothing to configure beyond here @@ -30,6 +30,6 @@ $(DLL): $(SRC) del $(OBJ) $(BASE).exp clean: - del /q $(DLL) + del /q $(DLL) $(BASE).LIB diff --git a/uffi/uffi.dll b/uffi/uffi.dll index b9d7cfacb6258d6fd455ae67f5fdd020c9b4c217..1c412707ae4499d74be1b530210cb70ff7f16a5e 100644 GIT binary patch delta 1418 zcmb7EU1%It6h3z|$^LY*8S^7+5@geEv|<{jJE3jZgsi4pVr^<{AZ8_HyX;QcZMR8G zX3C1LS)D9)nIOgi(F#gPgou3*15ydfV1hx+Ln}T65$i)DE2*$PB}mBi+{rG)M=yMH z&iT%F&$;K$Fxlp;@7?V11Dk*Tqu5BX49|5^{LqRo7vDqs@faz7VA-zXZOaap;)ui)Aown{8>TZCB*9f=m~O4*^kS{6ii;Rck}ni(s@1acBhrg6;9B5=HJf z<3$A1yN!#sM)xg71rdxAmTubKC)_$NgXf0aXZ4Vy<|~Kxrpa~Jf={Pkf4>Ue0aMjXR2M+ww$R*+jV;N6x*&lb3Z6{df&=u zCm6+bRx&gB+W>9wVRNmOHG{BZ2EXIs8lO0WWZ`?PjZ8kYDbajpPgnWCj>>m-vu-uh zckt+eqEe~t+tibDKI8&x3QtvGh^h{H4|jEDrZ#J)b8N%|wy?ENDJD=jp zU69lEiRuolsjk777`u$hzz(Zkp+0pWTto^dtjK4u@}^Q(?&-49R!6OWkLsb#?M6NH zPTJL+S1w1CyuLYsHde=}p5$)lRQ2Y3n{a>lUzvF1gTF#Ryo zUpdg52YS`hQ2)-&CIm*Y^UEc*DB103Q^BjaeA`afsBW4k&b%K$wjk{nGciac=x9@uU~ zQ>n2Sz%oRl@oVa&61f^r-UPS+kx1|O_;74oIhRbK82*NcoQ}!kN+b~-ji=-Z37&xd z!J*zur%$%WQz^KPThNY;%ITy6cS)q=O&d=-Pv8%r{7KNL!M><4gxu@d9|zbcsRnf;b?Kh*!h~aZ$vQGvr?o7NJ7` delta 1237 zcma)5Z)g)|7=P}1X)b!HwUf0lHg3G*|lF(IM*)M{p*z`*Duxe zk6n8xm)2>ma;Uxh2ftzV;kUb?zMer#Xf5Lf;819GTA8FT9s(FZ@2GQ@*}~{fneF8y zfbMc=V{637jvKi5dlNoH1m`R>o3>9gNF@Y|;1MsaC_prlNf{~B!c>O0NGY# z^IVuiRmUmC+HbUghn62+e5+J7-*nSTRYP42*!}`dw|%7_3@>@??pQrk;&yqc8C!^x zHVKVZAgQs05FCRZ;=o|Ckf;T5VoaKf30SRa?ih?GY6~kE^n%uDGP`Kj11eO_rcg|< zCIv8FX%y$(;+Sm51nu~dV>sP?(kal9`{>BTY$lx|x;j0N?n*{jsNKeEvAz+UkavAh z#_ifQ6y{^k(f$db>NWqjvA4phs!I@zsE#)qo)y5P6RVSQBBMF#}c~JujGR zh!N&U8(`e(ZIRA)gc1_5?S*M#LK83S4f3v@k? z@spSPi`B2Y5uuHz6dPS@eS=kSR9 z49CCW{$8xHJ~wvEgoNt?zN-g<_<^w%OAwoN2*5xmKSUUx<4!l;9T;SX<|aJqgOg@F zJz^5(r2NR*LvDM9>GR{#cZ<3w_|fo}hTRB1a)L5HeuYA%utMSf07}%pKpyoEd+ZsUFq#X3cRc+3cK~w_V$I zb4gsOc3w$aCV*Z*I|q!*Kt$gr=oO;4yt-1Zh=s+q`Eqf!vQic`|M<}Ve9~w%Aw+52 z^X}W=G%^ZJDqq)2OJZTJGDnM=`v*c)+bw_6ff}D3y%R;>L*bumz@-u9vDp{qpg~6u zJqG!FSstBZ?Ur4Xc((5QL-{#$&Kaf%;0jfcGNm;`ypmUeHisn+g7`;L(i4SJ zYwaIU%-5Mw+}tRiyowtKsY9h+0D`dh6cQxKz6^ypY(oHUZQKZ9{3Ca=@z;SFsqvs= zgZh_}sT*y~Wa5wWX2Nx1ywL;R{0KtiKs)oM9!y1Dj5m3OGH<>qMUKpy|Hg->?C^UE z