Commits

adrian  committed e8629b1

packages: Handle _DIR vars of xemacs.mak generically in build package

-------------------- ChangeLog entries follow: --------------------

xemacs-packages/build/ChangeLog addition:

2002-07-04 Adrian Aichner <adrian@xemacs.org>

* build.el (build-make-target-doc-paragraph): Update docstring.
* build.el (build-make-target-paragraph): Ditto.
* build.el (build-settings): Ditto.
* build.el (build-make-macro-paragraph): Match ..._DIR variable
definitions inside comments in xemacs.mak to handle them
generically.
* build.el (build-make-customize): Remove special ..._DIR variable
handling cruft.

  • Participants
  • Parent commits 537bb3f

Comments (0)

Files changed (2)

+2002-07-04  Adrian Aichner  <adrian@xemacs.org>
+
+	* build.el (build-make-target-doc-paragraph): Update docstring.
+	* build.el (build-make-target-paragraph): Ditto.
+	* build.el (build-settings): Ditto.
+	* build.el (build-make-macro-paragraph): Match ..._DIR variable
+	definitions inside comments in xemacs.mak to handle them
+	generically.
+	* build.el (build-make-customize): Remove special ..._DIR variable
+	handling cruft.
+
 2002-07-03  Adrian Aichner  <adrian@xemacs.org>
 
 	* build.el (build-with-MS-has-config-inc): New.
 	`widget-insert' arguments to \n and \t to avoid inadvertent
 	reformatting.
 	* build.el (build-from-tarballs): Ditto.
-	* build.el (build):
+	* build.el (build): Ditto.
 	* build.el (build-with-GNU): Ditto.
 	* build.el (build-build-report): Ditto.
 	* build.el (build-with-MS): Ditto.  Set
   "^##\\s-*make\\s-+\\([^
  	]+\\(\\s-+or\\s-+make\\s-+\\([^
  	]+\\)\\)*\\)\\(\\s-*\\(\\(.*\\)\\(\n##\\s-\\{3,\\}.+\\)*\\)\\)$"
-  "REGEXP matching a XEmacs makefile target comment.  These comments
+  "Internal REGEXP matching a XEmacs makefile target comment.  These comments
 don't exist in `xemacs.mak'")
 
 (defconst build-make-target-paragraph
   "\\(^#.+
 \\)?\\(\\(\\w\\|_\\)+\\)\\s-*:.*"
-  "REGEXP matching a XEmacs makefile target name.")
+  "Internal REGEXP matching a XEmacs makefile target name.")
 
 (defconst build-make-macro-paragraph
-  "^\\(\\(\\w\\|_\\)+\\)\\s-*=\\s-*\\(\\(.*\\\\
+  "^\\(?:!message Please specify root directory for your .* installation: \\)?\\(\\(\\w\\|_\\)+\\)\\s-*=\\s-*\\(\\(.*\\\\
 \\)*.+\\)$"
-;;;  makefile-macroassign-regex
-  "REGEXP matching a XEmacs makefile macro definition.")
+  "Internal REGEXP matching a XEmacs makefile macro definition.")
 
 (defconst build-make-prolog
   "
 
 (defun build-make-customize (a-list)
   (princ build-make-prolog)
-  (cond
-   ((string-equal build-with-what
-                  "GNU Tools")
-    nil)
-   ((string-equal build-with-what
-                  "Microsoft Tools")
-    (mapcar
-     (lambda (macro)
-       (build-make-file (first macro) (second macro))
-       )
-     (list
-      (list "COMPFACE_DIR" "")
-      (list "GTK_DIR" "")
-      (list "JPEG_DIR" "")
-      (list "PNG_DIR" "")
-      (list "TIFF_DIR" "")
-      (list "XPM_DIR" "")
-      (list "ZLIB_DIR" "")))))
   (mapcar
    (lambda (macro)
-     (build-make-string (first macro) (second macro))
-     )
+     (if (string-match "_DIR\\'" (first macro))
+         (build-make-file (first macro) (second macro))
+       (build-make-string (first macro) (second macro))))
    (rest (assoc 'macros a-list))))
 
 (defun build-make-string (name val)
   (princ "  :set 'build-make-set-value)\n")
   (princ "\n"))
 
-(defvar build-settings ""
-  "Internal variable storing alist of named settings for building multiple XEmacs configurations.")
+(defvar build-settings
+  ""
+  "Internal variable storing alist of named settings for building
+multiple XEmacs configurations.")
 
 ;;}}}