[PATCH, MELT] fixing upgrade-warmelt target

[PATCH, MELT] fixing upgrade-warmelt target

[Pierre Vittet]

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

Hello,

I am trying to fix upgrade-warmelt into last revision of MELT. We are
using some move-if-change on meltdesc file (in melt-stage3 for example)
to make a save (to a meltdesc\~) but we still need the meltdesc file for
the generated files.

So I replaced move-ifchange by a cp and it goes beyond (but there are
still issues.


Pierre Vittet

[-- Attachment #2: warmelt_upgrade_translator_cp_meltdescr-178131.diff --]
[-- Type: text/plain, Size: 763 bytes --]

Index: melt-build.tpl
===================================================================
--- melt-build.tpl	(révision 178131)
+++ melt-build.tpl	(copie de travail)
@@ -579,7 +579,7 @@ ENDFOR melt_translator_file+]
 [+FOR melt_translator_file+]
 	@echo upgrading MELT translator [+base+]
 ## dont indent the [+base+]+meltdesc.c 
-	$(melt_make_move) $(MELT_LAST_STAGE)/[+base+]+meltdesc.c  $(MELT_LAST_STAGE)/[+base+]+meltdesc.c~; \
+	cp $(MELT_LAST_STAGE)/[+base+]+meltdesc.c  $(MELT_LAST_STAGE)/[+base+]+meltdesc.c~; \
 	sed s/$(MELT_LAST_STAGE)/MELT-STAGE-ZERO/g $(MELT_LAST_STAGE)/[+base+]+meltdesc.c > $(srcdir)/melt/generated/[+base+]+meltdesc.c 
 	for f in $(MELT_LAST_STAGE)/[+base+].c $(MELT_LAST_STAGE)/[+base+]+[0-9]*.c ; do \
 	  bf=`basename $$f`; \

[-- Attachment #3: warmelt_upgrade_translator_cp_meltdescr-178131.ChangeLog --]
[-- Type: text/plain, Size: 133 bytes --]

2011-08-27  Pierre Vittet  <piervit@pvittet.com>

	* melt-build.tpl (warmelt-upgrade-translator): replace move-if-change
	by a cp.



[-- Attachment #4: upgrade_warmelt_cp_meltdescr-178131.diff --]
[-- Type: text/plain, Size: 570 bytes --]

Index: Makefile.in
===================================================================
--- Makefile.in	(révision 178131)
+++ Makefile.in	(copie de travail)
@@ -5516,7 +5516,7 @@ upgrade-warmelt: $(WARMELT_LAST)
 	for f in $(wildcard meltrunsup*.[ch]); do  \
 	  cp $$f $$f-tmp; \
 	  cp $(srcdir)/melt/generated/$$f $$f-old; \
-          $(SHELL) $(srcdir)/../move-if-change $$f-tmp $(srcdir)/melt/generated/$$f; \
+          $(SHELL) cp $$f-tmp $(srcdir)/melt/generated/$$f; \
         done
 	$(RM) melt-runtime.o melt-runtime.i s-gtype */warmelt*.o
 	$(MAKE) s-gtype

[-- Attachment #5: upgrade_warmelt_cp_meltdescr-178131.ChangeLog --]
[-- Type: text/plain, Size: 117 bytes --]

2011-08-27  Pierre Vittet  <piervit@pvittet.com>

	* Makefile.in (upgrade-warmelt): replace move-if-change by a cp.