285418 - Fixes for packaging script

Status: RESOLVED FIXED

(Core Graveyard :: XForms, defect)

Description

[Allan Beaufour]

* Take version from Makefile
* Add xforms.js and stage dir. to clean up routine

Comment 1

[Allan Beaufour]

Attachment: Patch

Comment 2

[Allan Beaufour]

(In reply to comment #1)
> Created an attachment (id=176866) [edit]
> Patch

GARBAGE should include xforms.template too

Comment 3

[aaronr]

Comment on attachment 176866 [details] [diff] [review]
Patch

could you also fix it so that we aren't generating xforms.template and
xforms.js in the srcdir if we specified an objdir? 
toolkit/mozapps/installer/makejs.pl is using the path of the .jst file
parameter to figure out where to generate xforms.template.  Also, gotta be
careful it doesn't break when user is doing srcdir builds.  For example, bryner
said that this would be a problem if you fix it by copying the .jst file to the
objdir, in cases where the objdir is the srcdir the build might stop because
you tried to copy the .xpt file onto itself.

Comment 4

[Allan Beaufour]

(In reply to comment #3)
> (From update of attachment 176866 [details] [diff] [review] [edit])
> could you also fix it so that we aren't generating xforms.template and
> xforms.js in the srcdir if we specified an objdir? 
> toolkit/mozapps/installer/makejs.pl is using the path of the .jst file
> parameter to figure out where to generate xforms.template.  Also, gotta be
> careful it doesn't break when user is doing srcdir builds.  For example, bryner
> said that this would be a problem if you fix it by copying the .jst file to the
> objdir, in cases where the objdir is the srcdir the build might stop because
> you tried to copy the .xpt file onto itself.

I do not know the build system good enough for that, I do not use objdir myself,
and it sounds like a problem in makejs.pl, so frankly: no.

Comment 5

[Allan Beaufour]

(In reply to comment #4)
> I do not know the build system good enough for that, I do not use objdir myself,
> and it sounds like a problem in makejs.pl, so frankly: no.

So what do you say Aaron? Can we get this one in, and maybe create a new bug for
the above?

Comment 6

[aaronr]

Comment on attachment 176866 [details] [diff] [review]
Patch

ok, if there is a new bug for the xforms.js and xforms.template being created
in the srcdir, then  I'm fine with this patch.

Comment 7

[Allan Beaufour]

Checked in.