X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-bsd-sockets%2Fsb-bsd-sockets.asd;h=eb49b66d299b4dcd35b0fef1b10044b0fc26fb89;hb=27763fafd1b170518ac2e85b9344fdddddcfd7c5;hp=7fb71ed91924b49edefeba2e9bf52bd1327fe61f;hpb=32c8edbd49ca77907154987e28e8d3f81f61dabc;p=sbcl.git

diff --git a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
index 7fb71ed..eb49b66 100644
--- a/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
+++ b/contrib/sb-bsd-sockets/sb-bsd-sockets.asd
@@ -1,116 +1,59 @@
 ;;; -*-  Lisp -*-
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (require :sb-grovel))
+          (require :sb-grovel))
 (defpackage #:sb-bsd-sockets-system (:use #:asdf #:sb-grovel #:cl))
 (in-package #:sb-bsd-sockets-system)
 
-;;; we also have a shared library with some .o files in it
-
-(defclass unix-dso (module) ())
-(defun unix-name (pathname)
-  (namestring 
-   (typecase pathname
-     (logical-pathname (translate-logical-pathname pathname))
-     (t pathname))))
-
-(defmethod asdf::input-files ((operation compile-op) (dso unix-dso))
-  (mapcar #'component-pathname (module-components dso)))
-
-(defmethod output-files ((operation compile-op) (dso unix-dso))
-  (let ((dir (component-pathname dso)))
-    (list
-     (make-pathname :type "so"
-		    :name (car (last (pathname-directory dir)))
-		    :directory (butlast (pathname-directory dir))
-		    :defaults dir))))
-
-
-(defmethod perform :after ((operation compile-op) (dso unix-dso))
-  (let ((dso-name (unix-name (car (output-files operation dso)))))
-    (unless (zerop
-	     (run-shell-command
-	      "gcc ~A -o ~S ~{~S ~}"
-	      (concatenate 'string
-			   (sb-ext:posix-getenv "EXTRA_LDFLAGS")
-			   " "
-			   #+sunos "-shared -lresolv -lsocket -lnsl"
-			   #+darwin "-bundle"
-			   #-(or darwin sunos) "-shared")
-	      dso-name
-	      (mapcar #'unix-name
-		      (mapcan (lambda (c)
-				(output-files operation c))
-			      (module-components dso)))))
-      (error 'operation-error :operation operation :component dso))))
-
-;;; if this goes into the standard asdf, it could reasonably be extended
-;;; to allow cflags to be set somehow
-(defmethod output-files ((op compile-op) (c c-source-file))
-  (list 
-   (make-pathname :type "o" :defaults
-		  (component-pathname c))))
-(defmethod perform ((op compile-op) (c c-source-file))
-  (unless
-      (= 0 (run-shell-command "gcc ~A -o ~S -c ~S"
-			      (concatenate 'string
-					   (sb-ext:posix-getenv "EXTRA_CFLAGS")
-					   " "
-					   "-fPIC")
-			      (unix-name (car (output-files op c)))
-			      (unix-name (component-pathname c))))
-    (error 'operation-error :operation op :component c)))
-
-(defmethod perform ((operation load-op) (c c-source-file))
-  t)
-  
-(defmethod perform ((o load-op) (c unix-dso))
-  (let ((co (make-instance 'compile-op)))
-    (let ((filename (car (output-files co c))))
-      #+cmu (ext:load-foreign filename)
-      #+sbcl (sb-alien:load-1-foreign filename))))
-
 (defsystem sb-bsd-sockets
     :version "0.58"
-    :depends-on (sb-grovel)
+    :depends-on (sb-grovel) 
     #+sb-building-contrib :pathname
     #+sb-building-contrib "SYS:CONTRIB;SB-BSD-SOCKETS;"
     :components ((:file "defpackage")
 		 (:file "split" :depends-on ("defpackage"))
-		 (:unix-dso "alien"
-			    :components ((:c-source-file "undefs")
-					 (:c-source-file "get-h-errno")))
-		 (:file "malloc" :depends-on ("defpackage"))
-		 (sb-grovel:grovel-constants-file
-		  "constants"
-		  :package :sockint
-		  :depends-on  ("defpackage"))
+                 #+win32
+		 (:file "win32-lib")
+		 #-win32 (sb-grovel:grovel-constants-file
+			  "constants"
+			  :package :sockint
+			  :depends-on  ("defpackage"))
+		 #+win32 (sb-grovel:grovel-constants-file
+			  "win32-constants"
+			  :package :sockint
+			  :depends-on  ("defpackage" "win32-lib"))
+                 #+win32 (:file "win32-sockets" 
+				:depends-on ("win32-constants"))
 		 (:file "sockets"
-			:depends-on ("constants"))
-		 
+                        :depends-on #-win32 ("constants") 
+                                    #+win32 ("win32-sockets"))
 		 (:file "sockopt" :depends-on ("sockets"))
-		 (:file "inet" :depends-on ("sockets" "split"  "constants" ))
-		 (:file "local" :depends-on ("sockets" "split" "constants" ))
-		 (:file "name-service" :depends-on ("sockets" "constants" "alien"))
-		 (:file "misc" :depends-on ("sockets" "constants"))
+                 (:file "inet" :depends-on ("sockets" "split"))
+                 (:file "local" :depends-on ("sockets" "split"))
+                 (:file "name-service" :depends-on ("sockets"))
+                 (:file "misc" :depends-on ("sockets"))
 
 		 (:static-file "NEWS")
 		 ;; (:static-file "INSTALL")
-		 (:static-file "README")
-		 (:static-file "index" :pathname "index.html")
+		 ;; (:static-file "README")
+		 ;; (:static-file "index" :pathname "index.html")
 		 (:static-file "doc" :pathname "doc.lisp")
 		 (:static-file "TODO")))
 
 (defmethod perform :after ((o load-op) (c (eql (find-system :sb-bsd-sockets))))
   (provide 'sb-bsd-sockets))
 
+#-win32
 (defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets))))
   (operate 'load-op 'sb-bsd-sockets-tests)
   (operate 'test-op 'sb-bsd-sockets-tests))
 
+#-win32
 (defsystem sb-bsd-sockets-tests
-  :depends-on (sb-rt sb-bsd-sockets sb-posix)
+  :depends-on (sb-rt sb-bsd-sockets #-win32 sb-posix)
   :components ((:file "tests")))
 
+#-win32
 (defmethod perform ((o test-op) (c (eql (find-system :sb-bsd-sockets-tests))))
   (or (funcall (intern "DO-TESTS" (find-package "SB-RT")))
       (error "test-op failed")))
+