Enlightenment CVS committal
Author : andreas99
Project : e16
Module : tools
Dir : e16/tools/e16menuedit2
Modified Files:
Makefile.am autogen.sh configure.in e16menuedit2.glade
xmldocs.make
Log Message:
- added generation of help in html format (needs xmlto only from CVS-build; html
included in package)
- changed some PACKAGE_ defines in configure.in and source files
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 13 Aug 2004 14:04:55 -0000 1.8
+++ Makefile.am 15 Aug 2004 15:45:23 -0000 1.9
@@ -14,7 +14,7 @@
GLADE_FILES = e16menuedit2.glade
-e16menuedit2datadir = ${PACKAGE_DATA_DIR}/${PACKAGE}/glade
+e16menuedit2datadir = ${PACKAGE_DATA_DIR}/glade
e16menuedit2data_DATA = \
$(GLADE_FILES)
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/autogen.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- autogen.sh 8 Aug 2004 16:27:46 -0000 1.10
+++ autogen.sh 15 Aug 2004 15:45:23 -0000 1.11
@@ -4,17 +4,10 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
CONFIGURE=configure.in
+XMLTO_LANG="C"
DIE=0
-#if [ -n "$GNOME2_DIR" ]; then
-# ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"
-# LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"
-# PATH="$GNOME2_DIR/bin:$PATH"
-# export PATH
-# export LD_LIBRARY_PATH
-#fi
-
(test -f $srcdir/$CONFIGURE) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level package directory"
@@ -67,6 +60,13 @@
NO_AUTOMAKE=yes
}
+(which xmlto) < /dev/null > /dev/null 2>&1 || {
+ echo
+ echo "**Error**: You must have \`xmlto' installed."
+ echo "You can get it from: http://cyberelk.net/tim/xmlto/"
+ DIE=1
+ NO_XMLTO=yes
+}
# if no automake, don't bother testing for aclocal
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
@@ -120,6 +120,15 @@
# echo "Running xml-i18n-toolize..."
# xml-i18n-toolize --copy --force --automake
# fi
+
+ test -n "$NO_XMLTO" || {
+ echo "creating help for lang $XMLTO_LANG"
+ for xlang in $XMLTO_LANG
+ do
+ xmlto -o help/$xlang html-nochunks help/$xlang/e16menuedit2.xml
+ done
+ }
+
echo "Running aclocal $aclocalinclude ..."
aclocal $aclocalinclude
if grep "^AM_CONFIG_HEADER" $CONFIGURE >/dev/null; then
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- configure.in 13 Aug 2004 14:04:55 -0000 1.16
+++ configure.in 15 Aug 2004 15:45:23 -0000 1.17
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(e16menuedit2, cvs-`date +%F`)
+AM_INIT_AUTOMAKE(e16menuedit2, 0.2)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -25,8 +25,9 @@
ALL_LINGUAS="de en ko tr"
AM_GLIB_GNU_GETTEXT
-AC_PATH_PROG(SCROLLKEEPER,scrollkeeper-config,0)
-AM_CONDITIONAL(SK, "$SCROLLKEEPER" 2&>/dev/null != 0)
+AC_PATH_PROG(SCROLLKEEPER,scrollkeeper-config,no)
+AM_CONDITIONAL(SK, "$SCROLLKEEPER" 2&>/dev/null != no)
+AC_SUBST(SK)
dnl Set PACKAGE_LOCALE_DIR in config.h.
if test "x${prefix}" = "xNONE"; then
@@ -46,13 +47,14 @@
fi
dnl Set PACKAGE DATA & DOC DIR
-packagedatadir=share
-packagedocdir=doc/${PACKAGE}
+systemdatadir=share
+packagedatadir=share/${PACKAGE}-${VERSION}
+packagedocdir=doc/${PACKAGE}-${VERSION}
dnl Set PACKAGE DIRS in config.h.
-packagepixmapsdir=${packagedatadir}/pixmaps
-packagehelpdir=${packagedatadir}/help
-packagemenudir=${packagedatadir}
+packagepixmapsdir=${systemdatadir}/pixmaps/${PACKAGE}-${VERSION}
+
+systempixmapsdir=${systemdatadir}/pixmaps
dnl Subst PACKAGE_DATA_DIR.
NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
@@ -72,25 +74,19 @@
PACKAGE_PIXMAPS_DIR="${packageprefix}/${packagepixmapsdir}"
AC_SUBST(PACKAGE_PIXMAPS_DIR)
-dnl Subst PACKAGE_HELP_DIR.
-NO_PREFIX_PACKAGE_HELP_DIR="${packagehelpdir}"
-AC_SUBST(NO_PREFIX_PACKAGE_HELP_DIR)
-PACKAGE_HELP_DIR="${packageprefix}/${packagehelpdir}"
-AC_SUBST(PACKAGE_HELP_DIR)
-
-dnl Subst PACKAGE_MENU_DIR.
-NO_PREFIX_PACKAGE_MENU_DIR="${packagemenudir}"
-AC_SUBST(NO_PREFIX_PACKAGE_MENU_DIR)
-PACKAGE_MENU_DIR="${packageprefix}/${packagemenudir}"
-AC_SUBST(PACKAGE_MENU_DIR)
+dnl Subst SYSTEM_PIXMAPS_DIR.
+NO_PREFIX_SYSTEM_PIXMAPS_DIR="${systempixmapsdir}"
+AC_SUBST(NO_PREFIX_SYSTEM_PIXMAPS_DIR)
+SYSTEM_PIXMAPS_DIR="${packageprefix}/${systempixmapsdir}"
+AC_SUBST(SYSTEM_PIXMAPS_DIR)
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${packageprefix}/${packagedatadir}","")
AC_DEFINE_UNQUOTED(PACKAGE_DOC_DIR, "${packageprefix}/${packagedocdir}","")
AC_DEFINE_UNQUOTED(PACKAGE_PIXMAPS_DIR, "${packageprefix}/${packagepixmapsdir}","")
-AC_DEFINE_UNQUOTED(PACKAGE_HELP_DIR, "${packageprefix}/${packagehelpdir}","")
-AC_DEFINE_UNQUOTED(PACKAGE_MENU_DIR, "${packageprefix}/${packagemenudir}","")
+AC_DEFINE_UNQUOTED(SYSTEM_PIXMAPS_DIR, "${packageprefix}/${systempixmapsdir}","")
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}","")
+
AC_OUTPUT([
Makefile
src/Makefile
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/e16menuedit2.glade,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e16menuedit2.glade 7 Aug 2004 17:08:30 -0000 1.7
+++ e16menuedit2.glade 15 Aug 2004 15:45:23 -0000 1.8
@@ -52,7 +52,7 @@
<accelerator key="S" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image27">
+ <widget class="GtkImage" id="image68">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -80,7 +80,7 @@
<accelerator key="Q" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image28">
+ <widget class="GtkImage" id="image69">
<property name="visible">True</property>
<property name="stock">gtk-quit</property>
<property name="icon_size">1</property>
@@ -114,7 +114,7 @@
<accelerator key="N" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image29">
+ <widget class="GtkImage" id="image70">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -135,7 +135,7 @@
<accelerator key="I" modifiers="GDK_CONTROL_MASK"
signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image30">
+ <widget class="GtkImage" id="image71">
<property name="visible">True</property>
<property name="stock">gtk-select-color</property>
<property name="icon_size">1</property>
@@ -155,7 +155,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image31">
+ <widget class="GtkImage" id="image72">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
@@ -182,6 +182,33 @@
<widget class="GtkMenu" id="menu_help_menu">
<child>
+ <widget class="GtkImageMenuItem" id="menu_contents">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Contents</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_menu_contents_activate"
last_modification_time="Fri, 13 Aug 2004 14:54:53 GMT"/>
+
+ <child internal-child="image">
+ <widget class="GtkImage" id="image73">
+ <property name="visible">True</property>
+ <property name="stock">gtk-help</property>
+ <property name="icon_size">1</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="strip2">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkImageMenuItem" id="menu_info">
<property name="visible">True</property>
<property name="label" translatable="yes">Info</property>
@@ -189,7 +216,7 @@
<signal name="activate" handler="on_menu_info_activate"
last_modification_time="Thu, 29 Jul 2004 21:34:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image32">
+ <widget class="GtkImage" id="image74">
<property name="visible">True</property>
<property name="stock">gtk-dialog-info</property>
<property name="icon_size">1</property>
===================================================================
RCS file: /cvsroot/enlightenment/e16/tools/e16menuedit2/xmldocs.make,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- xmldocs.make 13 Aug 2004 14:04:55 -0000 1.1
+++ xmldocs.make 15 Aug 2004 15:45:23 -0000 1.2
@@ -41,7 +41,7 @@
# ********** You should not have to edit below this line **********
xml_files = $(entities) $(docname).xml
-EXTRA_DIST = $(xml_files) $(omffile)
+EXTRA_DIST = $(xml_files) $(omffile) e16menuedit2.html
CLEANFILES = omf_timestamp
include $(top_srcdir)/omf.make
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs