code: split up pkg-file logic

Author: jcs090218

lisp/_prepare.el

@@ -582,12 +582,13 @@ Eask file in the workspace."
     (shmelpa      . "https://shmelpa.commandlinesystems.com/packages/"))
   "Mapping of source name and url.")
 
-(defvar eask-package        nil)
-(defvar eask-package-file   nil)
-(defvar eask-package-desc   nil)
-(defvar eask-files          nil)
-(defvar eask-depends-on     nil)
-(defvar eask-depends-on-dev nil)
+(defvar eask-package          nil)
+(defvar eask-package-file     nil)
+(defvar eask-package-desc     nil)
+(defvar eask-files            nil)
+(defvar eask-depends-on-emacs nil)
+(defvar eask-depends-on       nil)
+(defvar eask-depends-on-dev   nil)
 
 (defun eask-package--get (key)
   "Return package info by KEY."
@@ -644,9 +645,11 @@ Eask file in the workspace."
   "Specify a dependency of this package."
   (cond
    ((string= pkg "emacs")
-    (let ((minimum-version (car args)))
-      (when (version< emacs-version minimum-version)
-        (eask-error "This requires Emacs %s and above!" minimum-version)))
+    (let* ((minimum-version (car args))
+           (recipe (list pkg minimum-version)))
+      (if (version< emacs-version minimum-version)
+          (eask-error "This requires Emacs %s and above!" minimum-version)
+        (push recipe eask-depends-on-emacs)))
     pkg)
    ;; No argument specify
    ((<= (length args) 1)

lisp/core/pkg-file.el

@@ -14,17 +14,35 @@
        (file-name-directory (nth 1 (member "-scriptload" command-line-args))))
       nil t)
 
+(defvar eask--pkg-filename)
+
+(defun eask--generate-from-pkg-desc ()
+  "Generate pkg-file from a package-descriptor."
+  (let* ((name (package-desc-name eask-package-desc))
+         (pkg-file (expand-file-name (format "%s-pkg.el" name))))
+    (setq eask--pkg-filename pkg-file)
+    (package-generate-description-file eask-package-desc pkg-file)))
+
+(defun eask--generate-from-eask-file ()
+  "Generate pkg-file from Eask file."
+  (let* ((name (eask-guess-package-name))
+         (pkg-file (expand-file-name (concat name "-pkg.el")))
+         (version (eask-package-version))
+         (description (eask-package-description))
+         (reqs (mapcar (lambda (elm)
+                         (list (if (stringp (car elm)) (intern (car elm)) (car elm))
+                               (if (= (length (cdr elm)) 1)
+                                   (nth 0 (cdr elm))
+                                 "latest")))
+                       (append eask-depends-on-emacs eask-depends-on))))
+    (setq eask--pkg-filename pkg-file)
+    (write-region
+     (pp-to-string `(define-package ,name ,version ,description ',reqs))
+     nil pkg-file)))
+
 (eask-start
-  (let ((pkg-file (expand-file-name (concat name "-pkg.el"))))
-    (if eask-package-desc
-        (package-generate-description-file eask-package-desc pkg-file))
-    (let* ((name (eask-guess-package-name))
-           (version (eask-package-version))
-           (description (eask-package-description))
-           (reqs (package-desc-reqs eask-package-desc)))
-      (write-region
-       (pp-to-string `(define-package ,name ,version ,description ',reqs))
-       nil pkg-file)))
-  (eask-info "(Generated pkg-file -> %s)" pkg-file))
+  (if eask-package-desc (eask--generate-from-pkg-desc)
+    (eask--generate-from-eask-file))
+  (eask-info "(Generated pkg-file -> %s)" eask--pkg-filename))
 
 ;;; pkg-file.el ends here