X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?p=clnl;a=blobdiff_plain;f=bin%2Fbuildosxexec.sh;h=17657ee52a4eec61f49967d19d09e1efa58875b4;hp=1e073567f0497b23454f5a7683d24f7c0dc1c866;hb=e03d5beb202ab528c5e05e3dc4f9e316eda199d6;hpb=e4737223ae0336868aecd6af14ac09947655fde6

diff --git a/bin/buildosxexec.sh b/bin/buildosxexec.sh
index 1e07356..17657ee 100755
--- a/bin/buildosxexec.sh
+++ b/bin/buildosxexec.sh
@@ -8,8 +8,8 @@ mkdir -p tmp/sbcl-binary
 
 cwd=$PWD
 ( cd tmp &&
-  tar jxf ../deps/tarpit/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 &&
-  tar jxf ../deps/tarpit/sbcl-1.2.13-source.tar.bz2 &&
+  tar jxf ../deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 &&
+  tar jxf ../deps/osx/sbcl-1.2.13-source.tar.bz2 &&
   cd sbcl-1.2.11-x86-64-darwin/ &&
   SBCL_HOME="" INSTALL_ROOT=$cwd/tmp/sbcl-binary/ bash install.sh &&
   cd ../sbcl-1.2.13/ &&
@@ -19,38 +19,25 @@ cwd=$PWD
 mkdir -p tmp/deps/
 
 ( cd tmp/deps &&
-  tar zxf ../../deps/tarpit/3b-cl-opengl-993d627.tar.gz &&
-  tar zxf ../../deps/tarpit/alexandria-b1c6ee0.tar.gz &&
-  tar zxf ../../deps/tarpit/babel_0.5.0.tar.gz &&
-  tar zxf ../../deps/tarpit/cffi_0.15.0.tar.gz &&
-  tar zxf ../../deps/tarpit/cl-ppcre.tar.gz &&
-  tar zxf ../../deps/tarpit/ironclad.tar.gz &&
-  tar zxf ../../deps/tarpit/mt19937-latest.tar.gz &&
-  tar zxf ../../deps/tarpit/nibbles-v0.12.tar.gz &&
-  tar zxf ../../deps/tarpit/trivial-features_0.8.tar.gz &&
-  tar zxf ../../deps/tarpit/cl-charms-9bb94ef.tar.gz # &&
-  ln -s 3b-cl-opengl-993d627/cl-glut.asd . &&
-  ln -s 3b-cl-opengl-993d627/cl-opengl.asd . &&
-  ln -s alexandria-b1c6ee0/alexandria.asd . &&
-  ln -s babel_0.5.0/babel-streams.asd . &&
-  ln -s babel_0.5.0/babel.asd . &&
-  ln -s cffi_0.15.0/cffi-examples.asd . &&
-  ln -s cffi_0.15.0/cffi-grovel.asd . &&
-  ln -s cffi_0.15.0/cffi-libffi.asd . &&
-  ln -s cffi_0.15.0/cffi-uffi-compat.asd . &&
-  ln -s cffi_0.15.0/cffi.asd . &&
-  ln -s cl-charms/cl-charms.asd . &&
-  ln -s cl-ppcre-2.0.10/cl-ppcre.asd . &&
-  ln -s mt19937-1.1.1/mt19937.asd . &&
-  ln -s nibbles-0.12/nibbles.asd . &&
-  ln -s trivial-features_0.8/trivial-features.asd . &&
-  ln -s ../../src/main/clnl.asd .
+  tar zxf ../../deps/common-lisp/clnl-gltk_0.2.tar.gz &&
+  tar zxf ../../deps/common-lisp/3b-cl-opengl-993d627.tar.gz &&
+  tar zxf ../../deps/common-lisp/alexandria-b1c6ee0.tar.gz &&
+  tar zxf ../../deps/common-lisp/babel_0.5.0.tar.gz &&
+  tar zxf ../../deps/common-lisp/cffi_0.15.0.tar.gz &&
+  tar zxf ../../deps/common-lisp/cl-ppcre.tar.gz &&
+  tar zxf ../../deps/common-lisp/ironclad.tar.gz &&
+  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/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 \
   --eval "(require 'asdf)" \
-  --eval '(setf asdf:*central-registry* (list #p"tmp/deps/"))' \
+  --eval "(asdf:initialize-source-registry '(:source-registry (:tree \"${PWD}/tmp/deps\") (:tree \"${PWD}/src/main\") :IGNORE-INHERITED-CONFIGURATION))" \
   --eval "(asdf:load-system :clnl)" \
+  --eval "(asdf:load-system :clnl-extension-cli)" \
   --eval "(asdf:clear-output-translations)" \
   --eval '(sb-ext:save-lisp-and-die "osxsbcl" :executable t :toplevel (function clnl:run))' \