Get working on Windows 8

This involved a few changes to the other platforms to use asdf3's asd
finding facility rather than old school simlinks.

diff --git a/bin/buildosxexec.sh b/bin/buildosxexec.sh
index 1e073567f0497b23454f5a7683d24f7c0dc1c866..e0465ee4ab297cc402a20185d45cc28737fdfd74 100755 (executable)
--- a/bin/buildosxexec.sh
+++ b/bin/buildosxexec.sh
@@ -8,8 +8,8 @@ mkdir -p tmp/sbcl-binary
 
 cwd=$PWD
 ( cd tmp &&
 
 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/ &&
   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,37 +19,21 @@ cwd=$PWD
 mkdir -p tmp/deps/
 
 ( cd tmp/deps &&
 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/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/cl-charms-9bb94ef.tar.gz

 )
 
 SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core --no-sysinit --no-userinit \
   --eval "(require 'asdf)" \
 )
 
 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\") (:directory \"${PWD}/src/main\") :IGNORE-INHERITED-CONFIGURATION))" \

   --eval "(asdf:load-system :clnl)" \
   --eval "(asdf:clear-output-translations)" \
   --eval '(sb-ext:save-lisp-and-die "osxsbcl" :executable t :toplevel (function clnl:run))' \
   --eval "(asdf:load-system :clnl)" \
   --eval "(asdf:clear-output-translations)" \
   --eval '(sb-ext:save-lisp-and-die "osxsbcl" :executable t :toplevel (function clnl:run))' \

diff --git a/bin/buildtravisexec.sh b/bin/buildtravisexec.sh
index b06a9c52c8bbacfcdf02dce6b4df87926df4c8d2..7791491cf1c4e355a706e09eec55920353ae527b 100755 (executable)
--- a/bin/buildtravisexec.sh
+++ b/bin/buildtravisexec.sh
@@ -8,48 +8,31 @@ mkdir -p tmp/sbcl
 
 cwd=$PWD
 ( cd tmp &&
 
 cwd=$PWD
 ( cd tmp &&

-  tar jxf ../deps/tarpit/sbcl-1.2.6-x86-64-linux-binary.tar.bz2 &&
+  tar jxf ../deps/linux/sbcl-1.2.6-x86-64-linux-binary.tar.bz2 &&

   cd sbcl-1.2.6-x86-64-linux/ &&
   SBCL_HOME="" INSTALL_ROOT=$cwd/tmp/sbcl/ bash install.sh )
 
 mkdir -p tmp/deps/
 
 ( cd tmp/deps &&
   cd sbcl-1.2.6-x86-64-linux/ &&
   SBCL_HOME="" INSTALL_ROOT=$cwd/tmp/sbcl/ bash install.sh )
 
 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 &&
-  tar zxf ../../deps/tarpit/style-checker_0.1.tar.gz &&
-  tar zxf ../../deps/tarpit/docgen_0.1.tar.gz &&
-  ln -s cl-ppcre-2.0.10/cl-ppcre.asd . &&
-  ln -s ironclad_0.33.0/ironclad.asd . &&
-  ln -s mt19937-1.1.1/mt19937.asd . &&
-  ln -s nibbles-0.12/nibbles.asd . &&
-  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.asd . &&
-  ln -s cffi_0.15.0/cffi-libffi.asd . &&
-  ln -s cffi_0.15.0/cffi-grovel.asd . &&
-  ln -s cffi_0.15.0/cffi-uffi-compat.asd . &&
-  ln -s trivial-features_0.8/trivial-features.asd . &&
-  ln -s cl-charms/cl-charms.asd . &&
-  ln -s style-checker_0.1/style-checker.asd . &&
-  ln -s docgen_0.1/docgen.asd .
+  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/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

 )
 
 SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core \
   --eval "(require 'asdf)" \
 )
 
 SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core \
   --eval "(require 'asdf)" \

-  --eval '(setf asdf:*central-registry* (list #p"tmp/deps/"))' \
+  --eval "(asdf:initialize-source-registry '(:source-registry (:tree \"${PWD}/tmp/deps\") :IGNORE-INHERITED-CONFIGURATION))" \
+  --eval "(require 'asdf)" \

   --eval "(asdf:load-system :cl-ppcre)" \
   --eval "(asdf:load-system :mt19937)" \
   --eval "(asdf:load-system :ironclad)" \
   --eval "(asdf:load-system :cl-ppcre)" \
   --eval "(asdf:load-system :mt19937)" \
   --eval "(asdf:load-system :ironclad)" \

diff --git a/bin/buildwindowsexec.sh b/bin/buildwindowsexec.sh
new file mode 100755 (executable)
index 0000000..8976cef
--- /dev/null
+++ b/bin/buildwindowsexec.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# This sciprt builds a version of sbcl pre loaded with libraries that can run on windows.
+# You can use ./winsbcl.exe to run it
+
+# It is meant to be run from cygwin
+
+if ! type sbcl &> /dev/null ; then
+  echo "Please install sbcl.  A version has been included in deps/windows for your convenience"
+  exit 1
+fi
+
+sbcl_exec=$(which sbcl)
+sbcl_dir=${sbcl_exec%sbcl}
+
+if [ ! -e "$sbcl_dir/freeglut.dll" ] ; then
+  echo "Please copy deps/windows/freeglut.dll into $sbcl_dir"
+  exit 1
+fi
+
+if [ ! -e "$sbcl_dir/pdcurses.dll" ] ; then
+  echo "Please copy deps/windows/pdcurses.dll into $sbcl_dir"
+  exit 1
+fi
+
+mkdir -p tmp/deps/
+
+( cd tmp/deps &&
+  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/cl-charms-9bb94ef.tar.gz
+)
+
+cur_dir=$(cygpath -d $PWD)
+escaped_cur_dir=${cur_dir//\\/\\\\}
+
+sbcl --no-sysinit --no-userinit \
+  --eval "(require 'asdf)" \
+  --eval "(asdf:initialize-source-registry '(:source-registry (:tree \"${escaped_cur_dir}\\\\tmp\\\\deps\") (:directory \"${escaped_cur_dir}\\\\src\\\\main\") :IGNORE-INHERITED-CONFIGURATION))" \
+  --eval "(asdf:load-system :clnl)" \
+  --eval "(asdf:clear-output-translations)" \
+  --eval '(sb-ext:save-lisp-and-die "windowssbcl.exe" :executable t :toplevel (function clnl:run))'
+
+rm -rf tmp
+
+echo "Executable is windowssbcl.exe"

diff --git a/bin/run.lisp b/bin/run.lisp
index 481cbbec64fb32d6dfbb72c3e324163d0f50ea33..0cd8d8bc28d0d545fc804dbe91e5944a2a06eb6c 100644 (file)
--- a/bin/run.lisp
+++ b/bin/run.lisp
@@ -1,5 +1,4 @@
 (setf *compile-print* nil)
 (require 'asdf)
 (setf *compile-print* nil)
 (require 'asdf)

-(push #p"deps/" asdf:*central-registry*)

 (asdf:load-system :clnl)
 (clnl:run)
 (asdf:load-system :clnl)
 (clnl:run)

diff --git a/bin/travis.lisp b/bin/travis.lisp
index f17910bf6976ce76e66bfca749f6dad58455523b..a5dc59ce20819277cbc5ffc92c1f811a76b4436c 100644 (file)
--- a/bin/travis.lisp
+++ b/bin/travis.lisp
@@ -1,6 +1,7 @@
 (setf *compile-print* nil)
 (require 'asdf)
 (setf *compile-print* nil)
 (require 'asdf)

-(setf asdf:*central-registry* (list #p"deps/"))
+;(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)
 
 (asdf:load-system :clnl.internal)
 (asdf:load-system :clnl-test.internal)
 

diff --git a/deps/clnl-test.asd b/deps/clnl-test.asd
deleted file mode 120000 (symlink)
index 3c3cf0e..0000000
--- a/deps/clnl-test.asd
+++ /dev/null
@@ -1 +0,0 @@
-../src/test/clnl-test.asd
\ No newline at end of file

diff --git a/deps/clnl-test.internal.asd b/deps/clnl-test.internal.asd
deleted file mode 120000 (symlink)
index 3c3cf0e..0000000
--- a/deps/clnl-test.internal.asd
+++ /dev/null
@@ -1 +0,0 @@
-../src/test/clnl-test.asd
\ No newline at end of file

diff --git a/deps/clnl.asd b/deps/clnl.asd
deleted file mode 120000 (symlink)
index 2337742..0000000
--- a/deps/clnl.asd
+++ /dev/null
@@ -1 +0,0 @@
-../src/main/clnl.asd
\ No newline at end of file

diff --git a/deps/clnl.internal.asd b/deps/clnl.internal.asd
deleted file mode 120000 (symlink)
index 2337742..0000000
--- a/deps/clnl.internal.asd
+++ /dev/null
@@ -1 +0,0 @@
-../src/main/clnl.asd
\ No newline at end of file

diff --git a/deps/common-lisp/3b-cl-opengl-993d627.tar.gz b/deps/common-lisp/3b-cl-opengl-993d627.tar.gz
new file mode 100644 (file)
index 0000000..3a394a9
Binary files /dev/null and b/deps/common-lisp/3b-cl-opengl-993d627.tar.gz differ

diff --git a/deps/common-lisp/alexandria-b1c6ee0.tar.gz b/deps/common-lisp/alexandria-b1c6ee0.tar.gz
new file mode 100644 (file)
index 0000000..5db2c79
Binary files /dev/null and b/deps/common-lisp/alexandria-b1c6ee0.tar.gz differ

diff --git a/deps/common-lisp/babel_0.5.0.tar.gz b/deps/common-lisp/babel_0.5.0.tar.gz
new file mode 100644 (file)
index 0000000..370aaca
Binary files /dev/null and b/deps/common-lisp/babel_0.5.0.tar.gz differ

diff --git a/deps/common-lisp/cffi_0.15.0.tar.gz b/deps/common-lisp/cffi_0.15.0.tar.gz
new file mode 100644 (file)
index 0000000..2c84890
Binary files /dev/null and b/deps/common-lisp/cffi_0.15.0.tar.gz differ

diff --git a/deps/common-lisp/cl-charms-9bb94ef.tar.gz b/deps/common-lisp/cl-charms-9bb94ef.tar.gz
new file mode 100644 (file)
index 0000000..4134340
Binary files /dev/null and b/deps/common-lisp/cl-charms-9bb94ef.tar.gz differ

diff --git a/deps/common-lisp/cl-ppcre.tar.gz b/deps/common-lisp/cl-ppcre.tar.gz
new file mode 100644 (file)
index 0000000..67d6e15
Binary files /dev/null and b/deps/common-lisp/cl-ppcre.tar.gz differ

diff --git a/deps/common-lisp/docgen_0.1.tar.gz b/deps/common-lisp/docgen_0.1.tar.gz
new file mode 100644 (file)
index 0000000..9798899
Binary files /dev/null and b/deps/common-lisp/docgen_0.1.tar.gz differ

diff --git a/deps/common-lisp/ironclad.tar.gz b/deps/common-lisp/ironclad.tar.gz
new file mode 100644 (file)
index 0000000..2a1906a
Binary files /dev/null and b/deps/common-lisp/ironclad.tar.gz differ

diff --git a/deps/common-lisp/mt19937-latest.tar.gz b/deps/common-lisp/mt19937-latest.tar.gz
new file mode 100644 (file)
index 0000000..3f81ceb
Binary files /dev/null and b/deps/common-lisp/mt19937-latest.tar.gz differ

diff --git a/deps/common-lisp/nibbles-v0.12.tar.gz b/deps/common-lisp/nibbles-v0.12.tar.gz
new file mode 100644 (file)
index 0000000..515a802
Binary files /dev/null and b/deps/common-lisp/nibbles-v0.12.tar.gz differ

diff --git a/deps/common-lisp/style-checker_0.1.tar.gz b/deps/common-lisp/style-checker_0.1.tar.gz
new file mode 100644 (file)
index 0000000..568ed83
Binary files /dev/null and b/deps/common-lisp/style-checker_0.1.tar.gz differ

diff --git a/deps/common-lisp/trivial-features_0.8.tar.gz b/deps/common-lisp/trivial-features_0.8.tar.gz
new file mode 100644 (file)
index 0000000..39360bd
Binary files /dev/null and b/deps/common-lisp/trivial-features_0.8.tar.gz differ

diff --git a/deps/linux/sbcl-1.2.6-x86-64-linux-binary.tar.bz2 b/deps/linux/sbcl-1.2.6-x86-64-linux-binary.tar.bz2
new file mode 100644 (file)
index 0000000..9d09cb4
Binary files /dev/null and b/deps/linux/sbcl-1.2.6-x86-64-linux-binary.tar.bz2 differ

diff --git a/deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 b/deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2
new file mode 100644 (file)
index 0000000..8dccbee
Binary files /dev/null and b/deps/osx/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 differ

diff --git a/deps/osx/sbcl-1.2.13-source.tar.bz2 b/deps/osx/sbcl-1.2.13-source.tar.bz2
new file mode 100644 (file)
index 0000000..f6d6014
Binary files /dev/null and b/deps/osx/sbcl-1.2.13-source.tar.bz2 differ

diff --git a/deps/tarpit/3b-cl-opengl-993d627.tar.gz b/deps/tarpit/3b-cl-opengl-993d627.tar.gz
deleted file mode 100644 (file)
index 3a394a9..0000000
Binary files a/deps/tarpit/3b-cl-opengl-993d627.tar.gz and /dev/null differ

diff --git a/deps/tarpit/alexandria-b1c6ee0.tar.gz b/deps/tarpit/alexandria-b1c6ee0.tar.gz
deleted file mode 100644 (file)
index 5db2c79..0000000
Binary files a/deps/tarpit/alexandria-b1c6ee0.tar.gz and /dev/null differ

diff --git a/deps/tarpit/babel_0.5.0.tar.gz b/deps/tarpit/babel_0.5.0.tar.gz
deleted file mode 100644 (file)
index 370aaca..0000000
Binary files a/deps/tarpit/babel_0.5.0.tar.gz and /dev/null differ

diff --git a/deps/tarpit/cffi_0.15.0.tar.gz b/deps/tarpit/cffi_0.15.0.tar.gz
deleted file mode 100644 (file)
index 2c84890..0000000
Binary files a/deps/tarpit/cffi_0.15.0.tar.gz and /dev/null differ

diff --git a/deps/tarpit/cl-charms-9bb94ef.tar.gz b/deps/tarpit/cl-charms-9bb94ef.tar.gz
deleted file mode 100644 (file)
index 4134340..0000000
Binary files a/deps/tarpit/cl-charms-9bb94ef.tar.gz and /dev/null differ

diff --git a/deps/tarpit/cl-ppcre.tar.gz b/deps/tarpit/cl-ppcre.tar.gz
deleted file mode 100644 (file)
index 67d6e15..0000000
Binary files a/deps/tarpit/cl-ppcre.tar.gz and /dev/null differ

diff --git a/deps/tarpit/docgen_0.1.tar.gz b/deps/tarpit/docgen_0.1.tar.gz
deleted file mode 100644 (file)
index 9798899..0000000
Binary files a/deps/tarpit/docgen_0.1.tar.gz and /dev/null differ

diff --git a/deps/tarpit/ironclad.tar.gz b/deps/tarpit/ironclad.tar.gz
deleted file mode 100644 (file)
index 2a1906a..0000000
Binary files a/deps/tarpit/ironclad.tar.gz and /dev/null differ

diff --git a/deps/tarpit/mt19937-latest.tar.gz b/deps/tarpit/mt19937-latest.tar.gz
deleted file mode 100644 (file)
index 3f81ceb..0000000
Binary files a/deps/tarpit/mt19937-latest.tar.gz and /dev/null differ

diff --git a/deps/tarpit/nibbles-v0.12.tar.gz b/deps/tarpit/nibbles-v0.12.tar.gz
deleted file mode 100644 (file)
index 515a802..0000000
Binary files a/deps/tarpit/nibbles-v0.12.tar.gz and /dev/null differ

diff --git a/deps/tarpit/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 b/deps/tarpit/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2
deleted file mode 100644 (file)
index 8dccbee..0000000
Binary files a/deps/tarpit/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 and /dev/null differ

diff --git a/deps/tarpit/sbcl-1.2.13-source.tar.bz2 b/deps/tarpit/sbcl-1.2.13-source.tar.bz2
deleted file mode 100644 (file)
index f6d6014..0000000
Binary files a/deps/tarpit/sbcl-1.2.13-source.tar.bz2 and /dev/null differ

diff --git a/deps/tarpit/sbcl-1.2.6-x86-64-linux-binary.tar.bz2 b/deps/tarpit/sbcl-1.2.6-x86-64-linux-binary.tar.bz2
deleted file mode 100644 (file)
index 9d09cb4..0000000
Binary files a/deps/tarpit/sbcl-1.2.6-x86-64-linux-binary.tar.bz2 and /dev/null differ

diff --git a/deps/tarpit/style-checker_0.1.tar.gz b/deps/tarpit/style-checker_0.1.tar.gz
deleted file mode 100644 (file)
index 568ed83..0000000
Binary files a/deps/tarpit/style-checker_0.1.tar.gz and /dev/null differ

diff --git a/deps/tarpit/trivial-features_0.8.tar.gz b/deps/tarpit/trivial-features_0.8.tar.gz
deleted file mode 100644 (file)
index 39360bd..0000000
Binary files a/deps/tarpit/trivial-features_0.8.tar.gz and /dev/null differ

diff --git a/deps/windows/freeglut.dll b/deps/windows/freeglut.dll
new file mode 100755 (executable)
index 0000000..c768c15
Binary files /dev/null and b/deps/windows/freeglut.dll differ

diff --git a/deps/windows/pdcurses.dll b/deps/windows/pdcurses.dll
new file mode 100755 (executable)
index 0000000..550c7a2
Binary files /dev/null and b/deps/windows/pdcurses.dll differ

diff --git a/deps/windows/sbcl-1.2.14-x86-windows-binary.msi b/deps/windows/sbcl-1.2.14-x86-windows-binary.msi
new file mode 100755 (executable)
index 0000000..5e0e484
Binary files /dev/null and b/deps/windows/sbcl-1.2.14-x86-windows-binary.msi differ

diff --git a/src/main/cli.lisp b/src/main/cli.lisp
index dc3e3128ee3d87e26015819a3db8761be6367817..fe895e290ebf2bc735db8b4a253278bd612198d5 100644 (file)
--- a/src/main/cli.lisp
+++ b/src/main/cli.lisp
@@ -74,25 +74,31 @@ DESCRIPTION:
  (refresh-cli))
 
 (defun setup-info (num-tall num-wide)
  (refresh-cli))
 
 (defun setup-info (num-tall num-wide)

- (setf *info* (newwin 20 60 (floor (- num-tall 20) 2) (floor (- num-wide 60) 2)))
- (mvwprintw *info* 1 1
-  (format nil
-   "
-           .
-          / \\
-         /   \\     Welcome to CLNL version ~A!
-        /     \\
-       /_______\\
-
-     CLNL is an experiment at creating an alternate
-     implementation of NetLogo.
-
-     You can enter in various netlogo commands below,
-     or use q to quit the program.
-
-     See http://github.com/frankduncan/clnl for more
-     information about CLNL and to keep apprised of
-     any updates that may happen."
-   (asdf:component-version (asdf:find-system :clnl))))
- (box *info* 0 0)
- (wrefresh *info*))
+ (let*
+  ((info "
+       / \\
+      /   \\     Welcome to CLNL version ~A!
+     /     \\
+    /_______\\
+  
+  CLNL is an experiment at creating an alternate
+  implementation of NetLogo.
+  
+  You can enter in various netlogo commands below,
+  or use q to quit the program.
+  
+  See http://github.com/frankduncan/clnl for more
+  information about CLNL and to keep apprised of
+  any updates that may happen.")
+   (info-height (length (cl-ppcre:split "\\n" info)))
+   (info-width (apply #'max (mapcar #'length (cl-ppcre:split "\\n" info)))))
+  (setf *info* (newwin
+                (+ 3 info-height)
+                (+ 2 info-width)
+                (max 0 (floor (- num-tall info-height) 2))
+                (max 0 (floor (- num-wide info-width) 2))))
+  (mvwprintw *info* 1 0
+   (format nil info
+    (asdf:component-version (asdf:find-system :clnl))))
+  (box *info* 0 0)
+  (wrefresh *info*)))

diff --git a/src/main/clnl.asd b/src/main/clnl.asd
index 096427b12de5644d4e094781de28e7892e3db911..3e7dbe1369769acfa1954f18618d56d0502ac99c 100644 (file)
--- a/src/main/clnl.asd
+++ b/src/main/clnl.asd
@@ -7,18 +7,6 @@
 ;
 ; There's probably a better way, but I don't know it
 
 ;
 ; There's probably a better way, but I don't know it
 

-(asdf:defsystem clnl.internal
-  :serial t
-  :components ((:file "package")
-               (:file "lex")
-               (:file "parse")
-               (:file "nvm")
-               (:file "transpile")
-               (:file "random")
-               (:file "interface")
-               (:file "cli")
-               (:file "main")))
-

 (asdf:defsystem clnl
   :name "Experiment"
   :version "0.0.1"
 (asdf:defsystem clnl
   :name "Experiment"
   :version "0.0.1"

diff --git a/src/main/clnl.internal.asd b/src/main/clnl.internal.asd
new file mode 100644 (file)
index 0000000..84828c0
--- /dev/null
+++ b/src/main/clnl.internal.asd
@@ -0,0 +1,20 @@
+; The systems are split up into two because travis will run more smoothly
+; if we use a custom built sbcl that has all the deps pre-loaded since
+; we are sure those will work just fine :)
+;
+; You should link to this file in your systems directory, or however you
+; handle your asdf configurations.  Then just (asdf:load-system :clnl)
+;
+; There's probably a better way, but I don't know it
+
+(asdf:defsystem clnl.internal
+  :serial t
+  :components ((:file "package")
+               (:file "lex")
+               (:file "parse")
+               (:file "nvm")
+               (:file "transpile")
+               (:file "random")
+               (:file "interface")
+               (:file "cli")
+               (:file "main")))

diff --git a/src/test/clnl-test.asd b/src/test/clnl-test.asd
index 15721ddfb9e6023f233486f31db504c8fe47feb5..6947ccc0de0eebd56911fd287a22a7c6c20b5b21 100644 (file)
--- a/src/test/clnl-test.asd
+++ b/src/test/clnl-test.asd
@@ -1,10 +1,4 @@
 ; For why this is the way it is, see src/main/clnl.asd
 ; 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")))
-

 (asdf:defsystem clnl-test
   :name "Experiment Tests"
   :version "0.0.1"
 (asdf:defsystem clnl-test
   :name "Experiment Tests"
   :version "0.0.1"

diff --git a/src/test/clnl-test.internal.asd b/src/test/clnl-test.internal.asd
new file mode 100644 (file)
index 0000000..a20cf88
--- /dev/null
+++ b/src/test/clnl-test.internal.asd
@@ -0,0 +1,6 @@
+; 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")))