Merge branch 'rename_src_gajim' into 'master'
Move src/ to gajim/ See merge request !103
This commit is contained in:
commit
fe75060098
|
@ -1,4 +1,4 @@
|
||||||
SUBDIRS = src data po icons plugins
|
SUBDIRS = gajim data po icons plugins
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
ACLOCAL_AMFLAGS = -I m4
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@
|
||||||
&& for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
|
&& for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
|
||||||
po/POTFILES.in; done \
|
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 \
|
&& 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 \
|
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
|
if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then
|
||||||
ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip
|
ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
AC_INIT([Gajim - A Jabber Instant Messager],
|
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_PREREQ([2.59])
|
||||||
|
|
||||||
AC_CONFIG_HEADER(config.h)
|
AC_CONFIG_HEADER(config.h)
|
||||||
|
@ -48,7 +48,7 @@ instead of DATADIR/gajim/src.])]
|
||||||
,
|
,
|
||||||
AC_SUBST([gajim_srcdir], [\${pkgpythondir}])
|
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])
|
AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins])
|
||||||
|
@ -76,7 +76,7 @@ AC_CONFIG_FILES([
|
||||||
data/org.gajim.Gajim.desktop.in
|
data/org.gajim.Gajim.desktop.in
|
||||||
data/gajim-remote.desktop.in
|
data/gajim-remote.desktop.in
|
||||||
data/defs.py
|
data/defs.py
|
||||||
src/Makefile
|
gajim/Makefile
|
||||||
scripts/gajim
|
scripts/gajim
|
||||||
scripts/gajim-remote:scripts/gajim.in
|
scripts/gajim-remote:scripts/gajim.in
|
||||||
scripts/gajim-history-manager: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
|
# The list of modules to document. Modules can be named using
|
||||||
# dotted names, module filenames, or package directory names.
|
# dotted names, module filenames, or package directory names.
|
||||||
# This option may be repeated.
|
# This option may be repeated.
|
||||||
modules: src/* test/*
|
modules: gajim/* test/*
|
||||||
|
|
||||||
# Write html output to the directory "apidocs"
|
# Write html output to the directory "apidocs"
|
||||||
#output: pdf
|
#output: pdf
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue