Improve travis functionality

diff --git a/.travis.yml b/.travis.yml
index df93fc114a223ce123f95065be2f924da482c062..2c7ddeeefd7620fd5ffb6f712ae856a996fff4de 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 before_install:
-  - wget http://frank.kank.net/travissbcl/docgen/b9787e5/$(git rev-parse HEAD)/travissbcl
+  - wget http://frank.kank.net/travissbcl/docgen/768a78b/$(git rev-parse HEAD)/travissbcl
   - chmod +x travissbcl
 
 script:

diff --git a/bin/buildtravisexec.sh b/bin/buildtravisexec.sh
index e686a2242fda8e3dd52dda07fe20a3bc6dc2e41b..ad7b2da1c4785f1efd49e951a937816a989a62ff 100755 (executable)
--- a/bin/buildtravisexec.sh
+++ b/bin/buildtravisexec.sh
@@ -23,6 +23,7 @@ SBCL_HOME="" tmp/sbcl/bin/sbcl --core tmp/sbcl/lib/sbcl/sbcl.core --no-sysinit -
   --eval '(setf asdf:*central-registry* (list #p"tmp/deps/"))' \
   --eval "(asdf:load-system :cl-ppcre)" \
   --eval "(asdf:load-system :style-checker)" \
+  --eval "(push :travis *features*)" \
   --eval "(asdf:clear-output-translations)" \
   --eval '(sb-ext:save-lisp-and-die "travissbcl" :executable t)' \
 
@@ -30,7 +31,7 @@ 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/docgen/"
+echo "You should upload via the command: scp $travisname nami:/var/travis/sbcls/docgen/"
 echo "You should also set travisname in .travis.yml to $travisname"
 
 rm -rf tmp

diff --git a/bin/travis.lisp b/bin/travis.lisp
index 608bdca649fd31f32296d981b391d7dbd279ff30..454b3ada216d36f547309700d9ba3eb184d81d99 100644 (file)
--- a/bin/travis.lisp
+++ b/bin/travis.lisp
@@ -1,8 +1,9 @@
 (setf *compile-print* nil)
 (require 'asdf)
-(setf asdf:*central-registry* (list #p"deps/"))
-(asdf:load-system :docgen.internal)
-(asdf:load-system :docgen-test.internal)
+(asdf:initialize-source-registry `(:source-registry (:tree ,(car (directory "src"))) :INHERIT-CONFIGURATION))
+(asdf:load-system :docgen)
+(asdf:load-system :docgen-test)
+#-travis (asdf:load-system :style-checker)
 
 (format t "~%~c[1;33mRunning Tests~c[0m~%" #\Esc #\Esc)
 (when (not (docgen-test:run-all-tests))

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

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

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

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

diff --git a/src/main/docgen.asd b/src/main/docgen.asd
index 6927c03f69c9f57388043bbd82c5536eb45d446b..5e33b624268bc87872406790350ff2163212f844 100644 (file)
--- a/src/main/docgen.asd
+++ b/src/main/docgen.asd
@@ -1,19 +1,8 @@
-; 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 docgen.internal
- :serial t
- :components ((:file "package") (:file "func") (:file "pkg") (:file "struc") (:file "docgen")))
-
 (asdf:defsystem docgen
  :name "Documentation Generator"
  :version "0.1"
  :maintainer "Frank Duncan (frank@kank.com)"
  :author "Frank Duncan (frank@kank.com)"
  :serial t
- :depends-on (:cl-ppcre :docgen.internal))
+ :components ((:file "package") (:file "func") (:file "pkg") (:file "struc") (:file "docgen"))
+ :depends-on (#-travis :cl-ppcre)) ; Don't load libraries in travis

diff --git a/src/test/docgen-test.asd b/src/test/docgen-test.asd
index 4cbe4c7e5c8cbbadd56858cbd15ad5a05f2536c3..33c093032192553a40709563b4630f46c79746be 100644 (file)
--- a/src/test/docgen-test.asd
+++ b/src/test/docgen-test.asd
@@ -1,13 +1,8 @@
-; For why this is the way it is, see src/main/style-checker.asd
-(asdf:defsystem docgen-test.internal
-  :components ((:file "package")
-               (:file "main")
-               (:file "failures")))
-
 (asdf:defsystem docgen-test
-  :name "Document Generator Tests"
-  :version "0.0.1"
-  :maintainer "Frank Duncan (frank@kank.com)"
-  :author "Frank Duncan (frank@kank.com)"
-  :serial t
-  :depends-on (:docgen docgen-test.internal))
+ :name "Document Generator Tests"
+ :version "0.1"
+ :maintainer "Frank Duncan (frank@kank.com)"
+ :author "Frank Duncan (frank@kank.com)"
+ :serial t
+ :components ((:file "package") (:file "main") (:file "failures"))
+ :depends-on (:docgen))