[PATCH] my first patch for emacs

[PATCH] my first patch for emacs

[Marcin Antczak]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

Hi!

This is my first patch I created for emacs - so, be gentle...

This provides better test procedure when trying to build emacs from cvs
without bootstrap.

I hope you will like it.


Regards,
Marcin



[-- Attachment #2: makefile.elc.test.diff --]
[-- Type: text/x-patch, Size: 1751 bytes --]

? makefile.elc.test.diff
Index: Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/Makefile.in,v
retrieving revision 1.304
diff -c -r1.304 Makefile.in
*** Makefile.in	26 Jul 2005 21:43:11 -0000	1.304
--- Makefile.in	14 Sep 2005 14:30:31 -0000
***************
*** 742,754 ****
  .PHONY: maybe_bootstrap
  
  maybe_bootstrap:
! 	@bar="`echo $(srcdir)/lisp/*.elc`"; \
! 	if [ \( "$$bar" = '$(srcdir)/lisp/*.elc' \) -o \( "$$bar" = '' \) ]; then \
! 	  echo "Your tree does not include the compiled Lisp files."; \
! 	  echo "You need to do \`make bootstrap' to build Emacs."; \
! 	  echo "Emacs now requires Texinfo version 4.2."; \
! 	  exit 1;\
! 	fi
  
  bootstrap: bootstrap-clean-before info bootstrap-build FRC
  
--- 742,748 ----
  .PHONY: maybe_bootstrap
  
  maybe_bootstrap:
! 	(cd src; $(MAKE) $(MFLAGS) bootstrap-maybe)
  
  bootstrap: bootstrap-clean-before info bootstrap-build FRC
  
Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.313
diff -c -r1.313 Makefile.in
*** src/Makefile.in	7 Aug 2005 12:33:16 -0000	1.313
--- src/Makefile.in	14 Sep 2005 14:30:37 -0000
***************
*** 1340,1345 ****
--- 1340,1355 ----
  
  /* Bootstrapping.  */
  
+ bootstrap-maybe:
+ 	@for file in ${lisp}; do \
+ 	    if [ ! -f $$file ]; then \
+ 		echo "Your tree does not include the compiled Lisp file: $$file"; \
+ 		echo "You need to do \'make bootstrap' to build Emacs."; \
+ 		echo "Emacs now requires Texinfo version 4.2."; \
+ 		exit 1; \
+ 	    fi; \
+ 	done
+ 
  bootstrap: bootstrap-emacs${EXEEXT}
  
  /* Dump an Emacs executable named bootstrap-emacs containing the

[-- Attachment #3: Type: text/plain, Size: 142 bytes --]

_______________________________________________
Emacs-devel mailing list
Emacs-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-devel

Re: [PATCH] my first patch for emacs

[Richard M. Stallman]

To help us think about your patch, could you explain what it is
supposed to do differently?  What is the case which you would
like to treat differently, and why?

Re: [PATCH] my first patch for emacs

[Marcin Antczak]

Dnia 14-09-2005, śro o godzinie 16:54 +0200, Marcin Antczak napisał(a):
> Hi!
> 
> This is my first patch I created for emacs - so, be gentle...
> 
> This provides better test procedure when trying to build emacs from cvs
> without bootstrap.

RMS sent me mail with question about what my patch does better.
So, sorry for delay and here is my explanation.

With current code you can have _any single_ *.elc file in lisp directory
and make will think that everything is ok and you don't need to run make
bootstrap.

So, then emacs will not build because errors will show a while later.

With my code - Makefile will try to test if there is a minimal set
of .elc files available to build minimal emacs-bootstrap binary.

Of course after a little while I think that I should also add more files
to this list, because with files defined in ${lisp} variable you
propably will be able to build emacs-bootstrap but still face problems
when trying to build binaries from ./lib-src...

Anyway now you know what was my idea, and if I find a while to think
about again I'll try to prepare something better.


Marcin

Re: [PATCH] my first patch for emacs

[Richard M. Stallman]

    With my code - Makefile will try to test if there is a minimal set
    of .elc files available to build minimal emacs-bootstrap binary.

That does seem like an improvement.  Is your code fast enough
that the delay would not bother anyone?  If so, I'd say the idea
is a good one.

    Of course after a little while I think that I should also add more files
    to this list, because with files defined in ${lisp} variable you
    propably will be able to build emacs-bootstrap but still face problems
    when trying to build binaries from ./lib-src...

Please do that, and then we can install your patch, assuming nobody
objects.