diff --git a/git-to-snow-repo.scm b/git-to-snow-repo.scm index fbe5146..cf80601 100644 --- a/git-to-snow-repo.scm +++ b/git-to-snow-repo.scm @@ -96,15 +96,21 @@ ,(car (cdr (assq 'foreign-depends (cdr item)))))) '())) - (debug - (begin - ;(display "HERE: ") - ;(write (collect (cdr data) 'cond-expand)) - ;(newline) - 1 - - )) - (depends (map cdr (collect (cdr data) 'import)))) + (depends (map cdr (collect (cdr data) 'import))) + (cond-expands + (let ((raw (map cdr (collect (cdr data) 'cond-expand)))) + (if (null? raw) + '() + (map + (lambda (item) + (let ((depends (map cdr + (collect (cdr item) + 'import)))) + (list (car item) + (if (null? depends) + '(depends) + `(depends ,@(car depends)))))) + (car raw)))))) (set! result (append result (list (append `((name ,(list-ref data 1)) @@ -113,6 +119,9 @@ (if (null? depends) '() `((depends ,@(car depends)))) + (if (null? cond-expands) + '() + `((cond-expand ,@cond-expands))) ))))))))) lib) result)) @@ -163,7 +172,7 @@ (write data) (newline))) tags) - (rmdir-r dir)))))) + (rmdir-r dir)))))) data) (display ")") (newline)