autopackage up embryo

18 years ago · 1da201a836
parent 912b42dfe7
commit 1da201a836
16 changed files with 90 additions and 113 deletions
--- a/legacy/embryo/Makefile.am
+++ b/legacy/embryo/Makefile.am
@ -5,19 +5,33 @@ SUBDIRS = src include examples
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                       config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
-		       stamp-h.in embryo_docs.tar embryo_docs.tar.gz embryo.c
-
-dist-hook:
-	./gendoc; \
-	tar cvf embryo_docs.tar doc/html doc/latex doc/man; \
-	rm -f embryo_docs.tar.gz; \
-	gzip -9 embryo_docs.tar;
+		       stamp-h.in build-stamp configure-stamp depcomp \
+		       embryo_docs.tar.gz embryo.c \
+		       README \
+		       embryo.pc \
+		       embryo.spec \
+		       embryo.oe embryo-native.oe \
+		       embryo.bb embryoXnative.bb \
+		       debian/changelog

 bin_SCRIPTS = embryo-config

-EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN embryo.spec embryo.c.in \
-			gendoc Doxyfile embryo_docs.tar.gz embryo.pc.in \
-			make_cross_compile_arm.sh
+EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN embryo.c.in gendoc \
+             Doxyfile \
+	     README.in README \
+	     embryo.pc.in \
+	     embryo.spec.in embryo.spec \
+	     embryo.oe.in embryo.oe embryo-native.oe.in embryo-native.oe \
+	     embryo.bb.in embryo.bb embryoXnative.bb.in embryoXnative.bb \
+	     debian/changelog.in debian/changelog \
+	     debian/compat \
+	     debian/control \
+	     debian/copyright \
+	     debian/docs \
+	     debian/embryo0-bin.files \
+	     debian/libembryo0-dev.files \
+	     debian/libembryo0.files \
+	     debian/rules

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = embryo.pc
--- a/legacy/embryo/README.in
+++ b/legacy/embryo/README.in
@ -1,4 +1,4 @@
-Embryo 0.0.1
+Embryo @VERSION@

 WARNING: gcc compatibility!!!
 There seems to be some bug (or disagreement) between embryo and gcc 3.2.x
@ -67,3 +67,32 @@ harmless and this also keeps Embryo small.
 This is a work in progress, so please be patient if things don't work for you
 - and patches and help in fixing it is very much appreciated.

+------------------------------------------------------------------------------
+COMPILING AND INSTALLING:
+
+  ./configure
+  make
+(as root unless youa re installing in your users directories):
+  make install
+      
+------------------------------------------------------------------------------
+BUILDING PACKAGES:
+
+RPM: To build rpm packages:
+  
+  sudo rpm -ta @PACKAGE@-@VERSION@.tar.gz
+
+You will find rpm packages in your system /usr/src/redhat/* dirs (note you may
+not need to use sudo or root if you have your own ~/.rpmrc. see rpm documents
+for more details)
+
+DEB: To build deb packages:
+
+  tar zvf @PACKAGE@-@VERSION@.tar.gz
+  cd @PACKAGE@-@VERSION@
+  dpkg-buildpackage -us -uc -rfakeroot
+  cd ..
+  rm -rf @PACKAGE@-@VERSION@
+
+You will find all the debian source, binary etc. packages put in the directory
+where you first untarred the source tarball.
--- a/legacy/embryo/autogen.sh
+++ b/legacy/embryo/autogen.sh
@ -3,6 +3,8 @@
 rm -rf autom4te.cache
 rm -f aclocal.m4

+touch README
+
 echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \
 && echo "Running autoheader..."; autoheader \
 && echo "Running autoconf..."; autoconf \
--- a/legacy/embryo/configure.in
+++ b/legacy/embryo/configure.in
@ -114,7 +114,13 @@ src/Makefile
 src/lib/Makefile
 src/bin/Makefile
 embryo-config
+README
+embryo.spec
+embryo.oe
+embryo-native.oe
+embryo.bb
+embryoXnative.bb
+debian/changelog
 ],[
 chmod +x embryo-config
-touch embryo_docs.tar.gz
 ])
--- a/legacy/embryo/debian/changelog.in
+++ b/legacy/embryo/debian/changelog.in
@ -1,4 +1,4 @@
-embryo (0.9.0-0cvs20040808) unstable; urgency=low
+embryo (@VERSION@-1) unstable; urgency=low

  * CVS Release.

--- a/legacy/embryo/embryo-native.oe.in
+++ b/legacy/embryo/embryo-native.oe.in
--- a/legacy/embryo/embryo.bb.in
+++ b/legacy/embryo/embryo.bb.in
@ -5,7 +5,7 @@ MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
 SECTION = "e/libs"
 PRIORITY = "optional"
 DEPENDS = ""
-PV = "0.9.1"
+PV = "@VERSION@"
 PR = "1"

 do_prepsources () {
--- a/legacy/embryo/embryo.oe.in
+++ b/legacy/embryo/embryo.oe.in
@ -5,7 +5,7 @@ MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
 SECTION = "e/libs"
 PRIORITY = "optional"
 DEPENDS = ""
-PV = "0.9.1"
+PV = "@VERSION@"
 PR = "1"

 do_prepsources () {
--- a/legacy/embryo/embryo.spec.in
+++ b/legacy/embryo/embryo.spec.in
@ -1,16 +1,16 @@
 %define _missing_doc_files_terminate_build 0

-Summary: embryo
-Name: embryo
-Version: 0.9.1
-Release: 1.%(date '+%Y%m%d')
+Summary: A small virtual machine engine (in a library) and bytecode compiler
+Name: @PACKAGE@
+Version: @VERSION@
+Release: 1
 License: BSD
 Group: System Environment/Libraries
-URL: http://www.enlightenment.org/
-Source: ftp://ftp.enlightenment.org/pub/embryo/%{name}-%{version}.tar.gz
+Source: %{name}-%{version}.tar.gz
 Packager: %{?_packager:%{_packager}}%{!?_packager:Michael Jennings <mej@eterm.org>}
 Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:The Enlightenment Project (http://www.enlightenment.org/)}
 Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
+URL: http://www.enlightenment.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root

 %description
@ -30,11 +30,15 @@ Headers, static libraries, test programs and documentation for Embryo

 %build
 %{configure} --prefix=%{_prefix}
+### use this if you have build problems
+#./configure --prefix=%{_prefix}
 %{__make} %{?_smp_mflags} %{?mflags}

 %install
 %{__make} %{?mflags_install} DESTDIR=$RPM_BUILD_ROOT install
-test -x `which doxygen` && sh gendoc || :
+
+%clean
+test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT

 %post
 /sbin/ldconfig
@ -42,26 +46,22 @@ test -x `which doxygen` && sh gendoc || :
 %postun
 /sbin/ldconfig

-%clean
-test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING* README
-%{_libdir}/libembryo.so.*
-%{_libdir}/libembryo.la
+%{_libdir}/*.so.*
+%{_libdir}/*.la
 %attr(755,root,root) %{_bindir}/embryo_cc
 %attr(755,root,root) %{_bindir}/embryo

 %files devel
 %defattr(-, root, root)
-%doc doc/html
-%{_libdir}/libembryo.so
-%{_libdir}/libembryo.a
+%{_libdir}/*.so
+%{_libdir}/*.a
 %{_bindir}/embryo-config
 %{_datadir}/embryo/examples
 %{_datadir}/embryo/include
-%{_libdir}/pkgconfig/embryo.pc
-%{_includedir}/Embryo*
+%{_libdir}/pkgconfig/*
+%{_includedir}/*.h

 %changelog
--- a/legacy/embryo/embryoXnative.bb.in
+++ b/legacy/embryo/embryoXnative.bb.in
--- a/legacy/embryo/examples/Makefile.am
+++ b/legacy/embryo/examples/Makefile.am
@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 filesdir = $(datadir)/embryo/examples
 files_DATA = \
 test.inc \
--- a/legacy/embryo/include/Makefile.am
+++ b/legacy/embryo/include/Makefile.am
@ -1,3 +1,5 @@
+MAINTAINERCLEANFILES = Makefile.in
+
 filesdir = $(datadir)/embryo/include
 files_DATA = \
 default.inc
--- a/legacy/embryo/make_cross_compile_arm.sh
+++ b/legacy/embryo/make_cross_compile_arm.sh
@ -1,75 +0,0 @@
-#!/bin/sh
-
-PROJ="embryo"
-
-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
-
--- a/legacy/embryo/src/Makefile.am
+++ b/legacy/embryo/src/Makefile.am
@ -1,3 +1,3 @@
-## Process this file with automake to produce Makefile.in
+MAINTAINERCLEANFILES = Makefile.in

 SUBDIRS = lib bin
--- a/legacy/embryo/src/bin/Makefile.am
+++ b/legacy/embryo/src/bin/Makefile.am
@ -1,4 +1,4 @@
-## Process this file with automake to produce Makefile.in
+MAINTAINERCLEANFILES = Makefile.in

 INCLUDES = -DLINUX -I$(top_srcdir)/src/lib -I$(top_srcdir) -I$(top_builddir)

--- a/legacy/embryo/src/lib/Makefile.am
+++ b/legacy/embryo/src/lib/Makefile.am
@ -1,10 +1,7 @@
-## Process this file with automake to produce Makefile.in
+MAINTAINERCLEANFILES = Makefile.in

 AUTOMAKE_OPTIONS     = 1.4 foreign

-# A list of all the files in the current directory which can be regenerated
-MAINTAINERCLEANFILES = Makefile.in
-
 INCLUDES	     = -I. \
 		       -I$(top_srcdir) \
 		       -I$(top_builddir) \