SF.net SVN: geany: [1711] trunk
eht16 at users.sourceforge.net
eht16 at xxxxx
Tue Jul 17 08:21:20 UTC 2007
Revision: 1711
http://svn.sourceforge.net/geany/?rev=1711&view=rev
Author: eht16
Date: 2007-07-17 01:21:19 -0700 (Tue, 17 Jul 2007)
Log Message:
-----------
Add --disable-deprecated option to configure to build without deprecated GLib and GTK code.
Use intltool to make geany.desktop translatable
Rename geany.desktop.in to geany.desktop.in.in.
Add Makefile.in.in in po/ to get translation status from msgfmt when running make.
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.in
trunk/po/POTFILES.in
Added Paths:
-----------
trunk/geany.desktop.in.in
trunk/po/Makefile.in.in
Removed Paths:
-------------
trunk/geany.desktop.in
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-07-17 08:11:42 UTC (rev 1710)
+++ trunk/ChangeLog 2007-07-17 08:21:19 UTC (rev 1711)
@@ -7,6 +7,14 @@
* src/callbacks.c, src/ui_utils.c, src/utils.c:
Fix warnings about shadowing local variables.
* geany.glade, src/interface.c: Fix typo.
+ * configure.in, geany.desktop.in.in, Makefile.am, po/Makefile.in.in,
+ po/POTFILES.in:
+ Add --disable-deprecated option to configure to build without
+ deprecated GLib and GTK code.
+ Use intltool to make geany.desktop translatable
+ Rename geany.desktop.in to geany.desktop.in.in.
+ Add Makefile.in.in in po/ to get translation status from msgfmt
+ when running make.
2007-07-16 Enrico Tröger <enrico.troeger at uvena.de>
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-07-17 08:11:42 UTC (rev 1710)
+++ trunk/Makefile.am 2007-07-17 08:21:19 UTC (rev 1711)
@@ -30,9 +30,18 @@
README.I18N \
po/intl_stats.sh \
po/LINGUAS \
+ intltool-extract.in \
+ intltool-merge.in \
+ intltool-update.in \
$(SYS_DATA_FILES) \
$(WIN32_BUILD_FILES)
+DISTCLEANFILES = \
+ geany.desktop \
+ intltool-extract \
+ intltool-merge \
+ intltool-update
+
uninstall-local:
rm -rf $(DESTDIR)$(pkgdatadir);
rm $(DESTDIR)$(datadir)/pixmaps/geany.png;
@@ -87,3 +96,8 @@
Applicationsdir = $(datadir)/applications
Applications_DATA = geany.desktop
logodir = $(datadir)/pixmaps
+
+desktopdir = $(datadir)/applications
+desktop_in_files = geany.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2007-07-17 08:11:42 UTC (rev 1710)
+++ trunk/configure.in 2007-07-17 08:21:19 UTC (rev 1711)
@@ -4,10 +4,10 @@
AC_INIT(configure.in)
AM_INIT_AUTOMAKE(geany, 0.12)
-
AM_CONFIG_HEADER(config.h)
+# AC_USE_SYSTEM_EXTENSIONS combines AC_MINIX, AC_AIX and AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
-AC_ISC_POSIX
AC_PROG_CC
AM_CONDITIONAL(IS_COMPILER_GCC,test x$SSC == x)
@@ -15,10 +15,11 @@
AC_HEADER_STDC
AC_PROG_CXX
AC_PROG_CPP
-AC_PROG_RANLIB
+#AC_PROG_RANLIB
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+AC_PROG_INTLTOOL
# for plugins
AC_DISABLE_STATIC
@@ -79,6 +80,10 @@
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
+# --disable-deprecated switch for GTK2 purification
+AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ],
+ [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
+
# socket support
AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]),
[want_socket="$enableval"], [want_socket="yes"])
@@ -181,7 +186,7 @@
doc/Makefile
doc/geany.1
geany.spec
-geany.desktop
+geany.desktop.in
])
echo "----------------------------------------"
Deleted: trunk/geany.desktop.in
===================================================================
--- trunk/geany.desktop.in 2007-07-17 08:11:42 UTC (rev 1710)
+++ trunk/geany.desktop.in 2007-07-17 08:21:19 UTC (rev 1711)
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Name=Geany
-GenericName=Integrated Development Environment
-GenericName[de]=Integrierte Entwicklungsumgebung
-Comment=A fast and lightweight IDE using GTK2
-Comment[de]=Eine kleine und schnelle integrierte Entwicklungsumgebung
-Comment[pl]=Szybkie i lekkie IDE korzystające z GTK+2
-Exec=geany %F
-Icon=@GEANY_PIXMAPS_DIR@/geany.png
-Terminal=false
-Type=Application
-Categories=Application;GTK;Development;IDE;
-Encoding=UTF-8
-MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff;
-# currently false, changes perhaps in the future
-StartupNotify=false
-Version=1.1
Added: trunk/geany.desktop.in.in
===================================================================
--- trunk/geany.desktop.in.in (rev 0)
+++ trunk/geany.desktop.in.in 2007-07-17 08:21:19 UTC (rev 1711)
@@ -0,0 +1,14 @@
+[Desktop Entry]
+_Name=Geany
+_GenericName=Integrated Development Environment
+_Comment=A fast and lightweight IDE using GTK2
+Exec=geany %F
+Icon=@GEANY_PIXMAPS_DIR@/geany.png
+Terminal=false
+Type=Application
+Categories=Application;GTK;Development;IDE;
+Encoding=UTF-8
+MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff;
+# currently false, changes perhaps in the future
+StartupNotify=false
+Version=1.1
Added: trunk/po/Makefile.in.in
===================================================================
--- trunk/po/Makefile.in.in (rev 0)
+++ trunk/po/Makefile.in.in 2007-07-17 08:21:19 UTC (rev 1711)
@@ -0,0 +1,219 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
+#
+# This file file be copied and used freely without restrictions. It can
+# be used in projects which are not available under the GNU Public License
+# but which still want to provide support for the GNU gettext functionality.
+# Please note that the actual code is *not* freely available.
+#
+# - Modified by Owen Taylor <otaylor at redhat.com> to use GETTEXT_PACKAGE
+# instead of PACKAGE and to look for po2tbl in ./ not in intl/
+#
+# - Modified by jacob berkman <jacob at ximian.com> to install
+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
+#
+# - Modified by Rodney Dawes <dobey at novell.com> for use with intltool
+#
+# We have the following line for use by intltoolize:
+# INTLTOOL_MAKEFILE
+
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+datarootdir = @datarootdir@
+libdir = @libdir@
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+subdir = po
+install_sh = @install_sh@
+# Automake >= 1.8 provides @mkdir_p at .
+# Until it can be supposed, use the safe fallback:
+mkdir_p = $(install_sh) -d
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT_ARGS = @XGETTEXT_ARGS@
+XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS)
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+
+ALL_LINGUAS = @ALL_LINGUAS@
+
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+
+POTFILES = \
+# This comment gets stripped out
+
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+
+.SUFFIXES:
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
+
+.po.pox:
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+
+.po.mo:
+ $(MSGFMT) -o $@ $<
+
+.po.gmo:
+ file=`echo $* | sed 's,.*/,,'`.gmo \
+ && rm -f $$file && $(GMSGFMT) --statistics -o $$file $<
+
+.po.cat:
+ sed -f ../intl/po2msg.sed < $< > $*.msg \
+ && rm -f $@ && gencat $@ $*.msg
+
+
+all: all- at USE_NLS@
+
+all-yes: $(CATALOGS)
+all-no:
+
+$(GETTEXT_PACKAGE).pot: $(POTFILES)
+ $(GENPOT)
+
+install: install-data
+install-data: install-data- at USE_NLS@
+install-data-no: all
+install-data-yes: all
+ $(mkdir_p) $(DESTDIR)$(itlocaledir)
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $$dir; \
+ if test -r $$lang.gmo; then \
+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
+ else \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $(srcdir)/$$lang.gmo as" \
+ "$$dir/$(GETTEXT_PACKAGE).mo"; \
+ fi; \
+ if test -r $$lang.gmo.m; then \
+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+ else \
+ if test -r $(srcdir)/$$lang.gmo.m ; then \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
+ $$dir/$(GETTEXT_PACKAGE).mo.m; \
+ echo "installing $(srcdir)/$$lang.gmo.m as" \
+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
+ else \
+ true; \
+ fi; \
+ fi; \
+ done
+
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall:
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ done
+
+check: all $(GETTEXT_PACKAGE).pot
+ rm -f missing notexist
+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+ if [ -r missing -o -r notexist ]; then \
+ exit 1; \
+ fi
+
+mostlyclean:
+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+ rm -f .intltool-merge-cache
+
+clean: mostlyclean
+
+distclean: clean
+ rm -f Makefile Makefile.in POTFILES stamp-it
+ rm -f *.mo *.msg *.cat *.cat.m *.gmo
+
+maintainer-clean: distclean
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+ rm -f Makefile.in.in
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: $(DISTFILES)
+ dists="$(DISTFILES)"; \
+ extra_dists="$(EXTRA_DISTFILES)"; \
+ for file in $$extra_dists; do \
+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
+ done; \
+ for file in $$dists; do \
+ test -f $$file || file="$(srcdir)/$$file"; \
+ ln $$file $(distdir) 2> /dev/null \
+ || cp -p $$file $(distdir); \
+ done
+
+update-po: Makefile
+ $(MAKE) $(GETTEXT_PACKAGE).pot
+ tmpdir=`pwd`; \
+ linguas="$(USE_LINGUAS)"; \
+ for lang in $$linguas; do \
+ echo "$$lang:"; \
+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+ if $$result; then \
+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+ rm -f $$tmpdir/$$lang.new.po; \
+ else \
+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+ :; \
+ else \
+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ exit 1; \
+ fi; \
+ fi; \
+ else \
+ echo "msgmerge for $$lang.gmo failed!"; \
+ rm -f $$tmpdir/$$lang.new.po; \
+ fi; \
+ done
+
+Makefile POTFILES: stamp-it
+ @if test ! -f $@; then \
+ rm -f stamp-it; \
+ $(MAKE) stamp-it; \
+ fi
+
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+ $(SHELL) ./config.status
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2007-07-17 08:11:42 UTC (rev 1710)
+++ trunk/po/POTFILES.in 2007-07-17 08:21:19 UTC (rev 1711)
@@ -1,5 +1,6 @@
# List of source files containing translatable strings.
+geany.desktop.in
src/about.c
src/build.c
src/callbacks.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list