From 34a7f8e17a5b27d1b15b297f999e13a93900408b Mon Sep 17 00:00:00 2001 From: Frank Duncan Date: Tue, 19 Apr 2016 09:36:26 -0500 Subject: [PATCH] Add strictmath library --- .travis.yml | 4 +-- README.md | 2 ++ bin/all.lisp | 9 ++++-- bin/buildlinuxexec.sh | 4 ++- bin/buildosxexec.sh | 4 ++- bin/buildtravisexec.sh | 8 ++++-- bin/buildwindowsexec.sh | 4 ++- bin/travis.lisp | 8 ------ deps/common-lisp/ieee-floats-92e481a.tar.gz | Bin 0 -> 4904 bytes deps/common-lisp/strictmath_0.1.tar.gz | Bin 0 -> 6426 bytes src/main/clnl.asd | 29 ++++++++++---------- src/main/clnl.internal.asd | 21 -------------- src/main/nvm.lisp | 8 ++++-- src/test/clnl-test.asd | 7 +++-- src/test/clnl-test.internal.asd | 6 ---- 15 files changed, 52 insertions(+), 62 deletions(-) delete mode 100644 bin/travis.lisp create mode 100644 deps/common-lisp/ieee-floats-92e481a.tar.gz create mode 100644 deps/common-lisp/strictmath_0.1.tar.gz delete mode 100644 src/main/clnl.internal.asd delete mode 100644 src/test/clnl-test.internal.asd diff --git a/.travis.yml b/.travis.yml index 58afb74..39f79ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ addons: before_install: - export DISPLAY=:99.0 - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x24 - - wget http://frank.kank.net/travissbcl/clnl/076c72b/$(git rev-parse HEAD)/travissbcl + - wget http://frank.kank.net/travissbcl/clnl/213ed30/$(git rev-parse HEAD)/travissbcl - chmod +x travissbcl script: - - ./travissbcl --script bin/travis.lisp + - ./travissbcl --script bin/all.lisp diff --git a/README.md b/README.md index 910cfdf..c5b7d58 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ If you'd like to run it from source, you're going to need a few things: * mt19937 * nibbles * trivial-features + * strictmath + * ieee-floats [bin/nl](bin/nl) and [bin/run.lisp](bin/run.lisp) have been added for convenience to run the netlogo instance. It boots up the ncurses command line with an opengl view. Not very many commands are implemented, but it should alert you to that. A good test is diff --git a/bin/all.lisp b/bin/all.lisp index a790a20..029e6b7 100644 --- a/bin/all.lisp +++ b/bin/all.lisp @@ -1,5 +1,10 @@ -(when (not (find-package :clnl)) (asdf:load-system :clnl)) -(when (not (find-package :clnl-test)) (asdf:load-system :clnl-test)) +(setf *compile-print* nil) +(require 'asdf) +(asdf:initialize-source-registry `(:source-registry (:tree ,(car (directory "src"))) :INHERIT-CONFIGURATION)) +(asdf:load-system :clnl) +(asdf:load-system :clnl-test) +#-travis(asdf:load-system :style-checker) +#-travis(asdf:load-system :docgen) (format t "~%~c[1;33mRunning Tests~c[0m~%" #\Esc #\Esc) (when (not (clnl-test:run-all-tests)) diff --git a/bin/buildlinuxexec.sh b/bin/buildlinuxexec.sh index 06f0cd8..37c6d8a 100755 --- a/bin/buildlinuxexec.sh +++ b/bin/buildlinuxexec.sh @@ -24,7 +24,9 @@ mkdir -p tmp/deps/ tar zxf ../../deps/common-lisp/mt19937-latest.tar.gz && tar zxf ../../deps/common-lisp/nibbles-v0.12.tar.gz && tar zxf ../../deps/common-lisp/trivial-features_0.8.tar.gz && - tar zxf ../../deps/common-lisp/cl-charms-9bb94ef.tar.gz + tar zxf ../../deps/common-lisp/cl-charms-9bb94ef.tar.gz && + tar zxf ../../deps/common-lisp/ieee-floats-92e481a.tar.gz && + tar zxf ../../deps/common-lisp/strictmath_0.1.tar.gz ) SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core \ diff --git a/bin/buildosxexec.sh b/bin/buildosxexec.sh index e0465ee..963973e 100755 --- a/bin/buildosxexec.sh +++ b/bin/buildosxexec.sh @@ -28,7 +28,9 @@ mkdir -p tmp/deps/ tar zxf ../../deps/common-lisp/mt19937-latest.tar.gz && tar zxf ../../deps/common-lisp/nibbles-v0.12.tar.gz && tar zxf ../../deps/common-lisp/trivial-features_0.8.tar.gz && - tar zxf ../../deps/common-lisp/cl-charms-9bb94ef.tar.gz + tar zxf ../../deps/common-lisp/cl-charms-9bb94ef.tar.gz && + tar zxf ../../deps/common-lisp/ieee-floats-92e481a.tar.gz && + tar zxf ../../deps/common-lisp/strictmath_0.1.tar.gz ) SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core --no-sysinit --no-userinit \ diff --git a/bin/buildtravisexec.sh b/bin/buildtravisexec.sh index 7791491..28dfd60 100755 --- a/bin/buildtravisexec.sh +++ b/bin/buildtravisexec.sh @@ -26,7 +26,9 @@ mkdir -p tmp/deps/ tar zxf ../../deps/common-lisp/trivial-features_0.8.tar.gz && tar zxf ../../deps/common-lisp/cl-charms-9bb94ef.tar.gz && tar zxf ../../deps/common-lisp/style-checker_0.1.tar.gz && - tar zxf ../../deps/common-lisp/docgen_0.1.tar.gz + tar zxf ../../deps/common-lisp/docgen_0.1.tar.gz && + tar zxf ../../deps/common-lisp/ieee-floats-92e481a.tar.gz && + tar zxf ../../deps/common-lisp/strictmath_0.1.tar.gz ) SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core \ @@ -41,14 +43,16 @@ SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core \ --eval "(asdf:load-system :cl-charms)" \ --eval "(asdf:load-system :style-checker)" \ --eval "(asdf:load-system :docgen)" \ + --eval "(asdf:load-system :strictmath)" \ --eval "(asdf:clear-output-translations)" \ + --eval "(push :travis *features*)" \ --eval '(sb-ext:save-lisp-and-die "travissbcl" :executable t)' \ chmod +x travissbcl travisname=travissbcl-$(git rev-parse --short HEAD) mv travissbcl $travisname -echo "You should upload via the command: scp $travisname nami:/opt/travis/sbcls/clnl/" +echo "You should upload via the command: scp $travisname nami:/var/travis/sbcls/clnl/" echo "You should also set travisname in .travis.yml to $travisname" rm -rf tmp diff --git a/bin/buildwindowsexec.sh b/bin/buildwindowsexec.sh index b248488..45ffe76 100755 --- a/bin/buildwindowsexec.sh +++ b/bin/buildwindowsexec.sh @@ -35,7 +35,9 @@ mkdir -p tmp/deps/ tar zxf ../../deps/common-lisp/mt19937-latest.tar.gz && tar zxf ../../deps/common-lisp/nibbles-v0.12.tar.gz && tar zxf ../../deps/common-lisp/trivial-features_0.8.tar.gz && - tar zxf ../../deps/common-lisp/cl-charms-9bb94ef.tar.gz + tar zxf ../../deps/common-lisp/cl-charms-9bb94ef.tar.gz && + tar zxf ../../deps/common-lisp/ieee-floats-92e481a.tar.gz && + tar zxf ../../deps/common-lisp/strictmath_0.1.tar.gz ) cur_dir=$(cygpath -d $PWD) diff --git a/bin/travis.lisp b/bin/travis.lisp deleted file mode 100644 index a5dc59c..0000000 --- a/bin/travis.lisp +++ /dev/null @@ -1,8 +0,0 @@ -(setf *compile-print* nil) -(require 'asdf) -;(setf asdf:*central-registry* (list #p"deps/")) -(asdf:initialize-source-registry `(:source-registry (:tree ,(car (directory "src"))) :IGNORE-INHERITED-CONFIGURATION)) -(asdf:load-system :clnl.internal) -(asdf:load-system :clnl-test.internal) - -(load "bin/all.lisp") diff --git a/deps/common-lisp/ieee-floats-92e481a.tar.gz b/deps/common-lisp/ieee-floats-92e481a.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b16584c5ed0f5bcbf5cfb4ff1837a4a2efbd6689 GIT binary patch literal 4904 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 a3oW$JLJKXl&_W9j5C0FQ>M4EzcmM!=kaK4M literal 0 HcmV?d00001 diff --git a/deps/common-lisp/strictmath_0.1.tar.gz b/deps/common-lisp/strictmath_0.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..fc88c362af229e3ba1b394326d7953c52495a2c4 GIT binary patch literal 6426 zcmV+#8Rh05iwFQ>J{DI11MEC&ciPC3`RrfOJNa;hL0H{-Cw9&S0kb|k<78uJ?##)_ z&5@x2O+X@&h`}c(zkRE^B_V;Z9mmPe?7GK+MqO21{i;`&CQ0L9n9lul`d(|(qbJ{^ zXi#j^#BXYwTKPLKPbjlB)6i{duqPVTsYag=^Sf}fRhCKW$AmnY^7t~~`{8bD|C^Si zy8cNJwr4@Ic+fs@fi1(>xBj+nW$Vujn`*fJhG`j3i1wgd>?!}x*Ix-jb>R;`_!CZ^ zKHKbu#=&!PF%1$j4rZLdcj|xOAsNTfoGkn}CDEAlKLx2zyl6g;Lh=jjn)bnSK=Y!- zIu0h&lqg<%ym7kDHKj9-_YmBUoN3-B^ zE?~(y=h<(fOw)An?C9v~>Z%>`6rQ!Ccyc6Lj~Y3229-q1c*v7>%tz1>_I?!dD*!zL zK=?a4B>z;NHj?*vYKFvYQ{w7JntQ|ya(E;Fkm4aZxkr(hJ9DYyRGlwF@@p`Rqhy_= ze4ez(X*g_?&TK{ma6)39@c0uSwFMbTtH(d_S+syj@>3)Mi_s$fK4Osh>QZ%QI}q%JDIb_r;5r ztc+!C7$rpo9;vE|lR}~x29GtsKRxU9e}`}QS^YIG{RHUhFKq0bou9rx|KsfCtMk+I z5+_fCa5!6zI620H*q**9wT+_XC7eefuVmHZx2tzA8qZ5G<5>igDOgZseHSJ}22O6H zgUs%bLE-Sa)B6VQC9T~y@qFKCc92SZWo*?9@GH9#1HMB~z5coP`t()(HWJ4n+dn{Y zzQ8k~z*b&>_zU11t{br3#Z+(sTkNO2fDl6fKb|b-Jj}Xo6VeGMGoBDUP)IBo2XK6X zki`Bd@WZ4{s`HTV<_$yQ2Oh@}kPU|ZtVI(46VHzzUkg!>@Fg-aPnU5B1jIZ5g-`x$ z$&23L?{)v;&Fi!BPPoX&R~#1{lo$sdY)Mj{YxsNh^7Tchd-}`i#UHm!Co+#`hj{I~ zjg+rI#h~a)vcCTN&8hcauls`%HsAtc5|G6*=GEt8qUKLGLPTuhRYS_8*K&5m5XZ|9 zRv5%2jCEBOzaKb^c2=}MlTSr?|6VqtA|YF)-EMCa4#`_}5gZvU{CHPK2L@k92Oi&% zPQW?0P2+vc=kFIm#L85PEeU#YDM`iAGR?McHrii#I*oFfEy^z(v`)(t%X2|s^F=~U zh&_VJBoQsCACmGhK`u)~-m0%ofnn0buXk;jd0>H8Ps$24)S5QejGT~_`r#0U$I3*4 zeBcBKiLp!dH3JSq!1;hmjTmL-{{=s#1mj9YsD#`%+k&QW^$Gcp9b zF?qJNQNfIvkV}+;YdpyL7Hy#{gVii=4Fpx1>gm}4)*Iy7nSa(IS3x=jtV!t4lIPpN z03o&pTGc3Y;rH_rW1Zn}8T-R^nWu}_r$6I{l0q|)bl`W${TL1joWBswsLaqgP(~b% zxe#i&@yJi-r)T7Ma`FPi^!b}#E)EVluYZ2?Yya%x97Ji4{MPy9P5=Da!2uz^KO>!7 zL&jWKU!W$!i9BPdd`jAeTxJ~$zu>LbB5V=711hqcn@AyVxsF4s2L~mEDmX!&i}BWA zkl))s9S|7maE4M|kt!+cP!)=*(I^9?>jkegla&B~bALz_Wx5iu(I{)R4B4I)C4lx> zG(kxLpifu!SeAwWQic&UJbz9;uRfD6$3(~%L{^mJ6A~bTKISf?|1ps50hRSCUDPKTVsY6%M9QOuXK zG+4l7h?!F_0~ml3lC=iXv&19l09ELKRWTU~$5T^GM@V#l*J_6)s1aJ8NV)@v(qDF4 z0%JI&8%dUc^*Z1Z*{mG=Z~NPSwXzle$=CWpgFrXOf2e6$Ru=zbwq;`c$21K4G5+%- z%47WJ{_!6XNx%uYGxa+X-^7-9VS(=inDSW0y+a}o6J3%l+&{K-@6ggcBTE8vJFay9 zIh6kdiCwQrS+&-UVvaH&8toSV@Il-1Sa^x}lL#jTmD^kGU32}Gz7sew8yl~#AS-De zJO?Fz;iGj0RKWZINfyHDz|kP=Xc4rC?powO`3fd)5syleq&AD$F+R9)-%l)Qw&bDxTKs zT1=?-rz_Wlor!RU?rMgB>zmX{LX!LFG@eoguI=$N3;5z%J4XzJhQK^_QL(?`@%6hKt z$!h88!0Ol?QDp)kAEL(0L9Z);*an_?hNWll8&sVdwkc`rRVun+b=|CGLr}LJsLSex zw%+L)G^>hkHdJ~&$IQCg^lE6Z-z9Bh!+^nHQSxeq7entbCu`ZTWx!$YGQ0NvA zDS!wmtY#1L79>j&E*!jiTvozWByv+WG;$CfiGUu8NBbDi_Y#p`y0Co;=YHEgQxg#D zGw}D(F`S~WrhpQh9HMWUkt0u=VK5`KZQ7dcS~|0A-JlFar$KGr)ZpN?6&_Yx;L5%R zyIgvk!t=_grWskQt=Tr!G*h$S54JipT%B97D_kTv6!Xnv`m)mQq^J4 zf~2r5OS>c09cEe1ENjEDW0u7X#|Hg^)WPfED%(T0+tI1(bc7y&Qv}j7bNhoaQC?s` zK$G2I5K&RCr8_PsD0fr^ELb7nK7X9$A%U?B31qG;Xmnj~$~_F&XsAr0Xhe7zEhke6 zBjOdA=c_2--$GZ{`5xZ*#0vPx=o4e(T5D_oatI|eNbk>b#%ubn6b{nJYPK-(r!RW-tfH7I+i*QhI)BJG@(cHTb&97Jp^{ZE6&pI^s ztwVF~I&AZK(>kcM8eQ2hn&x~IEa!V<)6}1hvr}odwVJ|JZO^G3^aTK#FImYBd!`Qx z8KPStkZhZQ)nqzUcbK8;H<1N}By1b2=eeHa=oNwYC`KPtjBd#4HB>33mSvcxqur6} z4zqgBtkVXI0%J^Ixmu3nx~Ap2Hdn#!t0n8&T}O8XS(Aay;bkYXIA@BIrkkLnf0+~k zV+Br08ZX14kN3WCs16B$X1lUMaLX6MXdGrVNQfce{BevY5$PWifY=gXSCz+bMo~%- z3f7Id3Xrl2ylF71Q9?+mkcr@!Tx|sB$7L}5K!#HepJ7CXemLZ_nUB$8F~Vgy14o@G z=z}ZA80iJ}E3#AJv$SMVV-F$O2^Ej0}S}%Hom%Pyn{RUkZD-idmu5DRkG>l!vIn146B$yM(77aqi>llgg}bWU6e; z*XydWgQQmQ(nhB4LOQZ`d% zxErmpnJYn%Tm@i-4l#s4&>mexNfL-u47_J6h}F%g-q@nLJEeQ(RNp_RyOWx4l+08s ztdCe|y{n3maJ;eXcJ&|bbkXlxUcZzy_BLo((Uf}?rM#`%xzZX3s}R&@=p)bjUc4i~j9+t@O@wRer*I|}*d!C) zC~gOnGDEw!ig2J;X#57nJ!IMHhouYsFu!_i)GY_L!@owclz6cTnAhZlBtw6887eS} zRshR?3Aiv{qHbJet7=B30_(L{s)E@W&S^Xy#M_XTZ^w{1;E&y)&i9^xenw-D-JE-~Icg@8Y47>AT*`^S@a7F7kGB`Y!TZ zPT$?ec*ykKEPFSPdF_N7NNu)m76L6L?8=}nIMmad^L247S)3uywndR~L$dC)Hd*(s zxw_ILzHh#6O}1|CsqE(L?xx}@^v;R6^*OucG~66ezlGpqw(gH9TmIjN@9_foE&iXS z*?Ru|w`u7V{Xg4yeE<80lt=&XoBh8JkMDo~z5Ktj$EJ`~ivat51;P#e{_S|sx~ zg!}P@Xl>gu4T*RfE|#ebmitKp+FV>Uf)SbzOav+lKqd`&htPiK<|4&8KKGEZrn zoCo1hzL~9pxpYEQ=?;M@%;lX)6vDy*Ma(k}FmrhUr&6Zew9DQZYm)$TnvV(lx5{k1 z13Cs%ipz`#;HH%)La(Hm4ZCdRgG@lI|2Wagwz=NUy)vBC1?-kp0K!Smr4Jm;)?qY9 zF97Ch#3!)32-Shrs;>fu?Y4`2L#a46RIf+M*!lv4Xp(b!h+pVj!w>6lRmFjolCKnJ zk4n|gWv7$mE}0=dE%E6{Hl(LWq5ZR{sispVBb*~l8>CIi%sCUEy7)B2rwO0%W#JcT zd?t8pRHi}5>ejibDW9|Plt>xbvNhMZld>T;vGNaP^^eBkde1_9*}y7PT^+8D*beXj z?CVROVj8cXIa)2@`R`j?y*#tqUo}WEMjgnZa?YCKOP61U{4(+D+!DrV1vka}vpv1n zb(4+sL~I}>+d&HU5vyw$H_TmQ%N?w-mjPidMAtX^QDj{MlHEE7q78f$lrDHmg~Y*& zp6{N;b)KhMskCiXip~t(aQ2ey4m=YJ=30qjxH(ByBm?P1Va#w`!=lUpiuxWV9f}1L zqA1k{PRGhA>Ki6q$Dqt|9p*Zw?HaC5btGx*VUl$;Dze?F>rspL%$%fABtqGyX#*8o z!~ZnPwrs}*idH?7eb1)7KE88c+Fd&6+r6BknKQ}SrecvWrHM zhPBSG8jGt#%z6c+PXeDx{J4~rmBV2mLgv57-o&>!%pko50mLePB#+Md|EaR=|9_7Q z;9LBEn`w68{~Mz-8tK5xE6lt3@Aq=w>0R9S>>~9m+;`&}-S@m0*L?Me6G7ZFO^$IRt*rK%Z{%0okr3U?)7fp+47xKmM^ZtCB?ZA z@rW-ulA5{Td!rGul;Br~>sA%khsHSOQbb@vC2sVPgU(3&7=v{=vhYv96XG>}6|Bi& zC~_Ps`UaxU?MOpS1cV3=Wkp_qIMQV}6fEPlvQD&CtX>Ep2+Er>7wQExz7wp@QVhR;Gy8KtHit%mHJCm6upb!vEa8yEr z8Seky@h%7+L&+};r%Is^tNDfV%op>8Vkm{-;Lv^YaS3)z_P=02@~!PjS|%-dADdr# zi+g(fk)3(@KXXWymnp0QZi4pBAscz2PaZ5@vx&Y$Auqh~+ThC#Z>8-CzIb`?#c0z? z>_wxlrrTWA_PjPV=xoJayqqH2L`rn0D7Ha0*R&0HZ}6o%FfEUYcgx|En$)&)lABk? z4CjB^yT0Z$fgt|wr`RD6(KK3)|JawRXeXT{ooV_7D3IvXhzh1jK7DuZI6xGW&ZOp{ z>`XFpcN}*oyWIZV-=Z?pu{FmvY|GYMgV_WSnKeksq=dZ;nd#=!HVULffG>t_GTl`z zOV?GMkdpn>h~e1P?6JY~B&hDl)CLlK8JPvI&9O~e(>12ymcce0&2|YGb87~vvGJH^ zaTt0-W5`B^?9nP#lIf;v88lSeahQvJT4pV;Z|Du2$zaS=MT{LscRb@2;LD3p3-2J` zIGmkn_P;_}@J7$Dor7S@I>$}|R(vdQmY~2{f&ym=GMptS;VfIz6JQb=SyFP?nc~Fb zaAK#7u8?L5P(|&Tp$gBP9BWy3#L%B4D+r2NtxD1RAX(-)_eBJed@7sia&u{@Lv^ck zKO2G+U(3Q$1aAf&MI?+oZTeiD!D?%@q3z3=t{(RQOuRPlWM|$Dmh_HN&HtYt_WUG# zqiei?|EOrK^Y=gC5#@igEw#aajv;OQns58KTM^zr6gNN%`V0R)0_BDm!4;M%SojdF zISioS{X)l-$qF4+wC12p(6Rpo9$9YUu+h=yU-*wBH`LhQq|^8{4Jl_f8WhTB)o%AW z2&H5=mD1U=YG`V*dP0C|D`iw%Z3BWn>nqV&sI5Fy$2-N!eiE(8)5Yf;uJ$rogh>|{ zv3=6Tz2gIJO#2kGElhL5jj$IlPI0pu`ytF{KiB?x7Kz+m;)FLcnHBxdmiTQU;1~6u zv7G;-YJ~rqy4mReQAA|M+QonI2BthCq=)zMqD%J!c^v&@>WA@fYKq>^305b(IC@;h z>l6#pxGRH;t8KzK;4!X(Xs%qL%_x~0khfl|byF0Q$HtSdgBS?VKwx&i6zo7>k~O~i z5B_Na;!LtsfX-8roVQ3}1oSm6CqE}}E{m`wFluypeM#ULUNe}&b(CJlcQN)CZ_?!^ z6<#Lw!n+f$SkeQyNFkZVn|UaKOrTZpMZk2jnPq~%Tlf3GyBJ*GfH(fac?kpW z04V_*y^59~FkoV&V}E}`WY}dNl!jO)A;_6TtIh1epHsyB7AIkeMuWdk;~f96n`}g! zseo?TM=Aj3P~<->XFUI0IoCRNPiS2`m~-1lhaI_&6}MVsdJrt=Hsv=dJ^%X^M@@zo z2&jm=iJS@#U6GNnU_Kn^WH((=$P RESULT diff --git a/src/test/clnl-test.asd b/src/test/clnl-test.asd index d65a797..abb713d 100644 --- a/src/test/clnl-test.asd +++ b/src/test/clnl-test.asd @@ -1,7 +1,10 @@ -; For why this is the way it is, see src/main/clnl.asd (asdf:defsystem clnl-test :name "Experiment Tests" :maintainer "Frank Duncan (frank@kank.com)" :author "Frank Duncan (frank@kank.com)" :serial t - :depends-on (:ironclad :clnl clnl-test.internal)) + :components ((:file "package") + (:file "main") + (:file "simpletests") + (:file "viewtests")) + :depends-on (#-travis :ironclad :clnl)) diff --git a/src/test/clnl-test.internal.asd b/src/test/clnl-test.internal.asd deleted file mode 100644 index a20cf88..0000000 --- a/src/test/clnl-test.internal.asd +++ /dev/null @@ -1,6 +0,0 @@ -; For why this is the way it is, see src/main/clnl.asd -(asdf:defsystem clnl-test.internal - :components ((:file "package") - (:file "main") - (:file "simpletests") - (:file "viewtests"))) -- 2.25.1