-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Gianluca Sforna wrote:
> Hi,
> I am attaching here a new patch for the qtwengophone-install target,
> based on NG trunk at rev 7177.
> It is derived from the one contained in the debian package, and adds a
> check so that if phpai is compiled static, it does not attempt to
> install the library.
> It also fix the location of emoticons. It seems they were moved from
> chat/emoticons to pics/emoticons: though, I can not find the revision
> where this happened...
Thanks, but
if WengoGetConsoleArgument('enable-shared-phapi') == "yes"
doesn't work, WengoGetConsoleArgument('enable-shared-phapi') return an
integer, I've uplaoded a fixed patch to my bug #806
http://dev.openwengo.com/trac/openwengo/trac.cgi/attachment/ticket/806/wengoscons-install.diff
-- andreas
>
> Thanks to GlaDiaC and mnencia for their work on the packaging
>
> Ciao
>
> Gianluca
>
>
> ------------------------------------------------------------------------
>
> Index:
> wengophone-20060814svn7177/wengophone/src/presentation/qt/QtWengoPhoneInstall
> ===================================================================
> ---
> wengophone-20060814svn7177.orig/wengophone/src/presentation/qt/QtWengoPhoneInstall
> +++
> wengophone-20060814svn7177/wengophone/src/presentation/qt/QtWengoPhoneInstall
> @@ -4,10 +4,27 @@ env = WengoGetEnvironment()
>
> base_install_dir = WengoGetConsoleArgument("prefix")
> if base_install_dir == None:
> - base_install_dir = "/tmp"
> -lib_install_dir = os.path.join(base_install_dir, "lib", "qtwengophone")
> -bin_install_dir = os.path.join(base_install_dir, "bin")
> -wrapper_path = os.path.join(bin_install_dir, "qtwengophone")
> + base_install_dir = "/usr/local"
> +
> +dest_install_dir = WengoGetConsoleArgument("destdir")
> +if dest_install_dir != None:
> + base_install_dir = dest_install_dir + base_install_dir
> +
> +bin_install_dir = WengoGetConsoleArgument("bindir")
> +if bin_install_dir == None:
> + bin_install_dir = os.path.join(base_install_dir, "bin")
> +
> +lib_suffix = WengoGetConsoleArgument("libsuffix")
> +lib_install_dir = WengoGetConsoleArgument("libdir")
> +if lib_install_dir == None:
> + if lib_suffix == None:
> + lib_install_dir = os.path.join(base_install_dir, "lib")
> + else:
> + lib_install_dir = os.path.join(base_install_dir, "lib" +
> lib_suffix)
> +
> +data_install_dir = WengoGetConsoleArgument("datadir")
> +if data_install_dir == None:
> + data_install_dir = os.path.join(base_install_dir, "share", "wengophone")
>
> dlls = [
> ]
> @@ -116,40 +133,40 @@ lang = [
> ]
>
> emoticons = [
> - "chat/emoticons/emblem-unreadable.png",
> - "chat/emoticons/face-angel16.png",
> - "chat/emoticons/face-angel22.png",
> - "chat/emoticons/face-angel48.png",
> - "chat/emoticons/face-crying16.png",
> - "chat/emoticons/face-crying22.png",
> - "chat/emoticons/face-crying48.png",
> - "chat/emoticons/face-devil-grin16.png",
> - "chat/emoticons/face-devil-grin22.png",
> - "chat/emoticons/face-devil-grin48.png",
> - "chat/emoticons/face-glasses16.png",
> - "chat/emoticons/face-glasses22.png",
> - "chat/emoticons/face-glasses48.png",
> - "chat/emoticons/face-kiss16.png",
> - "chat/emoticons/face-kiss22.png",
> - "chat/emoticons/face-kiss48.png",
> - "chat/emoticons/face-plain16.png",
> - "chat/emoticons/face-plain22.png",
> - "chat/emoticons/face-plain48.png",
> - "chat/emoticons/face-sad16.png",
> - "chat/emoticons/face-sad22.png",
> - "chat/emoticons/face-sad48.png",
> - "chat/emoticons/face-smile16.png",
> - "chat/emoticons/face-smile22.png",
> - "chat/emoticons/face-smile48.png",
> - "chat/emoticons/face-smile-big16.png",
> - "chat/emoticons/face-smile-big22.png",
> - "chat/emoticons/face-smile-big48.png",
> - "chat/emoticons/face-surprise16.png",
> - "chat/emoticons/face-surprise22.png",
> - "chat/emoticons/face-surprise48.png",
> - "chat/emoticons/face-wink16.png",
> - "chat/emoticons/face-wink22.png",
> - "chat/emoticons/face-wink48.png",
> + "pics/emoticons/emblem-unreadable.png",
> + "pics/emoticons/face-angel16.png",
> + "pics/emoticons/face-angel22.png",
> + "pics/emoticons/face-angel48.png",
> + "pics/emoticons/face-crying16.png",
> + "pics/emoticons/face-crying22.png",
> + "pics/emoticons/face-crying48.png",
> + "pics/emoticons/face-devil-grin16.png",
> + "pics/emoticons/face-devil-grin22.png",
> + "pics/emoticons/face-devil-grin48.png",
> + "pics/emoticons/face-glasses16.png",
> + "pics/emoticons/face-glasses22.png",
> + "pics/emoticons/face-glasses48.png",
> + "pics/emoticons/face-kiss16.png",
> + "pics/emoticons/face-kiss22.png",
> + "pics/emoticons/face-kiss48.png",
> + "pics/emoticons/face-plain16.png",
> + "pics/emoticons/face-plain22.png",
> + "pics/emoticons/face-plain48.png",
> + "pics/emoticons/face-sad16.png",
> + "pics/emoticons/face-sad22.png",
> + "pics/emoticons/face-sad48.png",
> + "pics/emoticons/face-smile16.png",
> + "pics/emoticons/face-smile22.png",
> + "pics/emoticons/face-smile48.png",
> + "pics/emoticons/face-smile-big16.png",
> + "pics/emoticons/face-smile-big22.png",
> + "pics/emoticons/face-smile-big48.png",
> + "pics/emoticons/face-surprise16.png",
> + "pics/emoticons/face-surprise22.png",
> + "pics/emoticons/face-surprise48.png",
> + "pics/emoticons/face-wink16.png",
> + "pics/emoticons/face-wink22.png",
> + "pics/emoticons/face-wink48.png",
> ]
>
> targets = []
> @@ -158,52 +175,33 @@ if WengoOSWindows():
> targets += env.Install(lib_install_dir,
> env.WengoGetAlias("softphone-download"))
> targets += env.Install(lib_install_dir,
> env.WengoGetAlias("softphone-memorydump"))
>
> -targets += env.Install(lib_install_dir, env.WengoGetAlias("phapi"))
> -targets += env.Install(lib_install_dir,
> env.WengoGetAlias("qtwengophone_alias"))
> +targets += env.Install(bin_install_dir,
> env.WengoGetAlias("qtwengophone_alias"))
> +
> +if WengoGetConsoleArgument('enable-shared-phapi') == "yes":
> + targets += env.Install(lib_install_dir, env.WengoGetAlias("phapi_alias"))
> +
> +targets += env.Install(lib_install_dir, env.WengoGetAlias("owcurl_alias"))
>
> -targets += env.Install(lib_install_dir, [
> - env.WengoGetAlias("owcurl_alias"),
> - env.WengoGetAlias("phapi_alias"),
> -])
> if WengoGetConsoleArgument("enable-video") == "yes":
> targets += env.Install(lib_install_dir, env.WengoGetAlias("libavcodec"))
> # targets += env.Install(lib_install_dir, env.WengoGetAlias("video"))
> targets += env.Install(lib_install_dir, env.WengoGetAlias("webcam"))
>
> -targets += env.Install(lib_install_dir, docs)
> -targets += env.Install(lib_install_dir, web_stuff)
> +targets += env.Install(data_install_dir, docs)
> +targets += env.Install(data_install_dir, web_stuff)
>
> -targets += env.Install(os.path.join(lib_install_dir, "icons"), icons_misc)
> -targets += env.Install(os.path.join(lib_install_dir, "pics/avatars"),
> avatars)
> -targets += env.Install(os.path.join(lib_install_dir, "sounds"), base_sounds)
> -targets += env.Install(os.path.join(lib_install_dir, "sounds", "dtmf"),
> +targets += env.Install(os.path.join(data_install_dir, "icons"), icons_misc)
> +targets += env.Install(os.path.join(data_install_dir, "pics/avatars"),
> avatars)
> +targets += env.Install(os.path.join(data_install_dir, "sounds"), base_sounds)
> +targets += env.Install(os.path.join(data_install_dir, "sounds", "dtmf"),
> default_theme_sounds)
> -targets += env.Install(os.path.join(lib_install_dir, "sounds", "dtmf",
> "jungle"),
> +targets += env.Install(os.path.join(data_install_dir, "sounds", "dtmf",
> "jungle"),
> jungle_theme_sounds)
> -#targets += env.Install(os.path.join(lib_install_dir, "connecting"),
> home_page)
> -targets += env.Install(os.path.join(lib_install_dir, "emoticons"),
> +#targets += env.Install(os.path.join(data_install_dir, "connecting"),
> home_page)
> +targets += env.Install(os.path.join(data_install_dir, "emoticons"),
> emoticons)
> -targets += env.Install(os.path.join(lib_install_dir, "lang"),
> env.WengoGetAlias("qtwengophone-translations"))
> -
> -wrapper_script = """
> -#!/bin/sh
> -#
> -# Wengophone wrapper script for Linux
> -# Author: David Ferlier <[EMAIL PROTECTED]>
> -#
> -
> -cd %s || exit 1
> -export LD_LIBRARY_PATH="."
> -./wengophone
> -"""
> -
> -def install_wrapper(target, source, env):
> - for a_target, a_source in zip(target, source):
> - t_wrapper = file(str(a_target), "w+")
> - t_wrapper.write(wrapper_script % lib_install_dir)
> - t_wrapper.close()
> -
> -targets += env.Command(wrapper_path, env.WengoGetAlias("qtwengophone_alias"),
> - install_wrapper)
> +targets += env.Install(os.path.join(data_install_dir, "lang"),
> env.WengoGetAlias("qtwengophone-translations"))
>
> env.WengoAlias('qtwengophone-install', targets)
> +
> +# vim: ft=python
>
>
> ------------------------------------------------------------------------
>
> _______________________________________________
> Wengophone-devel mailing list
> [email protected]
> http://dev.openwengo.com/mailman/listinfo/wengophone-devel
- --
http://www.cynapses.org/ - cybernetic synapses
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org
iD8DBQFE40u2f94+j/M+P8YRAnj8AJoCpPXs1hIVfShtYWoK/rU59+HFzgCeLriG
dObKJUrpOS0BGlc8gm6Ztrs=
=S1aa
-----END PGP SIGNATURE-----
_______________________________________________
Wengophone-devel mailing list
[email protected]
http://dev.openwengo.com/mailman/listinfo/wengophone-devel
