Commit 1406f7d8 by Dave Cooper

Merge branch 'release/1592' of https://gitlab.common-lisp.net/gendl/gendl into release/1592

parents 80ec6846 3ecc4eba
......@@ -70,7 +70,7 @@ given as keyword args to this function)."
(remf args :show-redefinition-warnings? )
(with-compilation-unit ()
(let ((object (apply #'make-object 'codebase-directory-node :pathname pathname args)))
(unless (the-object object dry-run?)
(unless nil ;;(the-object object dry-run?)
(the-object object (compile-and-load :package-file-ht package-file-ht)))
(when (the-object object create-asd-file?)
(the-object object (write-asd-file))))))))
......
......@@ -447,7 +447,9 @@ the box should be facing. Defaults to <tt>*nominal-y-vector*</tt>."
;;
(curves-2d
(when (typep (the object) 'surf:curve)
(when (and (typep (the object) 'surf:curve)
(not (or (typep (the object) 'surf:arc-curve)
(typep (the object) 'surf:linear-curve))))
(let ((control-points (the object control-points))
(weights (the object weights))
(knot-vector (the object knot-vector))
......
......@@ -23,7 +23,7 @@
(defparameter *dxf-header*
(defparameter *dxf-header-new*
" 0
SECTION
2
......@@ -2547,8 +2547,10 @@ ENTITIES
")
(defparameter *dxf-header* *dxf-header-new*)
(defparameter *dxf-footer*
(defparameter *dxf-footer-new*
" 0
ENDSEC
0
......@@ -3860,11 +3862,10 @@ EOF
")
(defparameter *dxf-footer* *dxf-footer-new*)
#+nil ;; original - currently in 1590
(defparameter *dxf-header*
(defparameter *dxf-header-pre-1592*
" 0
SECTION
2
......@@ -3872,7 +3873,7 @@ HEADER
9
$ACADVER
1
AC1500
AC1009
9
$DWGCODEPAGE
3
......@@ -4052,15 +4053,30 @@ ENTITIES
")
#+nil ;; original - currently in 1590
(defparameter *dxf-footer*
(defparameter *dxf-footer-pre-1592*
" 0
ENDSEC
0
EOF
")
(define-format dxf (2d-output))
(defun legacy-dxf ()
(setq *dxf-header* *dxf-header-pre-1592*
*dxf-footer* *dxf-footer-pre-1592*)
(format t "Switched to legacy DXF header and footer.~%"))
(defun new-dxf ()
(setq *dxf-header* *dxf-header-new*
*dxf-footer* *dxf-footer-new*)
(format t "Switched to new DXF header and footer.~%"))
......@@ -100,7 +100,7 @@ Perhaps a zombie process is holding port ~a?~%" port port))
(ignore-errors
(glisp:with-timeout (2 (error "AllegroServe port probe timed out on port ~a.
Perhaps a zombie process is holding port ~a?~%" port port))
(net.aserve.client:do-http-request (format nil "http://localhost:~a" port))))
(net.aserve.client:do-http-request (format nil "http://127.0.0.1:~a" port))))
(declare (ignore result))
(when (typep error 'error)
port))
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment