X-Git-Url: https://code.consxy.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=bin%2Fcandle-server;h=5a1485939b7e6840efdb3e98bde2a764aa04bed1;hb=refs%2Fheads%2Fdevelopment;hp=4d00ac08c66f075bd1587deba8df61de6453ec03;hpb=45649dd09c4d8294cfab3277a1c46f6e6ee1df6c;p=candle

diff --git a/bin/candle-server b/bin/candle-server
index 4d00ac0..5a14859 100755
--- a/bin/candle-server
+++ b/bin/candle-server
@@ -3,40 +3,11 @@
 (setf *compile-print* nil)
 (require 'asdf)
 (asdf:initialize-source-registry
- `(:source-registry (:tree ,(car (directory "src"))) :INHERIT-CONFIGURATION))
-(asdf:load-system :candle)
-(asdf:load-system :opera)
+ `(:source-registry (:tree ,(car (directory "."))) :INHERIT-CONFIGURATION))
+(let
+ ((*error-output* (make-broadcast-stream)))
+ (asdf:load-system :candle))
 
-(defpackage #:candle-server-cli (:use #:common-lisp))
-(in-package #:candle-server-cli)
-
-(defvar *options*
- '((:name :help :short "h" :long "help" :description "Print this usage.")
-   (:name :port :short "p" :long "port" :takes-argument t :variable-name "PORT"
-    :description "Port on which to listen for commands.  Defaults to 25004")))
-
-(defun usage ()
- (format t "~A"
-  (opera:usage
-   "candle-server"
-   *options*
-   "Starts a candle continuous integration server.  Use 'candle' to interact with the server.")))
-
-(multiple-value-bind (options remaining-args error) (opera:process-arguments *options* (cdr sb-ext:*posix-argv*))
- (cond
-  ((opera:option-present :help options) (usage))
-  (remaining-args
-   (format *error-output* "Don't understand ~A.  See 'candle-server -h'~%" (car remaining-args))
-   (sb-ext:exit :code 1))
-  ((and (opera:option-present :port options) (not (parse-integer (opera:option-argument :port options) :junk-allowed t)))
-   (format *error-output* "--port requires a number.  See 'candle-server -h'~%"))
-  (t
-   (let
-    ((port (or (and
-                (opera:option-present :port options)
-                (parse-integer (opera:option-argument :port options) :junk-allowed t))
-            25004)))
-   (format t "Starting server on port ~A~%" port)
-   (candle:server port nil)))))
+(candle-server-cli:run)
 
 ; vim:ft=lisp