Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e
Modified Files:
Makefile.am configure.in ecvs
Added Files:
e16.spec.in timestamp.h
Removed Files:
e.spec
Log Message:
Various build related tweaks:
- Autogenerate spec file (now named e16.spec, was e.spec)
- Minor changes to various version strings
- Move timestamp.h to top dir.
===================================================================
RCS file: /cvs/e/e16/e/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- Makefile.am 19 Sep 2005 15:59:10 -0000 1.42
+++ Makefile.am 17 Apr 2006 15:55:24 -0000 1.43
@@ -1,11 +1,12 @@
SUBDIRS = intl dox eesh epp src config themes man scripts misc po
EXTRA_DIST = \
+timestamp.h \
sample-scripts/bouncingball.pl \
sample-scripts/lcdmover.sh \
sample-scripts/testroller.pl \
sample-scripts/shade-pagers.pl \
-e.spec \
+e16.spec.in \
configure configure.in config.h.in \
ABOUT-NLS AUTHORS COMPLIANCE COPYING ChangeLog INSTALL NEWS README \
docs/README-0.16.8
===================================================================
RCS file: /cvs/e/e16/e/configure.in,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- configure.in 2 Apr 2006 17:54:36 -0000 1.148
+++ configure.in 17 Apr 2006 15:55:24 -0000 1.149
@@ -1,11 +1,19 @@
-AC_INIT(e.spec)
+AC_INIT(configure.in)
ENLIGHTENMENT_MAJOR=0
ENLIGHTENMENT_MINOR=16
ENLIGHTENMENT_MICRO=8.2
+ENLIGHTENMENT_REVISION=0.01
ENLIGHTENMENT_VERSION=$ENLIGHTENMENT_MAJOR.$ENLIGHTENMENT_MINOR.$ENLIGHTENMENT_MICRO
+if test "x$ENLIGHTENMENT_REVISION" != "x"; then
+ ENLIGHTENMENT_REVNAME="$ENLIGHTENMENT_VERSION-$ENLIGHTENMENT_REVISION"
+ RPM_REVISION=$ENLIGHTENMENT_REVISION
+else
+ ENLIGHTENMENT_REVNAME="$ENLIGHTENMENT_VERSION"
+ RPM_REVISION=1
+fi
-AM_INIT_AUTOMAKE(e16, $ENLIGHTENMENT_VERSION-0.01)
+AM_INIT_AUTOMAKE(e16, $ENLIGHTENMENT_REVNAME)
AM_MAINTAINER_MODE
dnl reasonable guesses for where stuff is installed
@@ -26,9 +34,12 @@
AC_SUBST(ENLIGHTENMENT_MINOR)
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_MICRO, "$ENLIGHTENMENT_MICRO", [Micro
Version])
AC_SUBST(ENLIGHTENMENT_MICRO)
+AC_DEFINE_UNQUOTED(ENLIGHTENMENT_REVISION, "$ENLIGHTENMENT_REVISION",
[Revision])
+AC_SUBST(ENLIGHTENMENT_REVISION)
if test "x$ENLIGHTENMENT_RELEASE" != "x"; then
AC_DEFINE_UNQUOTED(ENLIGHTENMENT_RELEASE, "$ENLIGHTENMENT_RELEASE",
[Release])
fi
+AC_SUBST(RPM_REVISION)
ALL_LINGUAS="bg bs da de en_US es fr hu ko nl no ru sv pt pl pt_BR tr ja"
@@ -257,6 +268,7 @@
misc/Makefile
po/Makefile.in
intl/Makefile
+e16.spec
])
if test "x$have_good_imlib2" != "xyes"; then
===================================================================
RCS file: /cvs/e/e16/e/ecvs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ecvs 25 Jul 2004 10:47:55 -0000 1.1
+++ ecvs 17 Apr 2006 15:55:24 -0000 1.2
@@ -44,8 +44,8 @@
@ARGV2 = @ARGV;
$ARGV2[0] = "update";
- print "Force updating ChangeLog and removing src/timestamp.h\n";
- system("cvs update -C ChangeLog src/timestamp.h");
+ print "Force updating ChangeLog and removing timestamp.h\n";
+ system("cvs update -C ChangeLog timestamp.h");
print "Updating the files you are committing.\n";
system("cvs @ARGV2 2>&1 |tee errors");
@@ -62,9 +62,8 @@
unlink "errors" if (-f "errors");
-
- print "Creating new src/timestamp.h\n";
- open TS, ">src/timestamp.h";
+ print "Creating new timestamp.h\n";
+ open TS, ">timestamp.h";
print TS "#define E_CHECKOUT_DATE \"\$Date\$\"\n";
close TS;
@@ -86,12 +85,12 @@
$found = 0;
foreach(@ARGV) {
- if(/src\/timestamp\.h$/) {
+ if(/timestamp\.h$/) {
$found = 1;
}
}
- push @ARGV, "src/timestamp.h" if(!$found);
+ push @ARGV, "timestamp.h" if(!$found);
}
}
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
