From 7e7aae4d5b9f8e53bf88c10996c29ff57f358c3b Mon Sep 17 00:00:00 2001
From: Frank Duncan <frank@kank.net>
Date: Mon, 18 Apr 2016 14:38:38 -0500
Subject: [PATCH] Improving travis functionality

---
 .travis.yml                          |  2 +-
 bin/buildtravisexec.sh               |  5 +++--
 bin/travis.lisp                      |  7 ++++---
 deps/style-checker-test.internal.asd |  1 -
 deps/style-checker.internal.asd      |  1 -
 src/main/style-checker.asd           | 16 ++--------------
 src/test/style-checker-test.asd      | 12 ++++--------
 7 files changed, 14 insertions(+), 30 deletions(-)
 delete mode 120000 deps/style-checker-test.internal.asd
 delete mode 120000 deps/style-checker.internal.asd

diff --git a/.travis.yml b/.travis.yml
index 368439f..5d8ce2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 before_install:
-  - wget http://frank.kank.net/travissbcl/style-checker/79f4f3d/$(git rev-parse HEAD)/travissbcl
+  - wget http://frank.kank.net/travissbcl/style-checker/ef117ac/$(git rev-parse HEAD)/travissbcl
   - chmod +x travissbcl
 
 script:
diff --git a/bin/buildtravisexec.sh b/bin/buildtravisexec.sh
index 6229432..84c870c 100755
--- a/bin/buildtravisexec.sh
+++ b/bin/buildtravisexec.sh
@@ -20,9 +20,10 @@ mkdir -p tmp/deps/
 
 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\") :IGNORE-INHERITED-CONFIGURATION))" \
   --eval "(asdf:load-system :cl-ppcre)" \
   --eval "(asdf:load-system :docgen)" \
+  --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/style-checker/"
+echo "You should upload via the command: scp $travisname nami:/var/travis/sbcls/style-checker/"
 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 17e87e1..d562ba3 100644
--- 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 :style-checker.internal)
-(asdf:load-system :style-checker-test.internal)
+(asdf:initialize-source-registry `(:source-registry (:tree ,(car (directory "src"))) :INHERIT-CONFIGURATION))
+(asdf:load-system :style-checker)
+(asdf:load-system :style-checker-test)
+#-travis (asdf:load-system :docgen)
 
 (format t "~%~c[1;33mRunning Tests~c[0m~%" #\Esc #\Esc)
 (when (not (style-checker-test:run-all-tests))
diff --git a/deps/style-checker-test.internal.asd b/deps/style-checker-test.internal.asd
deleted file mode 120000
index 17a3b85..0000000
--- a/deps/style-checker-test.internal.asd
+++ /dev/null
@@ -1 +0,0 @@
-../src/test/style-checker-test.asd
\ No newline at end of file
diff --git a/deps/style-checker.internal.asd b/deps/style-checker.internal.asd
deleted file mode 120000
index 531c337..0000000
--- a/deps/style-checker.internal.asd
+++ /dev/null
@@ -1 +0,0 @@
-../src/main/style-checker.asd
\ No newline at end of file
diff --git a/src/main/style-checker.asd b/src/main/style-checker.asd
index f5bc95d..29862ff 100644
--- a/src/main/style-checker.asd
+++ b/src/main/style-checker.asd
@@ -1,20 +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 style-checker.internal
- :serial t
- :components ((:file "package") (:file "syntax-checker")))
-
 (asdf:defsystem style-checker
  :name "Style Checker"
  :version "0.1"
  :maintainer "Frank Duncan (frank@kank.com)"
  :author "Frank Duncan (frank@kank.com)"
+ :components ((:file "package") (:file "syntax-checker"))
  :serial t
- :depends-on (:cl-ppcre :style-checker.internal))
+ :depends-on #-travis (:cl-ppcre) #+travis nil) ; We don't load up systems if in travis mode
diff --git a/src/test/style-checker-test.asd b/src/test/style-checker-test.asd
index 4b2cce3..02661cb 100644
--- a/src/test/style-checker-test.asd
+++ b/src/test/style-checker-test.asd
@@ -1,12 +1,8 @@
-; For why this is the way it is, see src/main/style-checker.asd
-(asdf:defsystem style-checker-test.internal
-  :components ((:file "package")
-               (:file "main")))
-
 (asdf:defsystem style-checker-test
-  :name "Experiment Tests"
-  :version "0.0.1"
+  :name "Style Checker Tests"
+  :version "0.1"
   :maintainer "Frank Duncan (frank@kank.com)"
   :author "Frank Duncan (frank@kank.com)"
   :serial t
-  :depends-on (:style-checker style-checker-test.internal))
+  :components ((:file "package") (:file "main"))
+  :depends-on (:style-checker))
-- 
2.25.1