bugGnash - The GNU Flash player - Bugs: bug #34654, update-po rule broken

 
 

bug #34654: update-po rule broken

Submitted by:  Sandro Santilli <strk>
Submitted on:  Tue 25 Oct 2011 07:43:23 PM UTC  
 
Category: NoneSeverity: 4 - Important
Release: NoneStatus: Fixed
Privacy: PublicAssigned to: Gabriele Giacone <gg0>
Open/Closed: Closed

Add a New Comment(Rich Markup)
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Thu 27 Oct 2011 05:53:55 AM UTC, comment #6:

Works for me with srcdir!=builddir.Thanks.

Sandro Santilli <strk>
Project Member
Wed 26 Oct 2011 10:35:42 PM UTC, comment #5:

It was broken if srcdir=builddir and fixed with aecaed76 breaking srcdir!=builddir though.
Both cases are now fixed with bb15eb16.

Gabriele Giacone <gg0>
Project MemberIn charge of this item.
Wed 26 Oct 2011 07:04:24 AM UTC, comment #4:

This is what I get by reverting your commit:

src$ git status
# On branch po
nothing to commit (working directory clean)
src$ cd ../build/po
build/po$ make update-po
.....
build/po$ cd ../src
src$ git status
# On branch po
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: po/cs.po
# modified: po/de.po
# modified: po/es.po
# modified: po/fi.po
# modified: po/fr.po
# modified: po/gnash.pot
# modified: po/it.po
# modified: po/ja.po
#
no changes added to commit (use "git add" and/or "git commit -a")

So, it did work for me pretty well.

I suggest you revert the Makefile.am and file a ticket for the problem you were having. Filing a ticket before fixing a bug is also a way to leave a trace of what's going on, allowing more organized discussion about it and keeping changes aimed at different things isolated each-other. The ticket would be referenced by the commit message.

PS: I've tried running autogen.sh but didn't work:
Merging cs.po...
/usr/bin/msgmerge: error while opening "/usr/src/gnash/gnash-head/gnash.pot" for reading: No such file or directory

Sandro Santilli <strk>
Project Member
Tue 25 Oct 2011 11:39:05 PM UTC, comment #3:

Before my change, neither make update-po nor -C po were working.
I had taken a look at past changes to po/Makefile.am and I wanted to modify it as little as possible. Here "-C po" works now.
Have you run autogen.sh?

gnash.pot is generated under top_srcdir. If we want it generated under po/, we could revert 3da469d89 (2 years'n'half ago) + my
---
- $(MSGMERGE) --update $(srcdir)/$$i $(srcdir)/gnash.pot; \
+ $(MSGMERGE) --update $(srcdir)/$$i $(top_srcdir)/gnash.pot; \
done
+ mv $(top_srcdir)/gnash.pot $(srcdir)/gnash.pot
---

Am I missing anything?

Gabriele Giacone <gg0>
Project MemberIn charge of this item.
Tue 25 Oct 2011 07:47:13 PM UTC, comment #2:

The other unrelated change:

@@ -33,26 +32,16 @@ CLEANFILES = \

dirs = libbase \
librender \
- libamf \
libmedia \
- libmedia/ffmpeg \
- libmedia/gst \
libcore \
- libcore/vm \
- libcore/swf \
- libcore/parser \
- libcore/asobj \
+ libdevice \
+ libsound \
utilities \
plugin \
+ desktop \
+ cygnal \
gui \
- extensions \
- extensions/dbus \
- extensions/dejagnu \
- extensions/fileio \
- extensions/lirc \
- extensions/gtk2 \
- extensions/metome \
- extensions/mysql
+ extensions

EXTRA_DIST = $(pofiles) gnash.pot

Also to be explained with this:

@@ -79,8 +68,9 @@ update-po:
$(MAKE) gnash.pot
for i in $(pofiles); do \
echo "Merging $$i..." ; \
- $(MSGMERGE) --update $(srcdir)/$$i $(srcdir)/gnash.pot; \
+ $(MSGMERGE) --update $(srcdir)/$$i $(top_srcdir)/gnash.pot; \
done
+ mv $(top_srcdir)/gnash.pot $(srcdir)/gnash.pot

SUFFIXES = .po .gmo
.po.gmo:

Sandro Santilli <strk>
Project Member
Tue 25 Oct 2011 07:45:17 PM UTC, comment #1:

http://git.savannah.gnu.org/cgit/gnash.git/commit/?id=aecaed76edc65b3fe68e63c81978683938e423ac

Is the commit introducing the regression

Sandro Santilli <strk>
Project Member
Tue 25 Oct 2011 07:43:23 PM UTC, original submission:

Gabriele, I belive you broke po updating rule, due to this change in po/Makefile.am:

- $(MSGMERGE) --update $(srcdir)/$$i $(srcdir)/gnash.pot; \
+ $(MSGMERGE) --update $(srcdir)/$$i $(top_srcdir)/gnash.pot; \

Introduced error:
/usr/bin/msgmerge: error while opening "/usr/src/gnash/gnash-head/gnash.pot" for reading: No such file or directory

Please don't mix unrelated changes in the same commit next time.
I've seen more changes in Makefile.am that shouldn't be related to the topic of the commit (updating translations)

Sandro Santilli <strk>
Project Member

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by gg0 (Posted a comment)
  • -unavailable- added by strk (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 5 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Thu 27 Oct 2011 05:53:55 AM UTCstrkStatusReady For Test=>Fixed
      Open/ClosedOpen=>Closed
    Wed 26 Oct 2011 10:35:42 PM UTCgg0StatusNone=>Ready For Test
      Summary[REGRESSION] update-po rule broken=>update-po rule broken
    Tue 25 Oct 2011 07:45:45 PM UTCstrkSeverity3 - Normal=>4 - Important

    Back to the top


    Powered by Savane 3.1-cleanup1