Commits August 2008

commits@gajim.org

10 participants
272 discussions

[commit-gajim] r10271 - in branches/osx_newbuildsys: . data data/activities data/emoticons data/glade data/iconsets data/moods data/pixmaps m4 src src/common src/osx src/osx/growl src/osx/syncmenu
by js＠gajim.org 24 Aug '08

24 Aug '08

Author: js Date: 2008-08-24 10:15:56 +0200 (Sun, 24 Aug 2008) New Revision: 10271 Added: branches/osx_newbuildsys/buildsys.mk.in branches/osx_newbuildsys/m4/buildsys.m4 Removed: branches/osx_newbuildsys/Makefile.am branches/osx_newbuildsys/config.h.in branches/osx_newbuildsys/data/Makefile.am branches/osx_newbuildsys/data/activities/Makefile.am branches/osx_newbuildsys/data/emoticons/Makefile.am branches/osx_newbuildsys/data/glade/Makefile.am branches/osx_newbuildsys/data/iconsets/Makefile.am branches/osx_newbuildsys/data/moods/Makefile.am branches/osx_newbuildsys/data/pixmaps/Makefile.am branches/osx_newbuildsys/src/Makefile.am branches/osx_newbuildsys/src/common/Makefile.am branches/osx_newbuildsys/src/osx/Makefile.am branches/osx_newbuildsys/src/osx/growl/Makefile.am branches/osx_newbuildsys/src/osx/syncmenu/Makefile.am Modified: branches/osx_newbuildsys/autogen.sh branches/osx_newbuildsys/configure.ac Log: configure works on OS X without problems now. * Removed all automake files. * Removed automake stuff from configure.ac. * Removed automake stuff from autogen.sh. * Removed libtool stuff. * Added the files of the new buildsys. Deleted: branches/osx_newbuildsys/Makefile.am =================================================================== --- branches/osx_newbuildsys/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,64 +0,0 @@ -SUBDIRS = src data po - -ACLOCAL_AMFLAGS = -I m4 - -if BUILD_REMOTE_CONTROL -OPTIONAL_BIN = scripts/gajim-remote -else -OPTIONAL_BIN = -endif - -bin_SCRIPTS = scripts/gajim $(OPTIONAL_BIN) - - -docfilesdir = $(docdir) -docfiles_DATA = README \ - README.html \ - ChangeLog \ - COPYING \ - THANKS \ - THANKS.artists \ - AUTHORS - -EXTRA_DIST = \ - $(docfiles_DATA) \ - autogen.sh \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - scripts/gajim.in \ - scripts/gajim-remote.in - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update \ - scripts/gajim \ - scripts/gajim-remote - -MAINTAINERCLEANFILES = \ - configure \ - Makefile.in \ - intltool-extract.in \ - intltool-update.in \ - intltool-merge.in \ - ltmain.sh \ - missing \ - mkinstalldirs \ - install-sh \ - compile \ - depcomp \ - config.guess \ - config.log \ - config.sub \ - config.status \ - aclocal.m4 \ - libtool \ - po/POTFILES.in \ - src/trayicon_la-eggtrayicon.loT \ - m4/intltool.m4 - -MAINTAINERCLEANDIRS = \ - autom4te.cache \ - build \ - dist Modified: branches/osx_newbuildsys/autogen.sh =================================================================== --- branches/osx_newbuildsys/autogen.sh 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/autogen.sh 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,28 +1,17 @@ -#!/usr/bin/env bash - AM_ARGS="--add-missing --gnu --copy" - CONF_ARGS="" - if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then - . /Library/Frameworks/GTK+.framework/Versions/Current/env - AM_ARGS="${AM_ARGS} --ignore-deps" - CONF_ARGS="${CONF_ARGS} --disable-idle --without-x" - fi - - echo "[encoding: UTF-8]" > po/POTFILES.in \ - && ls -1 data/gajim.desktop.in.in data/glade/*.glade \ - src/*py src/common/*py src/common/zeroconf/*.py src/osx/*.py >> \ - po/POTFILES.in || exit 1 - if test -z `which pkg-config 2>/dev/null`;then - echo "***Error: pkg-config not found***" +#!/bin/sh +if ! which pkg-config >/dev/null 2>&1; then + echo "*** ERROR: pkg-config not found ***" echo "See README.html for build requirements." exit 1 - fi +fi - which glibtoolize >/dev/null 2>&1 && LIBTOOLIZE="glibtoolize" || LIBTOOLIZE="libtoolize" +echo "[encoding: UTF-8]" > po/POTFILES.in && \ +ls -1 data/gajim.desktop.in.in data/glade/*.glade \ + src/*.py src/common/*.py src/common/zeroconf/*.py src/osx/*.py \ + >>po/POTFILES.in || exit 1 - intltoolize --force --automake \ - && aclocal -I ./m4 \ - && $LIBTOOLIZE --copy --force --automake \ - && autoheader \ - && autoconf \ - && automake ${AM_ARGS} \ - && ./configure ${CONF_ARGS} $@ +intltoolize --force && \ +aclocal -I ./m4 && \ +autoheader && \ +autoconf && \ +./configure ${CONF_ARGS} $@ Added: branches/osx_newbuildsys/buildsys.mk.in =================================================================== --- branches/osx_newbuildsys/buildsys.mk.in (rev 0) +++ branches/osx_newbuildsys/buildsys.mk.in 2008-08-24 08:15:56 UTC (rev 10271) @@ -0,0 +1,420 @@ +# +# Copyright (c) 2007 - 2008, Jonathan Schleifer <js-buildsys(a)webkeks.org> +# +# https://webkeks.org/hg/buildsys/ +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice is present in all copies. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +PACKAGE = @PACKAGE@ +CC = @CC@ +CXX = @CXX@ +CPP = @CPP@ +DC = @DC@ +ERLC = @ERLC@ +OBJC = @OBJC@ +AR = @AR@ +LD = ${CC} +CFLAGS = @CFLAGS@ +CXXFLAGS = @CXXFLAGS@ +CPPFLAGS = @CPPFLAGS@ +DFLAGS = @DFLAGS@ +ERLCFLAGS = @ERLCFLAGS@ +OBJCFLAGS = @OBJCFLAGS@ +LDFLAGS = @LDFLAGS@ +LIBS = @LIBS@ +PROG_IMPLIB_NEEDED = @PROG_IMPLIB_NEEDED@ +PROG_IMPLIB_LDFLAGS = @PROG_IMPLIB_LDFLAGS@ +PROG_SUFFIX = @EXEEXT@ +LIB_CPPFLAGS = @LIB_CPPFLAGS@ +LIB_CFLAGS = @LIB_CFLAGS@ +LIB_LDFLAGS = @LIB_LDFLAGS@ +LIB_PREFIX = @LIB_PREFIX@ +LIB_SUFFIX = @LIB_SUFFIX@ +PLUGIN_CPPFLAGS = @PLUGIN_CPPFLAGS@ +PLUGIN_CFLAGS = @PLUGIN_CFLAGS@ +PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@ +PLUGIN_SUFFIX = @PLUGIN_SUFFIX@ +INSTALL_LIB = @INSTALL_LIB@ +UNINSTALL_LIB = @UNINSTALL_LIB@ +CLEAN_LIB = @CLEAN_LIB@ +LN_S = @LN_S@ +MKDIR_P = mkdir -p +INSTALL = install +SHELL = @SHELL@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +libdir = @libdir@ +plugindir ?= ${libdir}/${PACKAGE} +datarootdir = @datarootdir@ +datadir = @datadir@ +includedir = @includedir@ +includesubdir ?= ${PACKAGE} +mandir = @mandir@ +mansubdir ?= man1 + +OBJS1 = ${SRCS:.c=.o} +OBJS2 = ${OBJS1:.cc=.o} +OBJS3 = ${OBJS2:.cxx=.o} +OBJS4 = ${OBJS3:.d=.o} +OBJS5 = ${OBJS4:.erl=.beam} +OBJS6 = ${OBJS5:.m=.o} +OBJS += ${OBJS6:.xpm=.o} + +.SILENT: +.SUFFIXES: .beam .c .cc .cxx .d .dep .erl .m .xpm +.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean + +all: + for i in subdirs depend ${STATIC_LIB} ${STATIC_LIB_NOINST} ${LIB} ${LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST}; do \ + ${MAKE} ${MFLAGS} $$i || exit 1; \ + done + +subdirs: + for i in ${SUBDIRS}; do \ + ${DIR_ENTER}; \ + ${MAKE} ${MFLAGS} || exit 1; \ + ${DIR_LEAVE}; \ + done + +depend: pre-depend ${SRCS} + regen=0; \ + deps=""; \ + test -f .deps || regen=1; \ + for i in ${SRCS}; do \ + case $$i in \ + *.o) \ + test $$i -nt .deps && regen=1; \ + deps="$${deps%.o}.dep $$i"; \ + ;; \ + esac; \ + done; \ + if test x"$$regen" = x"1" -a x"$$deps" != "x"; then \ + ${DEPEND_STATUS}; \ + rm -f .deps; \ + if ${MAKE} ${MFLAGS} $$deps; then \ + cat $$deps >.deps; \ + rm -f $$deps; \ + ${DEPEND_OK}; \ + else \ + rm -f .deps $$deps; \ + ${DEPEND_FAILED}; \ + fi; \ + fi + +.c.dep .cc.dep .cxx.dep .m.dep: + ${CPP} ${CPPFLAGS} -M $< >$@ + +.d.dep: +.xpm.dep: + +pre-depend: + +${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} + ${LINK_STATUS} + if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi + +${LIB} ${LIB_NOINST}: ${EXT_DEPS} ${OBJS} + ${LINK_STATUS} + if ${LD} -o $@ ${OBJS} ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi + +${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${OBJS} + ${LINK_STATUS} + if ${LD} -o $@ ${OBJS} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi + +${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} + ${LINK_STATUS} + if ${AR} cr $@ ${OBJS}; then \ + ${LINK_OK}; \ + else \ + ${LINK_FAILED}; \ + fi + +.c.o: + ${COMPILE_STATUS} + if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.cc.o .cxx.o: + ${COMPILE_STATUS} + if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.d.o: + ${COMPILE_STATUS} + if test x"$(basename ${DC})" = x"dmd"; then \ + if ${DC} ${DFLAGS} -c -of$@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi \ + else \ + if ${DC} ${DFLAGS} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi \ + fi + +.erl.beam: + ${COMPILE_STATUS} + if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.m.o: + ${COMPILE_STATUS} + if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +.xpm.o: + ${COMPILE_STATUS} + if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \ + ${COMPILE_OK}; \ + else \ + ${COMPILE_FAILED}; \ + fi + +install: ${LIB} ${STATIC_LIB} ${PLUGIN} ${PROG} install-extra + for i in ${SUBDIRS}; do \ + ${DIR_ENTER}; \ + ${MAKE} ${MFLAGS} install || exit 1; \ + ${DIR_LEAVE}; \ + done + + for i in ${LIB}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in ${STATIC_LIB}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in ${PLUGIN}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in ${DATA}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in ${PROG}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in ${INCLUDES}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + + for i in ${MAN}; do \ + ${INSTALL_STATUS}; \ + if ${MKDIR_P} ${DESTDIR}${mandir}/${mansubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ + ${INSTALL_OK}; \ + else \ + ${INSTALL_FAILED}; \ + fi \ + done + +install-extra: + +uninstall: uninstall-extra + for i in ${SUBDIRS}; do \ + ${DIR_ENTER}; \ + ${MAKE} ${MFLAGS} uninstall || exit 1; \ + ${DIR_LEAVE}; \ + done + + for i in ${LIB}; do \ + if test -f ${DESTDIR}${libdir}/$$i; then \ + if ${UNINSTALL_LIB}; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi; \ + done + + for i in ${STATIC_LIB}; do \ + if test -f ${DESTDIR}${libdir}/$$i; then \ + if rm -f ${DESTDIR}${libdir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + + for i in ${PLUGIN}; do \ + if test -f ${DESTDIR}${plugindir}/$$i; then \ + if rm -f ${DESTDIR}${plugindir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + -rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1 + + for i in ${DATA}; do \ + if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ + if rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + + for i in ${PROG}; do \ + if test -f ${DESTDIR}${bindir}/$$i; then \ + if rm -f ${DESTDIR}${bindir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + + for i in ${INCLUDES}; do \ + if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ + if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + -rmdir ${DESTDIR}${includedir}/${includesubdir} >/dev/null 2>&1 + + for i in ${MAN}; do \ + if test -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ + if rm -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + +uninstall-extra: + +clean: + for i in ${SUBDIRS}; do \ + ${DIR_ENTER}; \ + ${MAKE} ${MFLAGS} clean || exit 1; \ + ${DIR_LEAVE}; \ + done + + for i in ${OBJS} ${CLEAN} ${CLEAN_LIB} .deps ${DEPS}; do \ + if test -f $$i -o -d $$i; then \ + if rm -fr $$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + +distclean: clean + for i in ${SUBDIRS}; do \ + ${DIR_ENTER}; \ + ${MAKE} ${MFLAGS} distclean || exit 1; \ + ${DIR_LEAVE}; \ + done + + for i in ${PROG} ${PROG_NOINST} ${LIB} ${LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${DISTCLEAN} *~; do \ + if test -f $$i -o -d $$i; then \ + if rm -fr $$i; then \ + ${DELETE_OK}; \ + else \ + ${DELETE_FAILED}; \ + fi \ + fi \ + done + +DIR_ENTER = printf "\033[K\033[0;36mEntering directory \033[1;36m$$i\033[0;36m.\033[0m\n"; cd $$i || exit 1 +DIR_LEAVE = printf "\033[K\033[0;36mLeaving directory \033[1;36m$$i\033[0;36m.\033[0m\n"; cd .. || exit 1 +DEPEND_STATUS = printf "\033[K\033[0;33mGenerating dependencies...\033[0m\r" +DEPEND_OK = printf "\033[K\033[0;32mSuccessfully generated dependencies.\033[0m\n" +DEPEND_FAILED = printf "\033[K\033[0;31mFailed to generate dependencies!\033[0m\n"; exit 1 +COMPILE_STATUS = printf "\033[K\033[0;33mCompiling \033[1;33m$<\033[0;33m...\033[0m\r" +COMPILE_OK = printf "\033[K\033[0;32mSuccessfully compiled \033[1;32m$<\033[0;32m.\033[0m\n" +COMPILE_FAILED = printf "\033[K\033[0;31mFailed to compile \033[1;31m$<\033[0;31m!\033[0m\n"; exit 1 +LINK_STATUS = printf "\033[K\033[0;33mLinking \033[1;33m$@\033[0;33m...\033[0m\r" +LINK_OK = printf "\033[K\033[0;32mSuccessfully linked \033[1;32m$(a)\033[0;32m.\033[0m\n" +LINK_FAILED = printf "\033[K\033[0;31mFailed to link \033[1;31m$@\033[0;31m!\033[0m\n"; exit 1 +INSTALL_STATUS = printf "\033[K\033[0;33mInstalling \033[1;33m$$i\033[0;33m...\033[0m\r" +INSTALL_OK = printf "\033[K\033[0;32mSuccessfully installed \033[1;32m$$i\033[0;32m.\033[0m\n" +INSTALL_FAILED = printf "\033[K\033[0;31mFailed to install \033[1;31m$$i\033[0;31m!\033[0m\n"; exit 1 +DELETE_OK = printf "\033[K\033[0;34mDeleted \033[1;34m$$i\033[0;34m.\033[0m\n" +DELETE_FAILED = printf "\033[K\033[0;31mFailed to delete \033[1;31m$$i\033[0;31m!\033[0m\n"; exit 1 + +-include .deps Deleted: branches/osx_newbuildsys/config.h.in =================================================================== --- branches/osx_newbuildsys/config.h.in 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/config.h.in 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,95 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* always defined to indicate that i18n is enabled */ -#undef ENABLE_NLS - -/* Gettext package */ -#undef GETTEXT_PACKAGE - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#undef HAVE_BIND_TEXTDOMAIN_CODESET - -/* Define to 1 if you have the `dcgettext' function. */ -#undef HAVE_DCGETTEXT - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define if your <locale.h> file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define to 1 if you have the <libintl.h> header file. */ -#undef HAVE_LIBINTL_H - -/* Define to 1 if you have the `X11' library (-lX11). */ -#undef HAVE_LIBX11 - -/* Define to 1 if you have the `Xext' library (-lXext). */ -#undef HAVE_LIBXEXT - -/* Define to 1 if you have the `Xss' library (-lXss). */ -#undef HAVE_LIBXSS - -/* Define to 1 if you have the <locale.h> header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Version number of package */ -#undef VERSION - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const Modified: branches/osx_newbuildsys/configure.ac =================================================================== --- branches/osx_newbuildsys/configure.ac 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/configure.ac 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,18 +1,11 @@ AC_INIT([Gajim - A Jabber Instant Messager], [0.12-alpha1],[http://trac.gajim.org/],[gajim]) AC_PREREQ([2.59]) -AM_INIT_AUTOMAKE([1.8]) AC_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR([m4]) -AM_MAINTAINER_MODE -dnl Make Objective-C work with automake -AM_CONDITIONAL([am__fastdepOBJC], false) - -IT_PROG_INTLTOOL([0.35.0]) PKG_PROG_PKG_CONFIG([0.19]) -AM_DISABLE_STATIC AC_ENABLE_SHARED(yes) AC_ENABLE_STATIC(no) @@ -25,6 +18,7 @@ AC_CHECK_HEADERS([libintl.h]) AC_PATH_X +IT_PROG_INTLTOOL([0.35.0]) GETTEXT_PACKAGE=gajim AC_SUBST([GETTEXT_PACKAGE]) @@ -221,21 +215,9 @@ AS_AC_EXPAND(DOCDIR, "${DOCDIR}") AC_CONFIG_FILES([ - Makefile - data/Makefile - data/glade/Makefile - data/emoticons/Makefile - data/pixmaps/Makefile - data/iconsets/Makefile - data/moods/Makefile - data/activities/Makefile + buildsys.mk data/gajim.desktop.in data/defs.py - src/Makefile - src/common/Makefile - src/osx/Makefile - src/osx/growl/Makefile - src/osx/syncmenu/Makefile scripts/gajim scripts/gajim-remote po/Makefile.in Deleted: branches/osx_newbuildsys/data/Makefile.am =================================================================== --- branches/osx_newbuildsys/data/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/data/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,38 +0,0 @@ -SUBDIRS = glade emoticons pixmaps iconsets moods activities -@INTLTOOL_DESKTOP_RULE@ - -desktopdir = $(datadir)/applications -desktop_in_files = gajim.desktop.in.in -desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) - -installdefsdir = $(pkgdatadir)/src/common -installdefs_DATA = defs.py - -soundsdir = $(pkgdatadir)/data/sounds -sounds_DATA = $(srcdir)/sounds/*.wav - -otherdir = $(pkgdatadir)/data/other -other_DATA = other/servers.xml other/cacerts.pem - -if BUILD_REMOTE_CONTROL -OPTIONAL_MAN = gajim-remote.1 -else -OPTIONAL_MAN = -endif - -man_MANS = gajim.1 $(OPTIONAL_MAN) - - -EXTRA_DIST = $(desktop_in_files) \ - $(sounds_DATA) \ - $(other_DATA) \ - $(man_MANS) \ - defs.py.in - - -DISTCLEANFILES = $(desktop_DATA) \ - $(installdefs_DATA) - -CLEANFILES = gajim.desktop - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/data/activities/Makefile.am =================================================================== --- branches/osx_newbuildsys/data/activities/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/data/activities/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,38 +0,0 @@ -activitiesdir = $(pkgdatadir)/data/activities - -activities_DATA = - -ACTIVITIES_DIRS = **/** - -ACTIVITIES_FILES = **/**/{*.png,*.gif} - - -install-data-local: - @for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/activities/$$d || exit 1; \ - fi; \ - done; \ - for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f"; \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/activities/$$f || exit 1; \ - fi; \ - done; - -dist-hook: - @for d in $$(cd $(srcdir); echo $(ACTIVITIES_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkdir_p) $(distdir)/$$d"; \ - $(mkdir_p) $(distdir)/$$d || exit 1; \ - fi; \ - done; \ - for f in $$(cd $(srcdir); echo $(ACTIVITIES_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ - cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ - fi; \ - done; - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/data/emoticons/Makefile.am =================================================================== --- branches/osx_newbuildsys/data/emoticons/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/data/emoticons/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,38 +0,0 @@ -emoticonsdir = $(pkgdatadir)/data/emoticons - -emoticons_DATA = - -EMOTICONS_DIRS = ** - -EMOTICONS_FILES = **/{*.png,*.gif,emoticons.py} - - -install-data-local: - @for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/emoticons/$$d || exit 1; \ - fi; \ - done; \ - for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f"; \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/emoticons/$$f || exit 1; \ - fi; \ - done; - -dist-hook: - @for d in $$(cd $(srcdir); echo $(EMOTICONS_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkdir_p) $(distdir)/$$d"; \ - $(mkdir_p) $(distdir)/$$d || exit 1; \ - fi; \ - done; \ - for f in $$(cd $(srcdir); echo $(EMOTICONS_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ - cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ - fi; \ - done; - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/data/glade/Makefile.am =================================================================== --- branches/osx_newbuildsys/data/glade/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/data/glade/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,8 +0,0 @@ - -gladedir = $(pkgdatadir)/data/glade -glade_DATA = $(srcdir)/*.glade -EXTRA_DIST = $(glade_DATA) - -DISTCLEANFILES = *.h - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/data/iconsets/Makefile.am =================================================================== --- branches/osx_newbuildsys/data/iconsets/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/data/iconsets/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,39 +0,0 @@ -iconsetdir = $(pkgdatadir)/data/iconsets - -iconset_DATA = - -ICONSET_DIRS = **/{16x16,32x32,48x48} \ - transports/**/{16x16,32x32,48x48} - -ICONSET_FILES = **/{16x16,32x32,48x48}/{*.gif,*.png} \ - transports/**/{16x16,32x32,48x48}/{*.gif,*.png} - -install-data-local: - @for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/iconsets/$$d || exit 1; \ - fi; \ - done - for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f"; \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/iconsets/$$f || exit 1; \ - fi; \ - done; - -dist-hook: - @for d in $$(cd $(srcdir); echo $(ICONSET_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkdir_p) $(distdir)/$$d"; \ - $(mkdir_p) $(distdir)/$$d || exit 1; \ - fi; \ - done - for f in $$(cd $(srcdir); echo $(ICONSET_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ - cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ - fi; \ - done; - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/data/moods/Makefile.am =================================================================== --- branches/osx_newbuildsys/data/moods/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/data/moods/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,38 +0,0 @@ -moodsdir = $(pkgdatadir)/data/moods - -moods_DATA = - -MOODS_DIRS = ** - -MOODS_FILES = **/{*.png,*.gif} - - -install-data-local: - @for d in $$(cd $(srcdir); echo $(MOODS_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/moods/$$d"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/data/moods/$$d || exit 1; \ - fi; \ - done; \ - for f in $$(cd $(srcdir); echo $(MOODS_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/moods/$$f"; \ - $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgdatadir)/data/moods/$$f || exit 1; \ - fi; \ - done; - -dist-hook: - @for d in $$(cd $(srcdir); echo $(MOODS_DIRS));do \ - if test -d $(srcdir)/$$d;then \ - echo " $(mkdir_p) $(distdir)/$$d"; \ - $(mkdir_p) $(distdir)/$$d || exit 1; \ - fi; \ - done; \ - for f in $$(cd $(srcdir); echo $(MOODS_FILES));do \ - if test -f $(srcdir)/$$f; then \ - echo " cp -pR $(srcdir)/$$f $(distdir)/$$f"; \ - cp -pR $(srcdir)/$$f $(distdir)/$$f || exit 1; \ - fi; \ - done; - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/data/pixmaps/Makefile.am =================================================================== --- branches/osx_newbuildsys/data/pixmaps/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/data/pixmaps/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,17 +0,0 @@ -pixmapsdir = $(pkgdatadir)/data/pixmaps -pixmaps_DATA = $(srcdir)/*.png \ - gajim.ico - -pixmapseventsdir = $(pkgdatadir)/data/pixmaps/events -pixmapsevents_DATA = $(srcdir)/events/*.png - -pixmapsagentsdir = $(pkgdatadir)/data/pixmaps/agents -pixmapsagents_DATA = $(srcdir)/agents/*.png - -EXTRA_DIST = $(pixmaps_DATA) $(pixmapsevents_DATA) $(pixmapsagents_DATA) - -gajimpixmapdir = $(datadir)/pixmaps -gajimpixmap_DATA = gajim.png \ - gajim_about.png - -MAINTAINERCLEANFILES = Makefile.in Added: branches/osx_newbuildsys/m4/buildsys.m4 =================================================================== --- branches/osx_newbuildsys/m4/buildsys.m4 (rev 0) +++ branches/osx_newbuildsys/m4/buildsys.m4 2008-08-24 08:15:56 UTC (rev 10271) @@ -0,0 +1,134 @@ +dnl +dnl Copyright (c) 2007 - 2008, Jonathan Schleifer <js-buildsys(a)webkeks.org> +dnl +dnl https://webkeks.org/hg/buildsys/ +dnl +dnl Permission to use, copy, modify, and/or distribute this software for any +dnl purpose with or without fee is hereby granted, provided that the above +dnl copyright notice and this permission notice is present in all copies. +dnl +dnl THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +dnl AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +dnl ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +dnl LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +dnl CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +dnl SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +dnl CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +dnl POSSIBILITY OF SUCH DAMAGE. +dnl + +AC_DEFUN([BUILDSYS_PROG_IMPLIB], [ + AC_MSG_CHECKING(whether we need an implib) + case "$target" in + *-*-cygwin | *-*-mingw32) + AC_MSG_RESULT(yes) + PROG_IMPLIB_NEEDED='yes' + PROG_IMPLIB_LDFLAGS='-Wl,-export-all-symbols,--out-implib,lib${PROG}.a' + ;; + *) + AC_MSG_RESULT(no) + PROG_IMPLIB_NEEDED='no' + PROG_IMPLIB_LDFLAGS='' + ;; + esac + + AC_SUBST(PROG_IMPLIB_NEEDED) + AC_SUBST(PROG_IMPLIB_LDFLAGS) +]) + +AC_DEFUN([BUILDSYS_SHARED_LIB], [ + AC_MSG_CHECKING(for shared library system) + case "$target" in + intel-apple-*) + AC_MSG_RESULT([Mac OS X (Intel)]) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='-fPIC' + LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}' + LIB_PREFIX='lib' + LIB_SUFFIX='.dylib' + PLUGIN_CPPFLAGS='' + PLUGIN_CFLAGS='' + PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress' + PLUGIN_SUFFIX='.impl' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' + CLEAN_LIB='' + ;; + *-apple-*) + AC_MSG_RESULT(Mac OS X) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='' + LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB}' + LIB_PREFIX='lib' + LIB_SUFFIX='.dylib' + PLUGIN_CPPFLAGS='' + PLUGIN_CFLAGS='' + PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress' + PLUGIN_SUFFIX='.impl' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib' + CLEAN_LIB='' + ;; + *-*-solaris* | *-openbsd-* | *-mirbsd-*) + AC_MSG_RESULT(Solaris) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='-fPIC' + LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}' + LIB_PREFIX='lib' + LIB_SUFFIX='.so' + PLUGIN_CPPFLAGS='-DPIC' + PLUGIN_CFLAGS='-fPIC' + PLUGIN_LDFLAGS='-shared -fPIC' + PLUGIN_SUFFIX='.so' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}' + CLEAN_LIB='' + ;; + *-*-cygwin | *-*-mingw32) + AC_MSG_RESULT(Win32) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='' + LIB_LDFLAGS='-shared -Wl,--out-implib,${LIB}.a' + LIB_PREFIX='lib' + LIB_SUFFIX='.dll' + PLUGIN_CPPFLAGS='' + PLUGIN_CFLAGS='' + PLUGIN_LDFLAGS='-shared' + PLUGIN_SUFFIX='.dll' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a' + UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a' + CLEAN_LIB='${LIB}.a' + ;; + *) + AC_MSG_RESULT(POSIX) + LIB_CPPFLAGS='-DPIC' + LIB_CFLAGS='-fPIC' + LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}' + LIB_PREFIX='lib' + LIB_SUFFIX='.so' + PLUGIN_CPPFLAGS='-DPIC' + PLUGIN_CFLAGS='-fPIC' + PLUGIN_LDFLAGS='-shared -fPIC' + PLUGIN_SUFFIX='.so' + INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i' + UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0' + CLEAN_LIB='' + ;; + esac + + AC_SUBST(LIB_CPPFLAGS) + AC_SUBST(LIB_CFLAGS) + AC_SUBST(LIB_LDFLAGS) + AC_SUBST(LIB_PREFIX) + AC_SUBST(LIB_SUFFIX) + AC_SUBST(PLUGIN_CPPFLAGS) + AC_SUBST(PLUGIN_CFLAGS) + AC_SUBST(PLUGIN_LDFLAGS) + AC_SUBST(PLUGIN_SUFFIX) + AC_SUBST(INSTALL_LIB) + AC_SUBST(UNINSTALL_LIB) + AC_SUBST(CLEAN_LIB) +]) Deleted: branches/osx_newbuildsys/src/Makefile.am =================================================================== --- branches/osx_newbuildsys/src/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/src/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,77 +0,0 @@ -SUBDIRS = common osx - -CLEANFILES = \ - trayicon.c -INCLUDES = \ - $(PYTHON_INCLUDES) -export MACOSX_DEPLOYMENT_TARGET=10.4 - -if BUILD_GTKSPELL -gtkspelllib_LTLIBRARIES = gtkspell.la -gtkspelllibdir = $(libdir)/gajim - -gtkspell_la_LIBADD = \ - $(GTKSPELL_LIBS) $(PYGTK_LIBS) - -gtkspell_la_SOURCES = \ - gtkspellmodule.c - -gtkspell_la_LDFLAGS = \ - -module -avoid-version - -gtkspell_la_CFLAGS = $(GTKSPELL_CFLAGS) $(PYGTK_CFLAGS) -endif -if BUILD_TRAYICON -trayiconlib_LTLIBRARIES = trayicon.la -trayiconlibdir = $(libdir)/gajim -trayicon_la_LIBADD = $(PYGTK_LIBS) -trayicon_la_SOURCES = \ - eggtrayicon.c \ - trayiconmodule.c - -nodist_trayicon_la_SOURCES = \ - trayicon.c - -trayicon_la_LDFLAGS = \ - -module -avoid-version -trayicon_la_CFLAGS = $(PYGTK_CFLAGS) - -trayicon.c: - pygtk-codegen-2.0 --prefix trayicon \ - --register $(PYGTK_DEFS)/gdk-types.defs \ - --register $(PYGTK_DEFS)/gtk-types.defs \ - --override $(srcdir)/trayicon.override \ - $(srcdir)/trayicon.defs > $@ -endif -gajimsrcdir = $(pkgdatadir)/src -gajimsrc_PYTHON = $(srcdir)/*.py - -gajimsrc1dir = $(pkgdatadir)/src/common -gajimsrc1_PYTHON = \ - $(srcdir)/common/*.py - -gajimsrc2dir = $(pkgdatadir)/src/common/xmpp -gajimsrc2_PYTHON = \ - $(srcdir)/common/xmpp/*.py - -gajimsrc3dir = $(pkgdatadir)/src/common/zeroconf -gajimsrc3_PYTHON = \ - $(srcdir)/common/zeroconf/*.py - -DISTCLEANFILES = - -EXTRA_DIST = $(gajimsrc_PYTHON) \ - $(gajimsrc1_PYTHON) \ - $(gajimsrc2_PYTHON) \ - $(gajimsrc3_PYTHON) \ - gtkspellmodule.c \ - eggtrayicon.c \ - trayiconmodule.c \ - eggtrayicon.h \ - trayicon.defs \ - trayicon.override - -dist-hook: - rm -f $(distdir)/ipython_view.py - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/src/common/Makefile.am =================================================================== --- branches/osx_newbuildsys/src/common/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/src/common/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,22 +0,0 @@ - -INCLUDES = \ - $(PYTHON_INCLUDES) -if BUILD_IDLE -idlelib_LTLIBRARIES = idle.la -idlelibdir = $(libdir)/gajim - -idle_la_LIBADD = $(XSCRNSAVER_LIBS) - -idle_la_SOURCES = idle.c - -idle_la_LDFLAGS = \ - -module -avoid-version - -idle_la_CFLAGS = $(XSCRNSAVER_CFLAGS) $(PYTHON_INCLUDES) -endif - -DISTCLEANFILES = - -EXTRA_DIST = - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/src/osx/Makefile.am =================================================================== --- branches/osx_newbuildsys/src/osx/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/src/osx/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,45 +0,0 @@ -SUBDIRS = growl syncmenu - -ACLOCAL_AMFLAGS = -I ../m4 - -OBJC = gcc - -export MACOSX_DEPLOYMENT_TARGET=10.4 -INCLUDES = \ - $(PYTHON_INCLUDES) - -if BUILD_IDLE_OSX -idlelib_LTLIBRARIES = idle.la -idlelibdir = $(libdir)/gajim - -idle_la_LIBADD = $(CARBON_LIBS) - -idle_la_SOURCES = idle.c - -idle_la_LDFLAGS = \ - -module -avoid-version -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 - -idle_la_CFLAGS = -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(PYTHON_INCLUDES) -endif - -if BUILD_COCOA -nsapplib_LTLIBRARIES = nsapp.la -nsapplibdir = $(libdir)/gajim - -nsapp_la_LIBADD = $(COCOA_LIBS) - -nsapp_la_SOURCES = nsapp.m - -nsapp_la_LDFLAGS = \ - -module -avoid-version -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 - -nsapp_la_CFLAGS = -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(PYTHON_INCLUDES) - -AM_OBJCFLAGS = $(nsapp_la_CFLAGS) -endif - -DISTCLEANFILES = - -EXTRA_DIST = - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/src/osx/growl/Makefile.am =================================================================== --- branches/osx_newbuildsys/src/osx/growl/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/src/osx/growl/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,41 +0,0 @@ -OBJC = gcc - -export MACOSX_DEPLOYMENT_TARGET=10.4 -INCLUDES = \ - $(PYTHON_INCLUDES) - -if BUILD_CARBON -_growllib_LTLIBRARIES = _growl.la -_growllibdir = $(libdir)/gajim - -_growl_la_LIBADD = $(CARBON_LIBS) - -_growl_la_SOURCES = _growl.c - -_growl_la_LDFLAGS = \ - -module -avoid-version -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 - -_growl_la_CFLAGS = -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(PYTHON_INCLUDES) -endif - -if BUILD_COCOA -_growlImagelib_LTLIBRARIES = _growlImage.la -_growlImagelibdir = $(libdir)/gajim - -_growlImage_la_LIBADD = $(COCOA_LIBS) - -_growlImage_la_SOURCES = _growlImage.m - -_growlImage_la_LDFLAGS = \ - -module -avoid-version -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 - -_growlImage_la_CFLAGS = -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(PYTHON_INCLUDES) - -AM_OBJCFLAGS = $(_growlImage_la_CFLAGS) -endif - -DISTCLEANFILES = - -EXTRA_DIST = - -MAINTAINERCLEANFILES = Makefile.in Deleted: branches/osx_newbuildsys/src/osx/syncmenu/Makefile.am =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/Makefile.am 2008-08-24 07:47:29 UTC (rev 10270) +++ branches/osx_newbuildsys/src/osx/syncmenu/Makefile.am 2008-08-24 08:15:56 UTC (rev 10271) @@ -1,21 +0,0 @@ -GTKPATH="/Library/Frameworks/GTK+.framework/Versions/Current/bin" - -export MACOSX_DEPLOYMENT_TARGET=10.4 -INCLUDES = $(PYTHON_INCLUDES) - -GTKLDFLAGS=`$(GTKPATH)/pkg-config --libs gtk+-2.0 pygobject-2.0` -GTKCFLAGS=`$(GTKPATH)/pkg-config --cflags gtk+-2.0 pygobject-2.0` - -if BUILD_COCOA -syncmenulib_LTLIBRARIES = syncmenu.la -syncmenulibdir = $(libdir)/gajim -syncmenu_la_SOURCES = sync-menu.c pysyncmenu.c -syncmenu_la_LDFLAGS = -module -avoid-version -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(GTKLDFLAGS) -syncmenu_la_CFLAGS = -Xcompiler -isysroot -Xcompiler /Developer/SDKs/MacOSX10.4u.sdk -Xcompiler -arch -Xcompiler ppc -Xcompiler -arch -Xcompiler i386 $(GTKCFLAGS) -Wall -g $(INCLUDES) -endif - -DISTCLEANFILES = - -EXTRA_DIST = - -MAINTAINERCLEANFILES = Makefile.in

1 0

[commit-gajim] r10270 - branches
by js＠gajim.org 24 Aug '08

24 Aug '08

Author: js Date: 2008-08-24 09:47:29 +0200 (Sun, 24 Aug 2008) New Revision: 10270 Added: branches/osx_newbuildsys/ Log: Create branch with new build system & better OS X support. (Sorry, that buildsys annoys too hard on OS X, so I will try to port it to something I am more familiar with and that works well on OS X)

1 0

[commit-gajim] r10269 - trunk/src
by js＠gajim.org 24 Aug '08

24 Aug '08

Author: js Date: 2008-08-24 08:15:14 +0200 (Sun, 24 Aug 2008) New Revision: 10269 Modified: trunk/src/gajim.py Log: Small fix for OS X. Without it, Gajim won't restart if it crashed. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-08-22 03:15:54 UTC (rev 10268) +++ trunk/src/gajim.py 2008-08-24 06:15:14 UTC (rev 10269) @@ -331,8 +331,11 @@ return True return False elif sys.platform == 'darwin': - from osx import checkPID - return checkPID(pid, 'Gajim.bin') + try: + from osx import checkPID + return checkPID(pid, 'Gajim.bin') + except ImportError: + return try: if not os.path.exists('/proc'): return True # no /proc, assume Gajim is running

1 0

[commit-gajim] r10268 - trunk/src
by nicfit＠gajim.org 22 Aug '08

22 Aug '08

Author: nicfit Date: 2008-08-22 05:15:54 +0200 (Fri, 22 Aug 2008) New Revision: 10268 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py Log: Updated copyright years for myself. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-22 03:03:15 UTC (rev 10267) +++ trunk/src/chat_control.py 2008-08-22 03:15:54 UTC (rev 10268) @@ -2,10 +2,10 @@ ## src/chat_control.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Copyright (C) 2006-2007 Travis Shirk <travis AT pobox.com> ## Copyright (C) 2006-2008 Yann Leboulanger <asterix AT lagaule.org> ## Jean-Marie Traissard <jim AT lapin.org> ## Nikos Kouremenos <kourem AT gmail.com> +## Travis Shirk <travis AT pobox.com> ## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> ## Julien Pivotto <roidelapluie AT gmail.com> ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-22 03:03:15 UTC (rev 10267) +++ trunk/src/groupchat_control.py 2008-08-22 03:15:54 UTC (rev 10268) @@ -5,8 +5,8 @@ ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Alex Mauer <hawke AT hawkesnest.net> -## Travis Shirk <travis AT pobox.com> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Travis Shirk <travis AT pobox.com> ## Copyright (C) 2007-2008 Julien Pivotto <roidelapluie AT gmail.com> ## Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com>

1 0

[commit-gajim] r10267 - trunk/src
by nicfit＠gajim.org 22 Aug '08

22 Aug '08

Author: nicfit Date: 2008-08-22 05:03:15 +0200 (Fri, 22 Aug 2008) New Revision: 10267 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py trunk/src/message_window.py Log: Make the message control text entry grab focus when new controls are created and each time the tabs are switched. Fixes #4227 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-08-21 16:05:56 UTC (rev 10266) +++ trunk/src/chat_control.py 2008-08-22 03:03:15 UTC (rev 10267) @@ -304,6 +304,7 @@ self.user_nick = None self.smooth = True + self.msg_textview.grab_focus() def on_msg_textview_populate_popup(self, textview, menu): '''we override the default context menu and we prepend an option to switch languages''' @@ -1155,6 +1156,7 @@ self.update_ui() # restore previous conversation self.restore_conversation() + self.msg_textview.grab_focus() def update_toolbar(self): # Add to roster Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-08-21 16:05:56 UTC (rev 10266) +++ trunk/src/groupchat_control.py 2008-08-22 03:03:15 UTC (rev 10267) @@ -367,7 +367,7 @@ gajim.gc_connected[self.account][self.room_jid] = False # disable win, we are not connected yet - ChatControlBase.got_disconnected(self) + ChatControlBase.got_disconnected(self) self.update_ui() self.conv_textview.tv.grab_focus() @@ -890,6 +890,8 @@ if self.parent_win: self.parent_win.redraw_tab(self) + self.msg_textview.grab_focus() + def got_disconnected(self): self.list_treeview.get_model().clear() nick_list = gajim.contacts.get_nick_list(self.account, self.room_jid) Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-08-21 16:05:56 UTC (rev 10266) +++ trunk/src/message_window.py 2008-08-22 03:03:15 UTC (rev 10267) @@ -730,6 +730,10 @@ new_ctrl.set_control_active(True) self.show_title(control = new_ctrl) + control = self.get_active_control() + if isinstance(control, ChatControlBase): + control.msg_textview.grab_focus() + def _on_notebook_key_press(self, widget, event): # Ctrl+PageUP / DOWN has to be handled by notebook if (event.state & gtk.gdk.CONTROL_MASK and @@ -986,9 +990,6 @@ if not self.one_window_opened(contact, acct, type): self._resize_window(win, acct, type) self._position_window(win, acct, type) - #FIXME: make sure when first chat tab is shown textview grabs focus - #this wont work but something close to that should be fine: - # win.window.grab_focus() self._windows[win_key] = win return win

1 0

[commit-gajim] r10266 - trunk
by roidelapluie＠gajim.org 21 Aug '08

21 Aug '08

Author: roidelapluie Date: 2008-08-21 18:05:56 +0200 (Thu, 21 Aug 2008) New Revision: 10266 Modified: trunk/ChangeLog Log: improve Changelog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-20 20:46:56 UTC (rev 10265) +++ trunk/ChangeLog 2008-08-21 16:05:56 UTC (rev 10266) @@ -8,7 +8,7 @@ * Improve GPG support (#2390, #2783) * Ability to disable message previews in notify popups - * GROUPCHATS + * GROUP CHATS * Support for sending files over group chats * List of bookmarked rooms is now sorted alphabetically * Support for transforming a one-to-one chat into a groupchat @@ -32,7 +32,6 @@ * Preferences window redesign * New GUI for chat window * Roster treeview now uses modelfilter (way way much faster) - * * OTHER * Support of PEP (Personal Eventing Protocol) (XEP-0163) @@ -44,7 +43,7 @@ * Modified the format of emoticons list file, so we can choose the default code (#3696) * New Remote Controlling Option (XEP-0146): forward unread messages * Support for User Search (XEP-0055) - * Support for jabber:x:data in message elements (Part of XEP-OO04) + * Support for jabber:x:data in message elements (Part of XEP-0004) * Added a «supported features» window * Latex support (#2796) * Link-local messaging with Windows (#2883)

1 0

[commit-gajim] r10265 - trunk
by nk＠gajim.org 20 Aug '08

20 Aug '08

Author: nk Date: 2008-08-20 22:46:56 +0200 (Wed, 20 Aug 2008) New Revision: 10265 Modified: trunk/ChangeLog Log: fix language and speak better in the ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-20 20:36:34 UTC (rev 10264) +++ trunk/ChangeLog 2008-08-20 20:46:56 UTC (rev 10265) @@ -1,4 +1,4 @@ -Gajim 0.12-alpha1 (XX augustus 2008) +Gajim 0.12-alpha1 (12 August 2008) * Change licence from GPLv2 to GPLv3 @@ -9,17 +9,17 @@ * Ability to disable message previews in notify popups * GROUPCHATS - * Support for sending files over groupchats + * Support for sending files over group chats * List of bookmarked rooms is now sorted alphabetically * Support for transforming a one-to-one chat into a groupchat * Send invitation by drag-and-dropping a contact from roster * Send messages to conference using gajim-remote * Ability to destroy a room when we are owner, give a reason and alternative room jid - * Ability to minimize groupchats in roster + * Ability to minimize group chats in roster * USABILITY - * Files transferts by drang and dropping - * Ability to select statuses and to click url's in chat windows (using libsexy) + * Files transfers using drag and drop + * Ability to select and interact with status messages in chat windows (using libsexy) * Ability to set a custom avatar for a contact * Better handling of resource collisions * Option to Sign On as a Certain Status (#3314) @@ -30,8 +30,8 @@ * Close change status windows after 15 seconds of inactivity * Simplified "Accounts" dialog * Preferences window redesign - * New GUI for chat dialog - * Roster treeview now uses modelfilter (faster) + * New GUI for chat window + * Roster treeview now uses modelfilter (way way much faster) * * OTHER

1 0

[commit-gajim] r10264 - trunk/src
by nk＠gajim.org 20 Aug '08

20 Aug '08

Author: nk Date: 2008-08-20 22:36:34 +0200 (Wed, 20 Aug 2008) New Revision: 10264 Modified: trunk/src/message_window.py Log: commit a FIXME Modified: trunk/src/message_window.py =================================================================== --- trunk/src/message_window.py 2008-08-20 20:07:18 UTC (rev 10263) +++ trunk/src/message_window.py 2008-08-20 20:36:34 UTC (rev 10264) @@ -986,6 +986,9 @@ if not self.one_window_opened(contact, acct, type): self._resize_window(win, acct, type) self._position_window(win, acct, type) + #FIXME: make sure when first chat tab is shown textview grabs focus + #this wont work but something close to that should be fine: + # win.window.grab_focus() self._windows[win_key] = win return win

1 0

[commit-gajim] r10263 - trunk/src
by nk＠gajim.org 20 Aug '08

20 Aug '08

Author: nk Date: 2008-08-20 22:07:18 +0200 (Wed, 20 Aug 2008) New Revision: 10263 Modified: trunk/src/roster_window.py Log: TODO -> FIXME; and a typo (aka yes you guessed it!: cosmetic) Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2008-08-19 21:46:40 UTC (rev 10262) +++ trunk/src/roster_window.py 2008-08-20 20:07:18 UTC (rev 10263) @@ -818,7 +818,7 @@ return False - # TODO: This function is yet unused! Port to new API + # FIXME: This function is yet unused! Port to new API def add_transport(self, jid, account): '''Add transport to roster and draw it. Return the added contact instance.''' @@ -3441,7 +3441,7 @@ def on_row_activated(self, widget, path): '''When an iter is activated (double-click or single click if gnome is - set this way''' + set this way)''' model = self.modelfilter account = model[path][C_ACCOUNT].decode('utf-8') type_ = model[path][C_TYPE]

1 0

[commit-gajim] r10262 - trunk
by roidelapluie＠gajim.org 19 Aug '08

19 Aug '08

Author: roidelapluie Date: 2008-08-19 23:46:40 +0200 (Tue, 19 Aug 2008) New Revision: 10262 Modified: trunk/ChangeLog Log: Update Changelog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-19 21:41:43 UTC (rev 10261) +++ trunk/ChangeLog 2008-08-19 21:46:40 UTC (rev 10262) @@ -32,10 +32,14 @@ * Preferences window redesign * New GUI for chat dialog * Roster treeview now uses modelfilter (faster) - * + * * OTHER - * Support of PEP (Personal Eventing Protocol) (XEP-0163, XEP-0107, XEP-0108, XEP-0118) + * Support of PEP (Personal Eventing Protocol) (XEP-0163) + * User Mood (XEP-0107) + * User Activity (XEP-0108) + * User Tune (XEP-0118) + * User Nickname (XEP-0172) * Support for Google Talk accounts with non gmail.com domain (+ GMail notifications) * Modified the format of emoticons list file, so we can choose the default code (#3696) * New Remote Controlling Option (XEP-0146): forward unread messages

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
28
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2008