From a7f2bc97b24bb3893fe3aebf0af542f44245823d Mon Sep 17 00:00:00 2001 From: mdb Date: Sun, 17 Mar 2002 09:32:23 +0000 Subject: [PATCH] Removed C build system. Added wrapper script. git-svn-id: https://samskivert.googlecode.com/svn/trunk@663 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- projects/lookuplet/Makefile.am | 4 -- projects/lookuplet/acconfig.h | 7 --- projects/lookuplet/autogen.sh | 15 ------ projects/lookuplet/configure.in | 72 ------------------------- projects/lookuplet/debian/dirs | 1 + projects/lookuplet/debian/rules | 28 ++-------- projects/lookuplet/src/Makefile.am | 40 -------------- projects/lookuplet/src/python/lookuplet | 57 ++++++++++++++++++++ 8 files changed, 63 insertions(+), 161 deletions(-) delete mode 100644 projects/lookuplet/Makefile.am delete mode 100644 projects/lookuplet/acconfig.h delete mode 100755 projects/lookuplet/autogen.sh delete mode 100644 projects/lookuplet/configure.in delete mode 100644 projects/lookuplet/src/Makefile.am create mode 100755 projects/lookuplet/src/python/lookuplet diff --git a/projects/lookuplet/Makefile.am b/projects/lookuplet/Makefile.am deleted file mode 100644 index be1cd8fe..00000000 --- a/projects/lookuplet/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -# -# $Id: Makefile.am,v 1.3 2001/08/16 00:12:11 mdb Exp $ - -SUBDIRS = macros intl src diff --git a/projects/lookuplet/acconfig.h b/projects/lookuplet/acconfig.h deleted file mode 100644 index 68f5624f..00000000 --- a/projects/lookuplet/acconfig.h +++ /dev/null @@ -1,7 +0,0 @@ -#undef ENABLE_NLS -#undef HAVE_GETTEXT -#undef HAVE_CATGETS -#undef HAVE_LC_MESSAGES -#undef HAVE_LIBSM -#undef HAVE_LIBINTL_H -#undef VERSION diff --git a/projects/lookuplet/autogen.sh b/projects/lookuplet/autogen.sh deleted file mode 100755 index f3ec0a7d..00000000 --- a/projects/lookuplet/autogen.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="lookuplet" - -(test -f $srcdir/configure.in) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level directory" - exit 1 -} - -. $srcdir/macros/autogen.sh diff --git a/projects/lookuplet/configure.in b/projects/lookuplet/configure.in deleted file mode 100644 index df5e6b0d..00000000 --- a/projects/lookuplet/configure.in +++ /dev/null @@ -1,72 +0,0 @@ -dnl $Id: configure.in,v 1.4 2001/08/18 02:34:06 mdb Exp $ -dnl -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(configure.in) -AM_CONFIG_HEADER(config.h) - -dnl Version definitions -LKP_MAJOR=1 -LKP_REVISION=0 -LKP_PATCHLEVEL=fcs -LKP_RELEASE=1 -use_release=no - -dnl LKP_RELEASE must be specified (1 if nothing else), but -dnl change use_release depending on whether we want it to be -dnl appended to our official version. (no usually, yes for -dnl something like 'pre1' or 'beta4') - -if test x"$use_release" = xno ; then - brsffx= -else - brsffx="-${LKP_RELEASE}" -fi - -LKP_SHORT_VERSION="$LKP_MAJOR.$LKP_REVISION.${LKP_PATCHLEVEL}" -LKP_VERSION="$LKP_MAJOR.$LKP_REVISION.${LKP_PATCHLEVEL}${brsffx}" -VERSION="$LKP_VERSION" - -dnl Now that we have a version -AM_INIT_AUTOMAKE(lookuplet, [$VERSION]) - -AM_MAINTAINER_MODE -AM_ACLOCAL_INCLUDE(macros) -AC_ISC_POSIX - -GNOME_INIT(applets) - -dnl Check for programs -AC_PROG_CC -AM_PROG_CC_STDC -AM_PROG_LIBTOOL - -dnl this should come after `AC_PROG_CC' -GNOME_COMPILE_WARNINGS -GNOME_X_CHECKS - -dnl Checks for libraries. - -dnl Checks for header files. -AC_STDC_HEADERS -AC_CHECK_HEADERS(fcntl.h) - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_TYPE_SIZE_T - -dnl Checks for library functions. -AC_CHECK_FUNCS(strcspn strstr) - -dnl All the linguas, all the time. -ALL_LINGUAS="az ca cs da de en_GB el es et fi fr ga hu it ja ko lt nl no nn pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN.GB2312" -LINGUAS="$ALL_LINGUAS" -AM_GNOME_GETTEXT - -dnl Create files. -AC_OUTPUT([ -Makefile -macros/Makefile -intl/Makefile -src/Makefile -]) diff --git a/projects/lookuplet/debian/dirs b/projects/lookuplet/debian/dirs index 6e67b63e..adc5824e 100644 --- a/projects/lookuplet/debian/dirs +++ b/projects/lookuplet/debian/dirs @@ -1,2 +1,3 @@ usr/bin +usr/share/lookuplet usr/share/doc/lookuplet diff --git a/projects/lookuplet/debian/rules b/projects/lookuplet/debian/rules index 8175125e..feb7f8bc 100755 --- a/projects/lookuplet/debian/rules +++ b/projects/lookuplet/debian/rules @@ -6,33 +6,17 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -build: build-stamp -build-stamp: - dh_testdir - - ./configure --prefix=/usr --sysconfdir=/etc - # Add here commands to compile the package. - make CFLAGS="-O2 -g -Wall" - - touch build-stamp - clean: dh_testdir dh_testroot - rm -f build-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean - rm -f */.deps/* config.cache config.log config.status + -$(MAKE) clean dh_clean # Build architecture-independent files here. -binary-indep: build -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build +binary-indep: # dh_testversion dh_testdir dh_testroot @@ -50,7 +34,7 @@ binary-arch: build # dh_installmanpages dh_undocumented lookuplet.1 dh_installchangelogs - dh_strip +# dh_strip dh_compress dh_fixperms dh_installdeb @@ -60,8 +44,6 @@ binary-arch: build dh_md5sums dh_builddeb -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false +binary: binary-indep -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary +.PHONY: clean binary-indep binary diff --git a/projects/lookuplet/src/Makefile.am b/projects/lookuplet/src/Makefile.am deleted file mode 100644 index 3801e8d2..00000000 --- a/projects/lookuplet/src/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# -# $Id: Makefile.am,v 1.5 2002/03/14 16:45:26 shaper Exp $ - -bin_PROGRAMS = lookuplet - -lookuplet_SOURCES = \ - lookuplet.c \ - launcher.c \ - querybox.c \ - preferences.c \ - binding.c \ - keysym-util.c \ - history.c - -INCLUDES = \ - -I. \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -I$(top_srcdir) \ - $(GNOME_INCLUDEDIR) - -lookuplet_LDADD = \ - $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) \ - $(GNOME_APPLETS_LIBS) \ - $(INTLLIBS) - -# currently the installation of these bitmaps wouldn't be necessary -bitmapsdir = $(datadir)/pixmaps -bitmaps_DATA = gnome-lookuplet.xpm - -EXTRA_DIST = \ - lookuplet.desktop \ - lookuplet.gnorba \ - $(bitmaps_DATA) - -sysdir = $(datadir)/applets/Network -sys_DATA = lookuplet.desktop - -gnorbadir = $(sysconfdir)/CORBA/servers -gnorba_DATA = lookuplet.gnorba diff --git a/projects/lookuplet/src/python/lookuplet b/projects/lookuplet/src/python/lookuplet new file mode 100755 index 00000000..fe360b45 --- /dev/null +++ b/projects/lookuplet/src/python/lookuplet @@ -0,0 +1,57 @@ +#!/usr/bin/env python +# +# $Id: lookuplet,v 1.1 2002/03/17 09:32:23 mdb Exp $ +# +# lookuplet - a utility for quickly looking up information +# Copyright (C) 2001 Michael Bayne +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2.1 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import gnome.applet +import gtk +import libglade +import string +import sys +import re + +import bindings +import lookuplet +import properties + +# figure out where we were run from +basedir = sys.argv[0]; +basedir = re.sub("/lookuplet$", "", basedir); +basedir = re.sub("/bin$", "", basedir); + +# load up our glade UI definition +xmlui = libglade.GladeXML("lookuplet.glade"); + +# load up our bindings +bindings = bindings.BindingSet(); + +# figure out if we're an applet or not +appletMode = 0; +for arg in sys.argv: + if (arg.find("activate-goad-server") != -1): + appletMode = 1 + +# create our properties manager +props = properties.Properties(xmlui, bindings); + +# create our primary user interface +lookuplet = lookuplet.Lookuplet(xmlui, bindings, props, appletMode); + +# let GTK do its business +gtk.mainloop();