aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

Merge branch 'master' into plugins

Browse Source 
Conflicts:
	Makefile.am
This commit is contained in:
James Booth 2014-02-25 20:34:54 +00:00
commit 57a1182eb0
2 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Makefile.am
View File

@ -25,11 +25,11 @@ core_sources = \
src/xmpp/capabilities.h src/xmpp/connection.h \
src/xmpp/roster.c src/xmpp/roster.h \
src/xmpp/bookmark.c src/xmpp/bookmark.h \
src/server_events.c src/server_events.h \
src/server_events.c src/server_events.h \
src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \
src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
src/ui/console.c src/ui/notifier.c \
src/ui/windows.c src/ui/windows.h \
src/ui/windows.c src/ui/windows.h \
src/command/command.h src/command/command.c src/command/history.c \
src/command/commands.h src/command/commands.c \
src/command/history.h src/tools/parser.c \
@ -41,9 +41,9 @@ core_sources = \
src/config/account.c src/config/account.h \
src/config/preferences.c src/config/preferences.h \
src/config/theme.c src/config/theme.h \
src/plugins/plugins.h src/plugins/plugins.c \
src/plugins/api.h src/plugins/api.c \
src/plugins/callbacks.h src/plugins/callbacks.c
src/plugins/plugins.h src/plugins/plugins.c \
src/plugins/api.h src/plugins/api.c \
src/plugins/callbacks.h src/plugins/callbacks.c
test_sources = \
src/contact.c src/contact.h src/common.c \
@ -54,7 +54,7 @@ test_sources = \
src/roster_list.c src/roster_list.h \
src/xmpp/xmpp.h \
src/ui/ui.h src/ui/window.c src/ui/window.h \
src/ui/windows.c src/ui/windows.h \
src/ui/windows.c src/ui/windows.h \
src/command/command.h src/command/command.c src/command/history.c \
src/command/commands.h src/command/commands.c \
src/command/history.h src/tools/parser.c \
@ -66,19 +66,19 @@ test_sources = \
src/config/account.c src/config/account.h \
src/config/preferences.c src/config/preferences.h \
src/config/theme.c src/config/theme.h \
src/plugins/plugins.h src/plugins/plugins.c \
src/plugins/api.h src/plugins/api.c \
src/plugins/callbacks.h src/plugins/callbacks.c \
src/server_events.c src/server_events.h \
tests/xmpp/mock_xmpp.h tests/xmpp/mock_xmpp.c \
tests/otr/mock_otr.h tests/otr/mock_otr.c \
tests/ui/mock_ui.h tests/ui/mock_ui.c \
tests/config/mock_accounts.h tests/config/mock_accounts.c \
tests/helpers.c tests/helpers.h \
tests/log/mock_log.c \
tests/test_autocomplete.c \
tests/test_common.c \
tests/test_contact.c \
src/plugins/plugins.h src/plugins/plugins.c \
src/plugins/api.h src/plugins/api.c \
src/plugins/callbacks.h src/plugins/callbacks.c \
src/server_events.c src/server_events.h \
tests/xmpp/mock_xmpp.h tests/xmpp/mock_xmpp.c \
tests/otr/mock_otr.h tests/otr/mock_otr.c \
tests/ui/mock_ui.h tests/ui/mock_ui.c \
tests/config/mock_accounts.h tests/config/mock_accounts.c \
tests/helpers.c tests/helpers.h \
tests/log/mock_log.c \
tests/test_autocomplete.c \
tests/test_common.c \
tests/test_contact.c \
tests/test_cmd_connect.c \
tests/test_cmd_account.c \
tests/test_cmd_rooms.c \
@ -94,34 +94,34 @@ test_sources = \
tests/test_preferences.c \
tests/test_server_events.c \
tests/test_muc.c \
tests/testsuite.c
tests/testsuite.c
main_source = src/main.c
python_sources = \
src/plugins/python_plugins.h src/plugins/python_plugins.c \
src/plugins/python_api.h src/plugins/python_api.c
src/plugins/python_plugins.h src/plugins/python_plugins.c \
src/plugins/python_api.h src/plugins/python_api.c
ruby_sources = \
src/plugins/ruby_plugins.h src/plugins/ruby_plugins.c \
src/plugins/ruby_api.h src/plugins/ruby_api.c
src/plugins/ruby_plugins.h src/plugins/ruby_plugins.c \
src/plugins/ruby_api.h src/plugins/ruby_api.c
lua_sources = \
src/plugins/lua_plugins.h src/plugins/lua_plugins.c \
src/plugins/lua_api.h src/plugins/lua_api.c
src/plugins/lua_plugins.h src/plugins/lua_plugins.c \
src/plugins/lua_api.h src/plugins/lua_api.c
c_sources = \
src/plugins/c_plugins.h src/plugins/c_plugins.c \
src/plugins/c_api.h src/plugins/c_api.c
src/plugins/c_plugins.h src/plugins/c_plugins.c \
src/plugins/c_api.h src/plugins/c_api.c
git_sources = \
src/gitversion.c
src/gitversion.c
otr3_sources = \
src/otr/otrlib.h src/otr/otrlibv3.c src/otr/otr.h src/otr/otr.c
src/otr/otrlib.h src/otr/otrlibv3.c src/otr/otr.h src/otr/otr.c
otr4_sources = \
src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c
src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c
if BUILD_PYTHON_API
with_python_sources = $(core_sources) $(python_sources)

16
install-all.sh
View File

@ -1,7 +1,19 @@
#!/bin/sh
#!/bin/bash
set -o errtrace
STATUS=development
error_handler()
{
ERR_CODE=$?
echo "Error $ERR_CODE with command '$BASH_COMMAND' on line ${BASH_LINENO[0]}. Exiting."
exit $ERR_CODE
}
trap error_handler ERR
debian_prepare()
{
echo
@ -23,7 +35,7 @@ fedora_prepare()
echo
ARCH=`arch`
sudo yum -y install gcc git autoconf automake openssl-devel.$ARCH expat-devel.$ARCH ncurses-devel.$ARCH glib2-devel.$ARCH libnotify-devel.$ARCH libcurl-devel.$ARCH libXScrnSaver-devel.$ARCH libotr3-devel.$ARCH
}