Build second xpi for updates from master

[retorquere]

No description provided.

[jlegewie]

Thanks! I will look at this over the next days and might get back to you when I have a question.

AllThatIsTheCase "I've issued a pull request that builds two xpis -- one that builds the xpi as it was, and one that can be installed from github and which will auto-update from there. It does required xsltproc to be installed -- it could probably be done with sed sourcery, but I'm no sed master -- do feel free to change that though."

[retorquere]

That's OK. I really should have added documentation. The two things that really changed is:

I have added an update.rdf which firefox can poll to see if a new version has been released, and in the install.rdf the updateURI field needs to be present for the github version and absent for the MozRegistry version.

[jlegewie]

Okay, I just looked into your changes. Thanks! Right now, your changes (a) update the makefile so that it installs the version from github, and (b) change the place where FF checks for updates updateURL so that FF automatically updates to the most recent github version. Is that correct?
Would it be possible to leave the current makefile in tact with the update from mozilla and create a second makefile that installs the github version with the update coming from github? The second makefile could be called makefile.alpha or makefile.github and could be called with make -f makefile.alpha (see here). The previous makefile would continue to install the version downloaded from github but revert to the mozilla version as soon as there is a stable release with a higher version number. The new makefile would always update to the github version. Does that make any sense or am I missing something?

Thanks!

ps: Can you remove the changes to .gitignore from the pull request?

[retorquere]

The makefile itself doesn't really install anything, it just builds the two xpis. The -fx version will never check for updates from github, only from MozReg; the -github version will always check for updates from github, never from MozReg. So which line of updates a user gets depends on which xpi he or she installs. I could split this into two makefiles, but they'd have to do mostly the same thing; the install.rdf must be different for each xpi.

The gitignore reflects some of these changes; as the -fx.xpi is only useful to install from MozReg, it is excluded from being checked in, but since the -github.xpi is going to update its binary from github, it must be included in commit/push, so not be ignored through ,gitignore. Likewise, since install.rdf is updated during build for each specific xpi, it is no longer a source file but a temporary build artifact, so checking it in would not have much use.

[jlegewie]

Okay, I got it. Makes sense (also to have one makefile that produces to xpi files). I will take another look later today and merge.

[jlegewie]

Now I understand the changes better. Can you just clarify these questions:

1. When exactly does the version based on the github xpi update? When I change the version number in the update.rdf file?
2. The fx xpi updates to the mozilla version when a mozilla version is released with a higher version number right?
3. Creating the xpi file manually (maybe on windows) now requires the user to rename the install.xml file to install.rdf and (if desired) remove the em:updateURL, right? That would be a reason to have install.rdfwithout the em:updateURL (overwritten by make), no?

[retorquere]

1. The version is grabbed from install.xml (which used to be install.rdf) for both. This way, if someone says to have version x.y.x, it doesn't matter whether it is updated from github or MozReg. You will probably end up publishing only a subset of the github versions to MozReg
2. Yes, and the github version will update when a newer version is available from github
3. No, the makefile will create the correct install.rdf from install.xml using xsltproc. The binaries for xsltproc for windows can be found at http://www.zlatkovic.com/libxml.en.html. After installing that (and makign sure xsltproc.exe is in your PATH), doing a "make" should build both, and "make zotfile-fx.xpi" should build the mozreg version.