Skip to content

Commit

Permalink
ACL 9.0 changes IN PROGRESS
Browse files Browse the repository at this point in the history
  • Loading branch information
dklayer committed Jun 26, 2012
1 parent 83a98b5 commit c16f79d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include Makefile.local
endif

ifndef LISPDIR
LISPDIR = /c/acl82.patched
LISPDIR = /c/acl90
endif

LISPEXE=$(LISPDIR)/mlisp
Expand All @@ -27,7 +27,7 @@ all: clean dists

GIT_REPO_BASE=$(shell dirname `git remote show origin | grep URL | awk '{print $$2}'`)

MODULES = .:master date:acl82 demoware:master
MODULES = .:acl90 date:acl90 demoware:master

prereqs: FORCE
@sh verify_modules.sh $(MODULES)
Expand Down
6 changes: 5 additions & 1 deletion configure/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@ include ../Makefile.local
endif

ifndef LISPDIR
LISPDIR = /c/acl82.patched
LISPDIR = /c/acl90
endif

ifeq ($(LISPDIR),/c/acl82.patched)
ALLEGRO=$(LISPDIR)/allegro
else
ALLEGRO=$(LISPDIR)/mlisp
endif

# Worst directory name ever
ifndef MT
Expand Down
16 changes: 14 additions & 2 deletions configure/buildit.cl
Original file line number Diff line number Diff line change
@@ -1,17 +1,29 @@

(in-package :cg-user)
(in-package :cl-user)

#+(version>= 9 0 :pre-final)
(eval-when (compile eval load) (require :ide))

(defun buildit ()
#+(version>= 9 0 :pre-final)
(setq *print-readably* nil)

(ide.project:build-project
(ide.project:load-project "configure.lpr")
:distribution-directory "configure/"
:replace-if-exists t
:increment-build-number nil)

#+(version= 8 2)
(dolist (p mp:*all-processes*)
(format t "; killing ~a...~%" p)
(when (not (eq mp:*current-process* p))
(mp:process-kill p)))
(exit))

(exit 0))

#+(version= 8 2)
(push 'buildit ide:*ide-startup-hook*)

#+(version>= 9 0 :pre-final)
(buildit)
2 changes: 1 addition & 1 deletion rpcgen.cl
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
(concatenate 'string out-base "-common.cl")
:direction :output
:if-exists :supersede)

#+mswindows (setf (eol-convention f) :dos)
(write-line *header* f)

(format f "(defpackage :~a~% (:use :lisp :excl :xdr)~% (:export~%"
Expand Down

0 comments on commit c16f79d

Please sign in to comment.