Commit 1a2774c9 authored by Martin's avatar Martin

Imported upstream master from 2017-08-28

parent e124181f

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

before_script:
- sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly pylint3
- sudo apt-get build-dep -y -qq gajim-default-nightly
stages:
- test
- build
run-test:
stage: test
script:
- ./autogen.sh
- make test_nogui
run-pylint:
stage: test
script:
- pylint3 --additional-builtins=_ --disable=all --enable=E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701 gajim
run-build:
stage: build
script:
- ./autogen.sh
- make dist
- export FN="gajim-default-"$(date +%F)".tar"
- mv gajim-*.tar.gz $FN.gz
- mkdir tmp_add_plugins
- mv $FN.gz tmp_add_plugins/
- cd tmp_add_plugins/
- tar xzf $FN.gz
- rm $FN.gz
- export GF=$(find . -maxdepth 1 -type d -name 'gajim-*')
- cd $GF/plugins/
- curl -O https://ftp.gajim.org/plugins_1/plugin_installer.zip
- unzip plugin_installer.zip
- rm plugin_installer.zip
- cd ../..
- tar czf ../$FN.gz gajim-*
- cd ..
- rm -rf tmp_add_plugins
- scp $FN.gz panoramix:/var/www/gajim/downloads/snap/ci/gajim-default-$CI_COMMIT_SHA.tar.gz
artifacts:
name: "gajim-default-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHA"
expire_in: 1 week
paths:
- gajim-default-2???-??-??.tar.gz
SUBDIRS = src data po icons plugins
SUBDIRS = gajim data po icons plugins
ACLOCAL_AMFLAGS = -I m4
......@@ -11,15 +11,17 @@ EXTRA_DIST = \
intltool-merge.in \
intltool-update.in \
win \
scripts/gajim.in
scripts/gajim.in \
scripts/gajim-history-manager.in \
scripts/gajim-remote.in
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
scripts/gajim \
scripts/gajim-remote \
scripts/gajim-histrory-manager
scripts/gajim-history-manager
MAINTAINERCLEANFILES = \
configure \
......@@ -52,6 +54,10 @@ test:
${PYTHON} test/runtests.py
.PHONY: test
test_nogui:
${PYTHON} test/runtests.py -n
.PHONY: test_nogui
doc:
epydoc --config=doc/epydoc.conf
.PHONY: doc
......@@ -18,7 +18,7 @@
<li>python3-gi</li>
<li>python3-gi-cairo</li>
<li>gir1.2-gtk-3.0</li>
<li>python-nbxmpp</li>
<li>python3-nbxmpp</li>
</ul>
<h2>Optional Runtime Requirements</h2>
......@@ -30,13 +30,14 @@
<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li>
<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li>
<li>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li>
<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li>
<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li>
<li>gir1.2-notify-0.7 to get cooler popups</li>
<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li>
<li>python3-dbus bindings (>=1.2.0)</li>
<li>gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls</li>
<li>gir1.2-gupnpigd-1.0 for better NAT traversing</li>
<li>gir1.2-networkmanager-1.0 for network lose detection</li>
<li>python3-idna and python3-precis-i18n for correctly parsing JIDs</li>
</ul>
<p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p>
......@@ -66,10 +67,10 @@
<h2>Running Gajim</h2>
<p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/>
or if you use hg version and you didn't 'make install' you can also run from gajim folder with<em>./launch.sh</em></p>
or if you use Git version and you didn't 'make install' you can also run from gajim folder with<em>./launch.py</em></p>
<hr />
<h3>Note for hg users</h3>
<p>You will need GNU autotools in order to install Gajim from svn. This includes:</p>
<h3>Note for Git users</h3>
<p>You will need GNU autotools in order to install Gajim from Git. This includes:</p>
<ul>
<li>automake &gt;= 1.8 </li>
<li>autoconf &gt;= 2.59 </li>
......@@ -108,8 +109,8 @@ If you don't want to make this permanent, execute gajim with --verbose
everytime you want to have verbose output.</p>
<h3>FAQ/Wiki</h3>
<p>FAQ can be found at <a href="http://trac.gajim.org/wiki/GajimFaq">http://trac.gajim.org/wiki/GajimFaq</a><br/>
Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/wiki</a></p>
<p>FAQ can be found at <a href="https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</a><br/>
Wiki can be found at <a href="https://dev.gajim.org/gajim/gajim/wikis/home">https://dev.gajim.org/gajim/gajim/wikis/home</a></p>
<p>That is all, <strong>enjoy!</strong></p>
......@@ -118,7 +119,7 @@ Wiki can be found at <a href="http://trac.gajim.org/wiki">http://trac.gajim.org/
<br/>
<br/>
<br/>
(C) 2003-2015<br/>
(C) 2003-2017<br/>
The Gajim Team<br/>
https://gajim.org<br/>
<br/>
......
......@@ -16,9 +16,9 @@ The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP clie
* How to contribute
* The Gajim team
- Latest release:
* [Gajim 0.16.7 (.tar.gz)](https://www.gajim.org/downloads/0.16/gajim-0.16.7.tar.gz)
* [Gajim 0.16.7-1 (.exe)](https://www.gajim.org/downloads/0.16/gajim-0.16.7-1.exe)
* [Gajim 0.16.7-1 portable (.exe)](https://www.gajim.org/downloads/0.16/gajim-portable-0.16.7-1.exe)
* [Gajim 0.16.8 (.tar.gz)](https://gajim.org/downloads/0.16/gajim-0.16.8.tar.gz)
* [Gajim 0.16.8-2 (.exe)](https://gajim.org/downloads/0.16/gajim-0.16.8-2.exe)
* [Gajim 0.16.8-2 portable (.exe)](https://gajim.org/downloads/0.16/gajim-portable-0.16.8-2.exe)
* [Daily snapshot](https://www.gajim.org/downloads/snap/?M=D)
- [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues)
\ No newline at end of file
......@@ -6,9 +6,9 @@
&& for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
po/POTFILES.in; done \
&& ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \
gajim/*.py gajim/common/*.py gajim/command_system/*.py gajim/command_system/implementation/*.py gajim/common/zeroconf/*.py gajim/plugins/*.py | grep -v ipython_view.py >> \
po/POTFILES.in \
&& echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1
&& echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\ngajim/ipython_view.py" > po/POTFILES.skip || exit 1
if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then
ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip
fi
......
AC_INIT([Gajim - A Jabber Instant Messager],
m4_esyscmd_s([python -c "import os;os.chdir('src');from common import defs; print(defs.version)"]),[https://dev.gajim.org/gajim/gajim],[gajim])
m4_esyscmd_s([python -c "import os;os.chdir('gajim');from common import defs; print(defs.version)"]),[https://dev.gajim.org/gajim/gajim],[gajim])
AC_PREREQ([2.59])
AC_CONFIG_HEADER(config.h)
......@@ -38,21 +38,10 @@ AC_SUBST(ACLOCAL_AMFLAGS)
AM_PATH_PYTHON([3.5])
dnl ****
dnl enable installation in python-2.x/site-packages/gajim
dnl ****
AC_ARG_ENABLE(site-packages,
[AS_HELP_STRING([--enable-site-packages],
[install gajim sources in PYTHONDIR/site-packages/gajim
instead of DATADIR/gajim/src.])]
,
AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
,
AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
)
AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins])
AS_AC_EXPAND(PY_SITEDIR, "${pythondir}")
AS_AC_EXPAND(GAJIM_SRCDIR, "${gajim_srcdir}")
AS_AC_EXPAND(PKGDATADIR, "${datadir}/${PACKAGE}")
AS_AC_EXPAND(DOCDIR, "${docdir}")
......@@ -76,10 +65,10 @@ AC_CONFIG_FILES([
data/org.gajim.Gajim.desktop.in
data/gajim-remote.desktop.in
data/defs.py
src/Makefile
gajim/Makefile
scripts/gajim
scripts/gajim-remote:scripts/gajim.in
scripts/gajim-history-manager:scripts/gajim.in
scripts/gajim-history-manager
scripts/gajim-remote
po/Makefile.in
plugins/Makefile
])
......
emoticonsdir = $(pkgdatadir)/data/emoticons
nobase_dist_emoticons_DATA = \
$(srcdir)/*/*.png \
$(srcdir)/*/*.gif \
$(srcdir)/*/emoticons.py
$(srcdir)/*/LICENSE \
$(srcdir)/*/emoticons_theme.py
MAINTAINERCLEANFILES = Makefile.in