Commit 68a57e7c authored by André's avatar André

Replace src by gajim

parent 6880fba3
SUBDIRS = src data po icons plugins
SUBDIRS = gajim data po icons plugins
ACLOCAL_AMFLAGS = -I m4
......
......@@ -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)
......@@ -48,7 +48,7 @@ instead of DATADIR/gajim/src.])]
,
AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
,
AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src])
AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/gajim])
)
AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins])
......@@ -76,7 +76,7 @@ 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
......
......@@ -13,7 +13,7 @@ docformat: restructuredtext
# The list of modules to document. Modules can be named using
# dotted names, module filenames, or package directory names.
# This option may be repeated.
modules: src/* test/*
modules: gajim/* test/*
# Write html output to the directory "apidocs"
#output: pdf
......
......@@ -2,5 +2,5 @@
if [ ! $PYTHON ]; then
PYTHON="python3";
fi
cd "$(dirname $0)/src"
cd "$(dirname $0)/gajim"
exec $PYTHON -OOt gajim.py "$@"
......@@ -26,7 +26,7 @@
'''
D-BUS Support plugin.
Based on src/remote_control.py
Based on gajim/remote_control.py
:author: Mateusz Biliński <mateusz@bilinski.it>
:since: 8th August 2008
......
......@@ -5,6 +5,6 @@ import os
import sys
if os.getcwd().endswith('dev'):
os.chdir('../../src/') # we were in scripts/dev
os.chdir('../../gajim/') # we were in scripts/dev
os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:]))
'''
Tests for the miscellaneous functions scattered throughout src/gajim.py
Tests for the miscellaneous functions scattered throughout gajim/gajim.py
'''
import unittest
......
......@@ -12,9 +12,9 @@ for o, a in opts:
gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..')
# look for modules in the CWD, then gajim/test/lib, then gajim/src,
# look for modules in the CWD, then gajim/test/lib, then gajim/gajim,
# then everywhere else
sys.path.insert(1, gajim_root + '/src')
sys.path.insert(1, gajim_root + '/gajim')
sys.path.insert(1, gajim_root + '/test/lib')
# a temporary version of ~/.gajim for testing
......
......@@ -57,7 +57,7 @@ class IdleMock:
class MockConnection(IdleMock, Mock):
'''
Class simulating Connection class from src/common/connection.py
Class simulating Connection class from gajim/common/connection.py
It is derived from Mock in order to avoid defining all methods
from real Connection that are called from NBClient or Dispatcher
......
......@@ -30,7 +30,7 @@ import os
import unittest
gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..')
sys.path.append(gajim_root + '/src')
sys.path.append(gajim_root + '/gajim')
# a temporary version of ~/.gajim for testing
configdir = gajim_root + '/test/tmp'
......
......@@ -87,13 +87,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
Py_FrozenFlag = 1;
Py_Initialize();
PySys_SetArgvEx(__argc, szArglist, 0);
FILE* file = fopen("../gajim/src/%(filename)s", "r");
FILE* file = fopen("../gajim/gajim/%(filename)s", "r");
PyRun_SimpleString("import sys; import os;"
"os.chdir('../gajim/src');"
"os.chdir('../gajim/gajim');"
"sys.path.append(os.getcwd());"
"sys.frozen=True;"
);
result = PyRun_SimpleFile(file, "../gajim/src/%(filename)s");
result = PyRun_SimpleFile(file, "../gajim/gajim/%(filename)s");
Py_Finalize();
return result;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment