.gitignore

@@ -13,10 +13,12 @@ conftest.c
 conftest.err
 config.guess
 config.h.in
+config.h.in~
 config.h
 config.log
 config.status
 config.sub
+config-win32.h
 configure
 configure.tmp
 depcomp
@@ -30,19 +32,26 @@ m4/
 missing
 plugins/perl/irc.pm.h
 plugins/perl/xchat.pm.h
+plugins/perl/hexchat.pm.h
 po/Makefile.in.in
 po/POTFILES
 po/remove-potcdate.sed
-po/stamp-po
-share/pkgconfig/hexchat-plugin.pc
+po/stamp-*
+osx/Info.plist
+data/man/hexchat.1
+data/pkgconfig/hexchat-plugin.pc
+data/misc/hexchat.appdata.xml
+data/misc/hexchat.desktop
+data/misc/htm.desktop
 src/common/dbus/example
-src/common/dbus/marshallers.h
 src/common/dbus/org.hexchat.service.service
 src/common/dbus/remote-object-glue.h
 src/common/make-te
+src/common/marshal.*
 src/common/textenums.h
 src/common/textevents.h
 src/fe-gtk/hexchat
+src/fe-gtk/hexchat.rc
 src/fe-text/hexchat-text
 src/htm/Main.resources
 src/htm/thememan.exe
@@ -57,19 +66,27 @@ stamp-h1
 *.gmo
 *.mo
 *.po~
+*.pot
 *.patch
 # Win32 generated files
 plugins/wmpa/wmpa_h.h
 plugins/wmpa/wmpa_i.c
-src/pixmaps/inline_pngs.h
+src/fe-gtk/resources.c
 src/htm/obj/*
 win32/ipch/*
 win32/ext/perl/perl-x86-cache
 win32/ext/perl/perl-x86-SetupFiles
 win32/ext/perl/perl-x64-cache
 win32/ext/perl/perl-x64-SetupFiles
+win32/installer/hexchat.iss
 resource.h
 *.opensdf
 *.sdf
 *.suo
 *.user
+#OSX
+osx/HexChat.app
+osx/.HexChat.app
+po/.intltool-merge-cache
+*.zip
+*.dmg

.travis.yml

@@ -2,11 +2,11 @@ language: c
 compiler: gcc
 before_script:
     - sudo apt-get build-dep -qq xchat
-    - sudo apt-get install -qq libnotify-dev libproxy-dev libpci-dev libcanberra-dev monodevelop
+    - sudo apt-get install -qq libnotify-dev libproxy-dev libpci-dev libcanberra-dev monodevelop gnome-common
 script: 
     - ./autogen.sh
     - ./configure --enable-textfe --with-theme-manager
-    - make
+    - make V=1
 notifications:
     irc:
         channels: "chat.freenode.net#hexchat-devel"

Makefile.am

@@ -2,7 +2,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = po intl src plugins man share
+SUBDIRS = po src plugins data
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST = autogen.sh data
 

autogen.sh

@@ -1,113 +1,22 @@
-#!/bin/bash
-have_automake=false
+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
 
-if automake --version < /dev/null > /dev/null 2>&1 ; then
-	automake_version=`automake --version | grep 'automake (GNU automake)' | sed 's/^[^0-9]*\(.*\)/\1/'`
-	case $automake_version in
-	   1.2*|1.3*|1.4|1.4*|1.5*|1.6*|1.7*|1.8*)
-		;;
-	   *)
-		have_automake=true
-		;;
-	esac
-fi
-if $have_automake ; then
-	AUTOMAKE="automake"
-	ACLOCAL="aclocal"
-else
-	if automake-1.9 --version < /dev/null > /dev/null 2>&1 ; then
-		AUTOMAKE="automake-1.9"
-		ACLOCAL="aclocal-1.9"
-	else
-		echo "automake missing or too old. This requires at least automake 1.9"
-		exit 1
-	fi
-fi
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
 
-# ------ START GETTEXT ------
+NOCONFIGURE=1
+PKG_NAME="hexchat"
 
-echo searching for GNU gettext intl directory...
+(test -f $srcdir/src/common/hexchat.c) || {
+	echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+	echo " top-level $PKG_NAME directory"
+	exit 1
+}
 
-dirs="/usr/share /usr/local/share /opt/share /usr /usr/local /opt /usr/gnu/share /opt/local /opt/local/share"
-found=0
-for try in $dirs; do
-	echo -n " -> $try/gettext/intl... "
-	if test -d $try/gettext/intl; then
-		echo found it
-		found=1
-		break
-	fi
-	echo no
-done
-if test "$found" != 1; then
-	echo ERROR: Cannot find gettext/intl directory.
-	echo ERROR: Install GNU gettext in /usr or /usr/local prefix.
-	exit 7
-fi;
+which gnome-autogen.sh || {
+	echo "You need to install gnome-common"
+	exit 1
+}
 
-echo copying gettext intl files...
-if test -f $try/gettext/mkinstalldirs; then
-	ln -s $try/gettext/mkinstalldirs mkinstalldirs
-fi
-intldir="$try/gettext/intl"
-if test ! -d intl; then
-	mkdir intl
-fi
-olddir=`pwd`
-cd $intldir
-for file in *; do
-	if test $file != COPYING.LIB-2.0 && test $file != COPYING.LIB-2.1; then
-		rm -f $olddir/intl/$file
-		cp $intldir/$file $olddir/intl/
-	fi
-done
-cp -f $try/gettext/po/Makefile.in.in $olddir/po/
-cd $olddir
-if test -f intl/plural.c; then
-	sleep 2
-	touch intl/plural.c
-fi
+. gnome-autogen.sh
 
-# ------ END GETTEXT ------
-
-
-echo running $ACLOCAL...
-$ACLOCAL $ACLOCAL_FLAGS
-if test "$?" != "0"; then
-	echo aclocal failed, stopping.
-	exit 2
-fi
-echo running libtoolize...
-libtoolize --copy --force --install
-if test "$?" != "0"; then
-	echo libtoolize failed, stopping.
-	exit 3
-fi
-echo running autoheader...
-autoheader
-if test "$?" != "0"; then
-	echo autoheader failed, stopping.
-	exit 4
-fi
-echo running $AUTOMAKE...
-$AUTOMAKE -a -c
-if test "$?" != "0"; then
-	echo automake failed, stopping.
-	exit 5
-fi
-echo running autoconf...
-autoconf
-if test "$?" != "0"; then
-	echo autoconf failed, stopping.
-	exit 6
-fi
-
-echo if no errors occured, run ./configure
-exit 0
-
-#autogen.sh generates:
-#	aclocal.m4 Makefile.in config.guess config.sub ltmain.sh
-#	configure install-sh missing mkinstalldirs depcomp
-#
-#configure generates:
-#	config.status libtool Makefile.in

config-win32.h → config-win32.h.tt

@@ -3,16 +3,17 @@
 #define USE_GMODULE
 #define USE_PLUGIN
 #define USE_OPENSSL
-#define USE_LIBSEXY
 #define USE_IPV6
 #define HAVE_ISO_CODES
+#define ISO_CODES_PREFIX ".\\"
+#define ISO_CODES_LOCALEDIR LOCALEDIR
 #define PACKAGE_NAME "hexchat"
-#define PACKAGE_VERSION "2.9.6"
+#define PACKAGE_VERSION "<#= [string]::Join('.', $versionParts) #>"
 #define HEXCHATLIBDIR ".\\plugins"
 #define HEXCHATSHAREDIR "."
 #define OLD_PERL
 #define GETTEXT_PACKAGE "hexchat"
-#define PACKAGE_TARNAME "hexchat-2.9.6"
+#define PACKAGE_TARNAME "hexchat-<#= [string]::Join('.', $versionParts) #>"
 #ifndef USE_IPV6
 #define socklen_t int
 #endif