[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [virt-tools-list] [PATCH 11/12] Add virt-viewer.nsis



On Tue, Dec 13, 2011 at 08:35:09PM +0100, Marc-André Lureau wrote:
> ---
>  Makefile.am              |   36 ++++---
>  configure.ac             |   18 ++-
>  data/Makefile.am         |    6 +
>  data/virt-viewer.nsis.in |  281 ++++++++++++++++++++++++++++++++++++++++++++++
>  4 files changed, 319 insertions(+), 22 deletions(-)
>  create mode 100644 data/Makefile.am
>  create mode 100644 data/virt-viewer.nsis.in



> 
> diff --git a/Makefile.am b/Makefile.am
> index a40b3c0..4569623 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,24 +1,30 @@
> +NULL =
>  
>  ACLOCAL_AMFLAGS = -I m4
>  
> -SUBDIRS = src man plugin po
> +SUBDIRS = src man plugin po data
>  
> -EXTRA_DIST = @PACKAGE  spec \
> -	intltool-extract.in             \
> -        intltool-merge.in               \
> -        intltool-update.in
> +EXTRA_DIST =					\
> +	@PACKAGE  spec				\
> +	intltool-extract.in			\
> +	intltool-merge.in			\
> +	intltool-update.in			\
> +	$(NULL)
>  
> -DISTCLEAN_FILES = @PACKAGE  spec \
> -        intltool-extract                \
> -        intltool-merge                  \
> -        intltool-update
> +DISTCLEAN_FILES =				\
> +	@PACKAGE  spec				\
> +	intltool-extract			\
> +	intltool-merge				\
> +	intltool-update				\
> +	$(NULL)
>  
> -MAINTAINERCLEANFILES =          \
> -        m4/libtool.m4                   \
> -        m4/lt~obsolete.m4               \
> -        m4/ltoptions.m4                 \
> -        m4/ltsugar.m4                   \
> -        m4/ltversion.m4
> +MAINTAINERCLEANFILES =				\
> +        m4/libtool.m4				\
> +        m4/ltoptions.m4				\
> +        m4/ltsugar.m4				\
> +        m4/ltversion.m4				\
> +        m4/lt~obsolete.m4			\
> +	$(NULL)
>  
>  dist-hook: gen-ChangeLog
>  
> diff --git a/configure.ac b/configure.ac
> index 6aaa0dc..46df329 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -148,13 +148,17 @@ if test "x$enable_plugin" = "xyes"; then
>  fi
>  AM_CONDITIONAL(ENABLE_PLUGIN, [test "x$enable_plugin" = "xyes"])
>  
> -AC_OUTPUT(Makefile
> -          src/Makefile
> -          man/Makefile
> -	  po/Makefile.in
> -	  plugin/Makefile
> -          virt-viewer.spec
> -          mingw32-virt-viewer.spec)
> +AC_OUTPUT([
> +    Makefile
> +    data/Makefile
> +    data/virt-viewer.nsis
> +    man/Makefile
> +    mingw32-virt-viewer.spec
> +    plugin/Makefile
> +    po/Makefile.in
> +    src/Makefile
> +    virt-viewer.spec
> +])
>  
>  AC_MSG_NOTICE([])
>  AC_MSG_NOTICE([Configuration summary])
> diff --git a/data/Makefile.am b/data/Makefile.am
> new file mode 100644
> index 0000000..bd6386f
> --- /dev/null
> +++ b/data/Makefile.am
> @@ -0,0 +1,6 @@
> +NULL=
> +
> +EXTRA_DIST =					\
> +	virt-viewer.nsis.in			\
> +	$(NULL)
> +
> diff --git a/data/virt-viewer.nsis.in b/data/virt-viewer.nsis.in
> new file mode 100644
> index 0000000..d7a1c92
> --- /dev/null
> +++ b/data/virt-viewer.nsis.in
> @@ -0,0 +1,281 @@
> +#!Nsis Installer Command Script
> +#
> +# This is an NSIS Installer Command Script generated automatically
> +# by the Fedora nsiswrapper program.  For more information see:
> +#
> +#   http://fedoraproject.org/wiki/MinGW
> +#
> +# To build an installer from the script you would normally do:
> +#
> +#   makensis virt-viewer.nsis

I think it would be desirable to add a Makefile.am rule "make nsis"
and then trigger that from 'autobuild.sh' when we're doing the
Mingw32 build, so we regression test it.


> +#
> +# which will generate the output file 'virt-viewer- VERSION@.exe' which is a Windows
> +# installer containing your program.
> +
> +Name "virt-viewer"
> +OutFile "virt-viewer- VERSION@.exe"
> +InstallDir "c:\virt-viewer"
> +InstallDirRegKey HKLM SOFTWARE\virt-viewer "Install_Dir"
> +
> +ShowInstDetails hide
> +ShowUninstDetails hide
> +
> +SetCompressor bzip2
> +
> +XPStyle on
> +
> +# Page components
> +Page directory
> +Page instfiles
> +
> +ComponentText "Select which optional components you want to install."
> +
> +DirText "Please select the installation folder."
> +
> +Section "virt-viewer"
> +  SectionIn RO
> +
> +  SetOutPath "$INSTDIR\bin"
> +  File "/usr/i686-w64-mingw32/sys-root/mingw/bin/gst-discoverer-0.10.exe"

Seems like this file needs to be processed during build to
subsitute in 'i686-pc-mingw32' or 'i686-w64-mingw32' as
present in the host toolchain

Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]