Commits

aichnerad  committed 9423411

Safety checkpoint.

  • Participants
  • Parent commits 2293f60
  • Tags r1-61

Comments (0)

Files changed (2)

 # For the time being, remove MULE_ELCS from the all dependencies if
 # building without Mule.
 
-VERSION = 1.60
+VERSION = 1.61
 AUTHOR_VERSION = $Name$
 MAINTAINER = Adrian Aichner <adrian@xemacs.org>
 PACKAGE = build
   (if dir
       (cd dir))
   (let ((cmd
-         (format "sh configure%s"
+         (format "echo sh configure%s"
                  (mapconcat
                   (function (lambda (e)
                               (cond
               ((string-equal build-from-what "Tarballs")
                (concat build-tarball-prefix "-configure.err"))
               ((string-equal build-from-what "CVS")
-               (concat build-cvs-xemacs-module "-configure.err")))
+               (concat build-cvs-checkout-dir "-configure.err")))
              ))))
     (compile cmd)))
 
   (cond
    ((string-match "-\\(d\\|N\\)\\b" val)
     (customize-set-value sym build-cvs-checkout-options)
-    (warn "cannot use -d and -N, use `build-cvs-checkout-dir' and `build-cvs-checkout-shorten-path' respectively."))
+    (warn "cannot use -d and -N.  `build-cvs-checkout-dir' will be used as -d argument if set.  The -N option is unsupported."))
    (t
     (set-default sym val))))
 
   :group 'build-cvs)
 
 (defcustom build-cvs-options
-  "-z9"
+  "-z3"
   "CVS command-line options to use for all CVS commands."
   :type 'string
   :group 'build-cvs)
   :type 'string
   :group 'build-cvs)
 
-;(defcustom build-cvs-working-dir
-;  "/export/home/tmp/"
-;  "The working directory on the local host to which the
-;`build-cvs-xemacs-module' will be checked out. Be aware that cvs
-;checkout options -d and -N will affect the resulting directory
-;structure.  This variable needs to point to the top-level directory of
-;the XEmacs sources after cvs checkout."
-;  :type 'directory
-;  :group 'build-cvs)
+(defcustom build-cvs-checkout-parent-dir
+  "/export/home/tmp/"
+  "The parent directory on the local host into which the
+`build-cvs-xemacs-module' will be checked out, named according to
+`build-cvs-checkout-dir'."
+  :type 'directory
+  :group 'build-cvs)
 
 (defcustom build-cvs-checkout-dir
-  "/export/home/tmp/"
-  "The directory on the local host below which the
+  build-cvs-xemacs-module
+  "The directory on the local host into which the
 `build-cvs-xemacs-module' will be checked out. Be aware that cvs
 checkout options -d and -N will affect the resulting directory
 structure.  Therefor these options are disallowed in
-`build-cvs-checkout-options'.  Please set `build-cvs-checkout-dir' and
-`build-cvs-checkout-shorten-path' respectively instead of using
-checkout options -d and -N."
+`build-cvs-checkout-options'.  Please set `build-cvs-checkout-dir' if
+you want to name the working direcory different from the default
+`build-cvs-xemacs-module'.  The -N option is not supported, in order
+to avoid unknown directory structures."
   :type 'directory
   :group 'build-cvs)
 
 (defcustom build-cvs-xemacs-module
-  "xemacs-20"
+  "xemacs"
   "CVS XEmacs module name to be checked out."
   :type 'string
   :group 'build-cvs)
 
 (defcustom build-cvs-xemacs-release
-  "r20-5b33"
-  "CVS XEmacs release to be checked out."
+  "release-21-2"
+  "CVS XEmacs release to be checked out, if not checking out the
+latest sources on the trunk."
   :type 'string
   :group 'build-cvs)
 
 (defun build-cvs-login ()
   "Login to XEmacs CVS repository."
   (interactive)
-  (unless (file-exists-p build-cvs-working-dir)
-    (make-directory build-cvs-working-dir t))
-  (cd build-cvs-working-dir)
+  (unless (file-exists-p build-cvs-checkout-parent-dir)
+    (make-directory build-cvs-checkout-parent-dir t))
+  (cd build-cvs-checkout-parent-dir)
   (let ((cmd
-         (format "cvs %s -d%s login" build-cvs-options
+         (format "echo cvs %s -d%s login" build-cvs-options
                  build-cvs-xemacs-repository))
         (compilation-mode-hook
          'build-compilation-mode-hook)
         (compilation-buffer-name-function
          '(lambda (mode)
             (generate-new-buffer-name
-             (concat build-cvs-xemacs-module "-cvs-login.err")))))
+             (concat build-cvs-checkout-dir "-cvs-login.err")))))
     (add-hook 'comint-mode-hook
               (function
                (lambda ()
 (defun build-cvs-checkout (&optional release-tag)
   "Fetch XEmacs from the repository."
   (interactive "sXEmacs Release Tag: ")
-  (unless (file-exists-p build-cvs-working-dir)
-    (make-directory build-cvs-working-dir t))
-  (cd build-cvs-working-dir)
+  (unless (file-exists-p build-cvs-checkout-parent-dir)
+    (make-directory build-cvs-checkout-parent-dir t))
+  (cd build-cvs-checkout-parent-dir)
   (let ((cmd
-         (format "cvs %s -d%s checkout %s%s %s" build-cvs-options
+         (format "echo cvs %s -d%s checkout %s -d %s%s %s"
+                 build-cvs-options
                  build-cvs-xemacs-repository
                  build-cvs-checkout-options
+                 build-cvs-checkout-dir
                  (if (and release-tag
                           (not (string-equal release-tag "")))
                      (concat " -r " release-tag)
         (compilation-buffer-name-function
          '(lambda (mode)
             (generate-new-buffer-name
-             (format "%s-cvs-checkout%s.err" build-cvs-xemacs-module
+             (format "%s-cvs-checkout%s.err" build-cvs-checkout-dir
                      (if (and release-tag
                               (not (string-equal release-tag "")))
                          (format "-%s" release-tag)
 specified by RELEASE-TAG'."
   (interactive "sXEmacs Release Tag: ")
   (cd
-   (expand-file-name build-cvs-xemacs-module
-                     build-cvs-working-dir))
+   (expand-file-name build-cvs-checkout-dir
+                     build-cvs-checkout-parent-dir))
   (let ((cmd
-         (format "cvs %s update %s%s"
+         (format "echo cvs %s update %s%s"
                  build-cvs-options
                  build-cvs-update-options
                  (if (and release-tag
         (compilation-buffer-name-function
          '(lambda (mode)
             (generate-new-buffer-name
-             (concat build-cvs-xemacs-module "-cvs-update"
+             (concat build-cvs-checkout-dir "-cvs-update"
                      (when (and release-tag
                                 (not (string-equal release-tag "")))
                        (format "-%s" release-tag))
                               ((string-equal build-with-what "GNU Tools")
                                (build-with-GNU
                                 (expand-file-name
-                                 build-cvs-xemacs-module
+                                 build-cvs-checkout-dir
                                  build-cvs-working-dir)))
                               ((string-equal build-with-what "Microsoft Tools")
                                (build-with-MS
                                 (expand-file-name
                                  "nt"
                                  (expand-file-name
-                                  build-cvs-xemacs-module
+                                  build-cvs-checkout-dir
                                   build-cvs-working-dir))))))
                    (format "Build XEmacs With %s Now ..." build-with-what))
     (use-local-map widget-keymap)
 (defun build-tarball-extract (file)
   (cd build-tarball-dest)
   (let ((cmd
-         (format "gunzip -c %s%s | tar -xvf -" build-tarball-prefix file))
+         (format "echo gunzip -c %s%s | tar -xvf -" build-tarball-prefix file))
         (compilation-mode-hook
          'build-compilation-mode-hook)
         (compilation-buffer-name-function
   (interactive "sTarget: \nsCommand: ")
   (let ((cmd
          (if (string-equal command "")
-             (format "make %s" target)
+             (format "echo make %s" target)
            (format "%s %s" command target)))
         (compilation-mode-hook
          'build-compilation-mode-hook)
                       ((string-equal build-from-what "Tarballs")
                        build-tarball-prefix)
                       ((string-equal build-from-what "CVS")
-                       build-cvs-xemacs-module))
+                       build-cvs-checkout-dir))
                      (if target
                          (format "-%s" target)
                        ""))))))