Firstly, sorry for an empty email :-p
On Mon, May 2, 2016 at 2:29 PM, Fabiano Fidêncio <fidencio@xxxxxxxxxx> wrote:
> On Mon, May 2, 2016 at 11:22 AM, Christophe Fergeau <cfergeau@xxxxxxxxxx> wrote:
>> On Wed, Apr 27, 2016 at 05:53:04PM +0200, Fabiano Fidêncio wrote:
>>> The only reason for us to keep maintaining the nsis installer was the
>>> activex plugin (spicex), which requires those nsis based installers.
>>> As the next release of RHEV/oVirt won't use the activex plugin (spicex)
>>> let's completely remove the nsis installer from our tree and focus on
>>> only maintain the msi installer.
>>
>> Maybe mention that currently ovirt/rhev is shipping virt-viewer from the
>> 2.x branch, so it's no big deal to remove it in git master?
I'll add: "oVirt/RHEV is shipping virt-viewer based on 2.0 release
and, if needed, they can stick to 3.0 branch in a future update, in
case their plan goes wrong and they end up need needing nsis support."
Does it work for you?
>>
>>
>>>
>>> Related: rhbz#1324885 and rhbz#1316560
>>> Signed-off-by: Fabiano Fidêncio <fidencio@xxxxxxxxxx>
>>> ---
>>> configure.ac | 2 -
>>> data/Makefile.am | 23 +-
>>> data/virt-viewer-debug.nsis.in | 49 ----
>>> data/virt-viewer.nsis.in | 604 -----------------------------------------
>>
>> After this patch, there is still a 'nsis' phony target in the toplevel
>> Makefile.am.
>> With these fixed:
>> Acked-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>
Actually, I have a non-squashed patch that is doing:
Makefile.am | 8 ++++----
po/POTFILES.in | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 49ed54c..8a759c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ dist-hook: gen-ChangeLog gen-AUTHORS
# Generate the ChangeLog file (with all entries since the switch to git)
# and insert it into the directory we're about to use to create a tarball.
if OS_WIN32
-.PHONY: gen-ChangeLog gen-AUTHORS nsis
+.PHONY: gen-ChangeLog gen-AUTHORS msi
else
.PHONY: gen-ChangeLog gen-AUTHORS
endif
@@ -63,9 +63,9 @@ gen-AUTHORS:
fi
if OS_WIN32
-.PHONY: nsis Makefile.am | 8 ++++----
po/POTFILES.in | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 49ed54c..8a759c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,7 @@ dist-hook: gen-ChangeLog gen-AUTHORS
# Generate the ChangeLog file (with all entries since the switch to git)
# and insert it into the directory we're about to use to create a tarball.
if OS_WIN32
-.PHONY: gen-ChangeLog gen-AUTHORS nsis
+.PHONY: gen-ChangeLog gen-AUTHORS msi
else
.PHONY: gen-ChangeLog gen-AUTHORS
endif
@@ -63,9 +63,9 @@ gen-AUTHORS:
fi
if OS_WIN32
-.PHONY: nsis
-nsis:
- make -C $(builddir)/data virt-viewer-$(VERSION).exe
+.PHONY: msi
+msi:
+ make -C $(builddir)/data msi
endif
-nsis:
- make -C $(builddir)/data virt-viewer-$(VERSION).exe
+.PHONY: msi
+msi:
+ make -C $(builddir)/data msi
endif
What do you think about squashing the patch instead of just removing
the nsis target?
>>
>> Christophe
_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list
