From 43372b32cb3360c1d3453f5a74d7b8b7efd98ac4 Mon Sep 17 00:00:00 2001 From: raster Date: Thu, 3 Mar 2005 01:34:03 +0000 Subject: [PATCH] completely automated package metadata building. all src tarballs will contain all packaging data with the correct version etc. for rpm's, .deb's and openembedded's .oe's and .bb's git-svn-id: http://svn.enlightenment.org/svn/e/trunk/e17/libs/eet@13571 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- Makefile.am | 25 ++++++++++--- configure.in | 6 ++++ debian/changelog | 6 ---- eet-native.oe => eet-native.oe.in | 0 eet.bb => eet.bb.in | 2 +- eet.oe => eet.oe.in | 2 +- eet.spec => eet.spec.in | 28 +++++++-------- eetXnative.bb => eetXnative.bb.in | 0 make_cross_compile_arm.sh | 75 --------------------------------------- 9 files changed, 43 insertions(+), 101 deletions(-) delete mode 100644 debian/changelog rename eet-native.oe => eet-native.oe.in (100%) rename eet.bb => eet.bb.in (97%) rename eet.oe => eet.oe.in (97%) rename eet.spec => eet.spec.in (83%) rename eetXnative.bb => eetXnative.bb.in (100%) delete mode 100755 make_cross_compile_arm.sh diff --git a/Makefile.am b/Makefile.am index fd92b50..5fdcd39 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,13 +5,30 @@ SUBDIRS = src MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs \ - stamp-h.in eet_docs.tar eet_docs.tar.gz eet.c + stamp-h.in \ + eet_docs.tar.gz eet.c \ + eet.pc \ + eet.spec \ + eet.oe eet-native.oe \ + eet.bb eetXnative.bb \ + debian/changelog bin_SCRIPTS = eet-config -EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN eet.spec eet.c.in \ - gendoc Doxyfile doc eet.pc.in \ - make_cross_compile_arm.sh +EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN eet.spec eet.c.in gendoc \ + Doxyfile doc eet_docs.tar.gz \ + eet.pc.in \ + eet.spec.in eet.spec \ + eet.oe.in eet.oe eet-native.oe.in eet-native.oe \ + eet.bb.in eet.bb eetXnative.bb.in eetXnative.bb \ + debian/changelog.in debian/changelog \ + debian/control \ + debian/copyright \ + debian/eet-config.1 \ + debian/eet.1 \ + debian/libeet0-dev.files \ + debian/libeet0.files \ + debian/rules pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = eet.pc diff --git a/configure.in b/configure.in index 67c5362..e5ad71a 100644 --- a/configure.in +++ b/configure.in @@ -116,6 +116,12 @@ src/Makefile src/lib/Makefile src/bin/Makefile eet-config +eet.spec +eet.oe +eet-native.oe +eet.bb +eetXnative.bb +debian/changelog ],[ chmod +x eet-config ]) diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 43a9784..0000000 --- a/debian/changelog +++ /dev/null @@ -1,6 +0,0 @@ -libeet (0.9.10-0cvs20050129) unstable; urgency=low - - * a CVS release - - -- Sytse Wielinga Sat, 29 Jan 2005 18:41:25 +0100 - diff --git a/eet-native.oe b/eet-native.oe.in similarity index 100% rename from eet-native.oe rename to eet-native.oe.in diff --git a/eet.bb b/eet.bb.in similarity index 97% rename from eet.bb rename to eet.bb.in index 9803f2f..1001fbe 100644 --- a/eet.bb +++ b/eet.bb.in @@ -7,7 +7,7 @@ MAINTAINER = "Carsten Haitzler (Rasterman) " SECTION = "e/libs" PRIORITY = "optional" DEPENDS = "zlib jpeg" -PV = "0.9.9" +PV = "@VERSION@" PR = "1" do_prepsources () { diff --git a/eet.oe b/eet.oe.in similarity index 97% rename from eet.oe rename to eet.oe.in index 4e84676..defceb6 100644 --- a/eet.oe +++ b/eet.oe.in @@ -7,7 +7,7 @@ MAINTAINER = "Carsten Haitzler (Rasterman) " SECTION = "e/libs" PRIORITY = "optional" DEPENDS = "zlib jpeg" -PV = "0.9.9" +PV = "@VERSION@" PR = "1" do_prepsources () { diff --git a/eet.spec b/eet.spec.in similarity index 83% rename from eet.spec rename to eet.spec.in index b11baac..7eef26d 100644 --- a/eet.spec +++ b/eet.spec.in @@ -1,12 +1,12 @@ %define _missing_doc_files_terminate_build 0 Summary: Library for speedy data storage, retrieval, and compression. -Name: eet -Version: 0.9.9 -Release: 2.%(date '+%Y%m%d') +Name: @PACKAGE@ +Version: @VERSION@ +Release: 1 License: BSD Group: System Environment/Libraries -Source: ftp://ftp.enlightenment.org/pub/eet/eet-%{version}.tar.gz +Source: %{name}-%{version}.tar.gz Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings } Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)} Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}} @@ -40,9 +40,9 @@ Headers, static libraries, test programs and documentation for Eet %setup -q %build -%{configure} --prefix=%{_prefix} +#%{configure} --prefix=%{_prefix} +./configure --prefix=%{_prefix} %{__make} %{?_smp_mflags} %{?mflags} -test -x `which doxygen` && sh gendoc || : %install %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install @@ -58,18 +58,18 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root) -%doc AUTHORS COPYING README -%{_libdir}/libeet.so.* -%{_libdir}/libeet.la +%doc AUTHORS COPYING COPYING-PLAIN README +%{_libdir}/*.so.* +%{_libdir}/*.la %{_bindir}/eet %files devel %defattr(-, root, root) -%doc html -%{_libdir}/libeet.so -%{_libdir}/libeet.a +%doc eet_docs.tar.gz +%{_libdir}/*.so +%{_libdir}/*.a %{_bindir}/eet-config -%{_libdir}/pkgconfig/eet.pc -%{_includedir}/Eet* +%{_libdir}/pkgconfig/* +%{_includedir}/* %changelog diff --git a/eetXnative.bb b/eetXnative.bb.in similarity index 100% rename from eetXnative.bb rename to eetXnative.bb.in diff --git a/make_cross_compile_arm.sh b/make_cross_compile_arm.sh deleted file mode 100755 index 0529da9..0000000 --- a/make_cross_compile_arm.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh - -PROJ="eet" - -SKIFF="/skiff/local" -HOSTARCH="i686-pc-linux-gnu" -TARGETCPU="arm" -TARGETARCH=$TARGETCPU"-pc-linux-gnu" - -make clean distclean -export CC=$SKIFF"/bin/"$TARGETCPU"-linux-gcc" -export CFLAGS=-O9 -./configure \ ---host=$HOSTARCH \ ---build=$TARGETARCH \ ---target=$TARGETARCH - -INST="/tmp/"$PROJ"-instroot" -sudo rm -rf $INST - -make - -for I in find . -name "*.la" -print; do - sed s:"/usr/local":$INST:g < $I > "/tmp/.sed.tmp" - sudo cp "/tmp/.sed.tmp" $I - rm -f "/tmp/.sed.tmp" -done - -sudo \ -make \ -prefix=$INST \ -exec_prefix=$INST \ -bindir=$INST"/bin" \ -sbindir=$INST"/sbin" \ -sysconfdir=$INST"/etc" \ -datadir=$INST"/share" \ -includedir=$INST"/include" \ -libdir=$INST"/lib" \ -libexecdir=$INST"/libexec" \ -localstatedir=$INST"/var/run" \ -mandir=$INST"/share/man" \ -infodir=$INST"/share/info" \ -install - -## FIXUPS -for I in $INST"/bin/"* $INST"/sbin/"* $INST"/libexec/"*; do - J=`echo $I | sed s:$TARGETARCH"-"::g` - sudo mv $I $J -done - -CF=$INST"/bin/"$PROJ"-config" -sed s:"/usr/local":$SKIFF"/"$TARGETCPU"-linux":g < $CF > "/tmp/.sed.tmp" -sudo cp "/tmp/.sed.tmp" $CF -rm -f "/tmp/.sed.tmp" - -for I in $INST"/lib/"*.la; do - sed s:"/usr/local":$SKIFF"/"$TARGETCPU"-linux":g < $I > "/tmp/.sed.tmp" - sudo cp "/tmp/.sed.tmp" $I - rm -f "/tmp/.sed.tmp" -done - -## package it all up -PACK=$PROJ"-"$TARGETCPU"-inst.tar.gz" - -DIR=$PWD -cd $INST -sudo tar zcvf $DIR"/"$PACK * -sudo chown $USER $DIR"/"$PACK -cd $DIR -sudo rm -rf $INST - -## install it in our skiff tree -cd $SKIFF"/"$TARGETCPU"-linux" -sudo tar zxvf $DIR"/"$PACK - -- 2.7.4