[xlibs-commit] xkbdesc .cvsignore,NONE,1.1 AUTHORS,NONE,1.1 Makefile.am,NONE,1.1 autogen.sh,NONE,1.1 configure.in,NONE,1.1 xfree86.xml.in,NONE,1.1 xfree86_xkb_xml.spec.in,NONE,1.1 xkb.dtd,NONE,1.1

Sergey V. Oudaltsov xlibs-commit@pdx.freedesktop.org
Tue, 25 Nov 2003 08:35:20 -0800
Previous message: [xlibs-commit] X11/nls/XI18N_OBJS Makefile,1.1.2.1,NONE
Next message: [xlibs-commit] xkbdesc/po - New directory
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Committed by: svu

Update of /cvs/xlibs/xkbdesc
In directory pdx:/tmp/cvs-serv28659

Added Files:
	.cvsignore AUTHORS Makefile.am autogen.sh configure.in 
	xfree86.xml.in xfree86_xkb_xml.spec.in xkb.dtd 
Log Message:
first batch of files - but no translation yet

--- NEW FILE: .cvsignore ---
ABOUT-NLS
ChangeLog
Makefile
Makefile.in
aclocal.m4
autom4te-2.53.cache
config.cache
config.log
config.rpath
config.status
configure
intl
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
m4
xfree86.xml
xfree86_xkb_xml.spec
autom4te.cache
mkinstalldirs

--- NEW FILE: AUTHORS ---
Ivan Pascal (pascal@info.tsu.ru)
Andriy Rysin (arysin@myrealbox.com)
Sergey V. Udaltsov (svu@users.sourceforge.net)

--- NEW FILE: Makefile.am ---
SUBDIRS = m4 po intl

xml_in_files = xfree86.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml) xkb.dtd

@INTLTOOL_XML_RULE@

EXTRA_DIST= config.rpath $(xml_in_files) $(xml_DATA) \
       autogen.sh \
       xfree86_xkb_xml.spec \
       xfree86_xkb_xml.spec.in \
       intltool-extract.in intltool-merge.in intltool-update.in

xmldir = $(xkb_base)/rules

ACLOCAL_AMFLAGS = -I m4

--- NEW FILE: autogen.sh ---
#!/bin/sh
# Run this to generate all the initial makefiles, etc.

DIE=0

srcdir=`dirname $0`
PKG_NAME=xfree86_xkb_xml

if [ -n "$GNOME2_PATH" ]; then
	ACLOCAL_FLAGS="-I $GNOME2_PATH/share/aclocal $ACLOCAL_FLAGS"
	PATH="$GNOME2_PATH/bin:$PATH"
	export PATH
fi

(autoconf --version) < /dev/null > /dev/null 2>&1 || {
  echo
  echo "**Error**: You must have \`autoconf' installed to compile $PKG_NAME."
  echo "Download the appropriate package for your distribution,"
  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
  DIE=1
}

(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
  (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
    echo 
    echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
    echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/intltool-0.10.tar.gz"
    echo "(or a newer version if it is available)"
    DIE=1
  }
}

(grep "^AM_PROG_XML_I18N_TOOLS" $srcdir/configure.in >/dev/null) && {
  (xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
    echo 
    echo "**Error**: You must have \`xml-i18n-toolize' installed to compile $PKG_NAME."
    echo "Get ftp://ftp.gnome.org/pub/GNOME/stable/sources/xml-i18n-tools/xml-i18n-tools-0.9.tar.gz"
    echo "(or a newer version of xml-i18n-tools or intltool if it is available)"
    DIE=1
  }
}

(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
  (libtool --version) < /dev/null > /dev/null 2>&1 || {
    echo
    echo "**Error**: You must have \`libtool' installed to compile $PKG_NAME."
    echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
    echo "(or a newer version if it is available)"
    DIE=1
  }
}

#grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
#  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
#  (gettext --version) < /dev/null > /dev/null 2>&1 || {
#    echo
#    echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
#    echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.10.39.tar.gz"
#    echo "(or a newer version if it is available)"
#    DIE=1
#  }
#}

#grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
#  grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
#  (gettext --version) < /dev/null > /dev/null 2>&1 || {
#    echo
#    echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
#    echo "Get ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.10.39.tar.gz"
#    echo "(or a newer version if it is available)"
#    DIE=1
#  }
#}

(automake --version) < /dev/null > /dev/null 2>&1 || {
  echo
  echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
  echo "(or a newer version if it is available)"
  DIE=1
  NO_AUTOMAKE=yes
}


# if no automake, don't bother testing for aclocal
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
  echo
  echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
  echo "installed doesn't appear recent enough."
  echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
  echo "(or a newer version if it is available)"
  DIE=1
}

if test "$DIE" -eq 1; then
  exit 1
fi

if test -z "$*"; then
  echo "**Warning**: I am going to run \`configure' with no arguments."
  echo "If you wish to pass any to it, please specify them on the"
  echo \`$0\'" command line."
  echo
fi

case $CC in
xlc )
  am_opt=--include-deps;;
esac

for coin in `find $srcdir -name configure.in -print`
do 
  dr=`dirname $coin`
  if test -f $dr/NO-AUTO-GEN; then
    echo skipping $dr -- flagged as no auto-gen
  else
    echo processing $dr
    macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin`
    ( cd $dr
      macrosdir=`find . -name macros -print`
      for i in $macrodirs; do
	if test -f $i/gnome-gettext.m4; then
	  DELETEFILES="$DELETEFILES $i/gnome-gettext.m4"
	fi
      done

      echo "deletefiles is $DELETEFILES"
      aclocalinclude="$ACLOCAL_FLAGS"
      for k in $aclocalinclude; do
  	if test -d $k; then
	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
	    rm -f $DELETEFILES
	  fi
        fi
      done
      for k in $macrodirs; do
  	if test -d $k; then
          aclocalinclude="$aclocalinclude -I $k"
	  if [ -f $k/gnome.m4 -a "$GNOME_INTERFACE_VERSION" = "1" ]; then
	    rm -f $DELETEFILES
	  fi
        fi
      done
      if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
	if grep "sed.*POTFILES" configure.in >/dev/null; then
	  : do nothing -- we still have an old unmodified configure.in
	else
	  echo "Creating $dr/aclocal.m4 ..."
	  test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
	  echo "Running gettextize...  Ignore non-fatal messages."
	  echo "no" | gettextize --intl --force --copy
	  echo "Making $dr/aclocal.m4 writable ..."
	  test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
        fi
      fi
      if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then
	echo "Creating $dr/aclocal.m4 ..."
	test -r $dr/aclocal.m4 || touch $dr/aclocal.m4
	echo "Running gettextize...  Ignore non-fatal messages."
	echo "no" | gettextize --intl --force --copy
	echo "Making $dr/aclocal.m4 writable ..."
	test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
      fi
      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
        echo "Running intltoolize..."
	intltoolize --copy --force --automake
      fi
      if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
        echo "Running xml-i18n-toolize..."
	xml-i18n-toolize --copy --force --automake
      fi
      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
	if test -z "$NO_LIBTOOLIZE" ; then 
	  echo "Running libtoolize..."
	  libtoolize --force --copy
	fi
      fi
      echo "Running aclocal $aclocalinclude ..."
      aclocal $aclocalinclude || {
	echo
	echo "**Error**: aclocal failed. This may mean that you have not"
	echo "installed all of the packages you need, or you may need to"
	echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
	echo "for the prefix where you installed the packages whose"
	echo "macros were not found"
	exit 1
      }

      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
	echo "Running autoheader..."
	autoheader || { echo "**Error**: autoheader failed."; exit 1; }
      fi
      #echo "Running automake --gnu $am_opt ..."
      #automake --add-missing --gnu $am_opt ||
      echo "Running automake --foreign $am_opt ..."
      automake --add-missing --foreign $am_opt ||
	{ echo "**Error**: automake failed."; exit 1; }
      echo "Running autoconf ..."
      autoconf || { echo "**Error**: autoconf failed."; exit 1; }
    ) || exit 1
  fi
done

conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c

if test x$NOCONFIGURE = x; then
  echo Running $srcdir/configure $conf_flags "$@" ...
  $srcdir/configure $conf_flags "$@" \
  && echo Now type \`make\' to compile $PKG_NAME || exit 1
else
  echo Skipping configure process.
fi

--- NEW FILE: configure.in ---
AC_INIT(xfree86.xml.in)

PACKAGE=xfree86_xkb_xml
MAJOR_VERSION=0
MINOR_VERSION=5
VERSION=$MAJOR_VERSION.$MINOR_VERSION

AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)

AM_INIT_AUTOMAKE($PACKAGE, $VERSION)

prefix=/usr

AC_ARG_WITH( xkb_base,
             [  --with-xkb-base=DIR        XKB base path (by default it is /usr/X11R6/lib/X11/xkb)],
             xkb_base="$withval", 
             xkb_base="\$(prefix)/X11R6/lib/X11/xkb" )
			 
ALL_LINGUAS="bg ru uk"
AM_GNU_GETTEXT

AC_PROG_INTLTOOL

AC_SUBST(xkb_base)

AC_OUTPUT([ m4/Makefile
Makefile
xfree86_xkb_xml.spec
intl/Makefile
po/Makefile.in
])


--- NEW FILE: xfree86.xml.in ---
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
<xkbConfigRegistry>
  <modelList>
    <model>
      <configItem>
        <name>pc101</name>
        <_description>Generic 101-key PC</_description>
      </configItem>
    </model>
    <model>
      <configItem>
        <name>pc102</name>
        <_description>Generic 102-key (Intl) PC</_description>
      </configItem>
    </model>
    <model>
      <configItem>
        <name>pc104</name>
[...2379 lines suppressed...]
    <group allowMultipleSelection="true">
      <configItem>
        <name>compat</name>
        <_description>Miscellaneous compatibility options</_description>
      </configItem>
      <option>
        <configItem>
          <name>numpad:microsoft</name>
          <_description>Shift with numpad keys works as in MS Windows</_description>
        </configItem>
      </option>
      <option>
        <configItem>
          <name>srvrkeys:none</name>
          <_description>Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server.</_description>
        </configItem>
      </option>
    </group>
  </optionList>
</xkbConfigRegistry>

--- NEW FILE: xfree86_xkb_xml.spec.in ---
Name:		xfree86_xkb_xml
Summary:	XML-based XKB configuration registry
Version:	@VERSION@
Release:	1
License:	LGPL
Group:		User Interface/X

Url: http://gswitchit.sourceforge.net/

Source: http://gswitchit.sourceforge.net/%{name}-%{version}.tar.gz
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root

BuildArch:      noarch

%description
Just XML stuff. Later hopefully will be part of XFree86

%prep
%setup -q

%build

if [ ! -f configure ]; then
    CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh
fi

CFLAGS="$RPM_OPT_FLAGS" ./configure 

make 

%install
rm -rf $RPM_BUILD_ROOT

make prefix=$RPM_BUILD_ROOT%{_prefix} install 
rm -rf $RPM_BUILD_ROOT%{_prefix}/share/locale

%clean
rm -rf %{buildroot}
rm -rf $RPM_BUILD_DIR/%{name}-%{version}

%files
%defattr(-, root, root)

#%doc AUTHORS ChangeLog NEWS README COPYING.LIB
%{_prefix}/X11R6/lib/X11/xkb/rules/*

--- NEW FILE: xkb.dtd ---
<?xml version="1.0" encoding="UTF-8"?>

<!--

  Description: XKB configuration file DTD
  Author: Sergey V. Udaltsov

-->

<!ELEMENT xkbConfigRegistry (modelList,layoutList,optionList)>

<!ELEMENT modelList (model*)>

<!ELEMENT model (configItem)>

<!ELEMENT layoutList (layout*)>

<!ELEMENT layout (configItem,variantList?)>

<!ELEMENT optionList (group*)>

<!ELEMENT variantList (variant*)>

<!ELEMENT variant (configItem)>

<!ELEMENT group (configItem,option*)>
<!ATTLIST group
          allowMultipleSelection (true|false) "false">

<!ELEMENT option (configItem)>

<!ELEMENT configItem (name,shortDescription*,description*)>

<!ELEMENT name (#PCDATA)>

<!ELEMENT shortDescription (#PCDATA)>
<!ATTLIST shortDescription
          lang CDATA #IMPLIED>

<!ELEMENT description (#PCDATA)>
<!ATTLIST description
          lang CDATA #IMPLIED>
Previous message: [xlibs-commit] X11/nls/XI18N_OBJS Makefile,1.1.2.1,NONE
Next message: [xlibs-commit] xkbdesc/po - New directory
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]