>>>> "Andy" == Andy Piper <andyp(a)bea.com>
writes:
Andy> Reviewed and approved
Andy> andy
Hello Nick,
I recently did a similar thing for $(DEL).
Here is what I learned (with help from Ben and Stephen):
Keep @ and - flags outside of the variable definition as they would break
inside
@if exist $(SRC)\dump-id.c $(DEL) $(SRC)\dump-id.c
Could you please rewrite your patch to produce this:
COPY=xcopy /q /y
COPYDIR=xcopy /q /y /e
...
@$(COPY) config.h $(SRC)
...
Best regards,
Adrian
Andy> At 06:44 PM 5/21/01 +0400, Nick Pakoulin wrote:
> `nmake install -f xemacs.mak' command might take ages to
complete on my
> Windows2000 box because `copy' command asks confirmation to overwrite files in
> destination folders.
>
> I replaced all direct calls to `copy' and `xcopy' commands with COPY and
> COPYDIR variables.
>
> Nick
>
> 2001-05-21 Nick V. Pakoulin <npak(a)ispras.ru>
>
> * xemacs.mak (install): Replace calls to (x)copy commands with
> COPY and COPYDIR variables.
> (COPY): New
> (COPYDIR): New
>
> Index: xemacs.mak
> ===================================================================
> RCS file: /usr/CVSroot/XEmacs/xemacs/nt/xemacs.mak,v
> retrieving revision 1.58.2.3
> diff -u -r1.58.2.3 xemacs.mak
> --- xemacs.mak 2001/05/17 13:37:39 1.58.2.3
> +++ xemacs.mak 2001/05/21 14:38:20
> @@ -48,6 +48,11 @@
> # Define a variable for the 'del' command to use
> DEL=-del
>
> +# Define a variable for 'copy' command to use
> +# Suppress confirmation for overwriting files
> +COPY=@xcopy /q /y
> +COPYDIR=@xcopy /q /y /e
> +
> # Program name and version
>
> !include "$(XEMACS)\version.sh"
> @@ -502,13 +507,13 @@
> $(SRC)\paths.h
>
> $(SRC)\config.h: config.h
> - copy config.h $(SRC)
> + $(COPY) config.h $(SRC)
>
> $(SRC)\Emacs.ad.h: Emacs.ad.h
> - copy Emacs.ad.h $(SRC)
> + $(COPY) Emacs.ad.h $(SRC)
>
> $(SRC)\paths.h: paths.h
> - copy paths.h $(SRC)
> + $(COPY) paths.h $(SRC)
>
> #------------------------------------------------------------------------------
>
> @@ -1411,22 +1416,22 @@
> cd $(NT)
> @echo Installing in $(INSTALL_DIR) ...
> @echo PlaceHolder > PlaceHolder
> - @xcopy /q PROBLEMS "$(INSTALL_DIR)\"
> - @xcopy /q PlaceHolder "$(INSTALL_DIR)\lock\"
> + $(COPY) PROBLEMS "$(INSTALL_DIR)\"
> + $(COPY) PlaceHolder "$(INSTALL_DIR)\lock\"
> $(DEL) "$(INSTALL_DIR)\lock\PlaceHolder"
> - @xcopy /q $(LIB_SRC)\*.exe
"$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
> - @copy $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
> - @copy $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
> - @copy $(SRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
> - @xcopy /e /q $(XEMACS)\etc "$(INSTALL_DIR)\etc\"
> - @xcopy /e /q $(XEMACS)\info "$(INSTALL_DIR)\info\"
> - @xcopy /e /q $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
> + $(COPY) $(LIB_SRC)\*.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)\"
> + $(COPY) $(LIB_SRC)\DOC "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
> + $(COPY) $(CONFIG_VALUES) "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
> + $(COPY) $(SRC)\xemacs.exe "$(INSTALL_DIR)\$(EMACS_CONFIGURATION)"
> + $(COPYDIR) $(XEMACS)\etc "$(INSTALL_DIR)\etc\"
> + $(COPYDIR) $(XEMACS)\info "$(INSTALL_DIR)\info\"
> + $(COPYDIR) $(XEMACS)\lisp "$(INSTALL_DIR)\lisp\"
> @echo Making skeleton package tree in $(PACKAGE_PREFIX) ...
> - @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
> + $(COPY) PlaceHolder "$(PACKAGE_PREFIX)\site-packages\"
> $(DEL) "$(PACKAGE_PREFIX)\site-packages\PlaceHolder"
> - @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\"
> + $(COPY) PlaceHolder "$(PACKAGE_PREFIX)\mule-packages\"
> $(DEL) "$(PACKAGE_PREFIX)\mule-packages\PlaceHolder"
> - @xcopy /q PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
> + $(COPY) PlaceHolder "$(PACKAGE_PREFIX)\xemacs-packages\"
> $(DEL) "$(PACKAGE_PREFIX)\xemacs-packages\PlaceHolder"
> $(DEL) PlaceHolder
>
--
Adrian Aichner
mailto:adrian@xemacs.org
http://www.xemacs.org/