RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2004-02-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* configure.ac: Remove rtemsdoc/mkspec. Add RTEMS_RPM_RELEASE.
	* rtemsdoc/.cvsignore: Reformat.
	* Makefile.am: Reformat. Add RTEMS_RPM_RELEASE support to
	rtems-source.add, Use rtems_source_spec_DEPS instead of
	rtems_source_spec_DEPENDENCIES (Conflicts with automake internals).
	* rtems/rtems-source.add: Add RTEMS_RPM_RELEASE.
	* rtemsdoc/mkspec.in: Remove.
	* rtemsdoc/Makefile.am: Reworked.
	* rtemsdoc/header.add: Update Copyright notice.
	* rtemsdoc/rtemsdoc.add: Add RTEMS_RPM_RELEASE.
	Add %{rpmgroup}. Remove bzip-ing *.ps.
	* rtemsdoc/supplement.add.in: Add %{rpmgroup}.
	* rtemsdoc/templ.add.in: Add %{rpmgroup}.
This commit is contained in:
Ralf Corsepius
2004-02-10 16:41:08 +00:00
parent 55dfd4cde4
commit beabcaf936
11 changed files with 46 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/ChangeLog
View File

@@ -1,3 +1,19 @@
2004-02-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove rtemsdoc/mkspec. Add RTEMS_RPM_RELEASE.
* rtemsdoc/.cvsignore: Reformat.
* Makefile.am: Reformat. Add RTEMS_RPM_RELEASE support to
rtems-source.add, Use rtems_source_spec_DEPS instead of
rtems_source_spec_DEPENDENCIES (Conflicts with automake internals).
* rtems/rtems-source.add: Add RTEMS_RPM_RELEASE.
* rtemsdoc/mkspec.in: Remove.
* rtemsdoc/Makefile.am: Reworked.
* rtemsdoc/header.add: Update Copyright notice.
* rtemsdoc/rtemsdoc.add: Add RTEMS_RPM_RELEASE.
Add %{rpmgroup}. Remove bzip-ing *.ps.
* rtemsdoc/supplement.add.in: Add %{rpmgroup}.
* rtemsdoc/templ.add.in: Add %{rpmgroup}.
2004-02-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* rtems/rtems-source.add: Require automake-1.8.2, autoconf-2.59.

15
scripts/Makefile.am
View File

@@ -18,12 +18,17 @@ CONFIG_STATUS_DEPENDENCIES = setup.cache
setup.cache: setup.def
cp setup.def $@
DISTCLEANFILES = setup.cache
rtems_source_spec_DEPS = common/common.add rtems/rtems-source.add \
common/clean.add
noinst_DATA += rtems/rtems-source.spec
rtems/rtems-source.spec: $(top_builddir)/common/common.add rtems/rtems-source.add \
$(top_builddir)/common/clean.add
cat $^ | sed 's,[@]rtems_version[@],$(RTEMS_VERSION),g' > $@
rtems/rtems-source.spec: $(rtems_source_spec_DEPS)
cat $(rtems_source_spec_DEPS) | sed \
-e 's,[@]rtems_version[@],$(RTEMS_VERSION),g' \
-e 's,[@]RTEMS_RPM_RELEASE[@],$(RTEMS_RPM_RELEASE),g' > $@
CLEANFILES = rtems/rtems-source.spec
DISTCLEANFILES = setup.cache
include $(top_srcdir)/../automake/subdirs.am
include $(top_srcdir)/../automake/local.am

3
scripts/configure.ac
View File

@@ -70,8 +70,8 @@ AC_SUBST(BSPVERS)
AC_SUBST(RPM_CPU)
AC_SUBST(rpmprefix,$rpmprefix)
AC_SUBST(rpmgroup,[RTEMS/][RTEMS_API])
AC_SUBST(RTEMS_RPM_RELEASE,$rtems_rpm_release)
AC_SUBST(osversion,$osversion)
AC_CONFIG_FILES([Makefile
binutils/Makefile
gccnewlib/Makefile
@@ -94,7 +94,6 @@ AC_CONFIG_FILES([mkgccnewlibspec],[chmod +x mkgccnewlibspec])
AC_CONFIG_FILES([mkbspspec],[chmod +x mkbspspec])
AC_CONFIG_FILES([gcc3newlib/mkspec],[chmod +x gcc3newlib/mkspec])
AC_CONFIG_FILES([cpukit/mkspec],[chmod +x cpukit/mkspec])
AC_CONFIG_FILES([rtemsdoc/mkspec],[chmod +x rtemsdoc/mkspec])
AC_CONFIG_COMMANDS([default],[[chmod 755 buildall
chmod 755 buildalltar

2
scripts/rtems/rtems-source.add
View File

@@ -1,6 +1,6 @@
Name: %{rpmprefix}rtems-source
Version: @rtems_version@
Release: 1
Release: @RTEMS_RPM_RELEASE@
Epoch: 0
Summary: RTEMS source code

4
scripts/rtemsdoc/.cvsignore
View File

@@ -13,11 +13,11 @@ m68k-supplement.add
Makefile
Makefile.in
mips-supplement.add
mkspec
networking-docs.add
new_chapters-docs.add
porting-docs.add
posix1003_1-docs.add
posix_users-docs.add
powerpc-supplement.add
relnotes-docs.add
rgdb_specs-docs.add
@@ -25,6 +25,6 @@ rtems_gdb-docs.add
sh-supplement.add
sparc-supplement.add
*.spec
*.spec.in
started_ada-docs.add
started-docs.add
*.spec.in

27
scripts/rtemsdoc/Makefile.am
View File

@@ -6,14 +6,10 @@ include ${top_srcdir}/common/common.am
CLEANFILES =
MKSPEC = $(SHELL) ./mkspec
MKSPEC_DEPS = mkspec rtemsdoc.spec.in $(top_builddir)/setup.cache
SUPPLEMENTS = arm c4x i386 i960 m68k mips powerpc sh sparc
DOCS = ada_user posix1003_1 bsp_howto
DOCS += c_user
DOCS += c_user posix_users
DOCS += develenv
DOCS += FAQ filesystem itron
DOCS += networking porting new_chapters
@@ -39,22 +35,13 @@ SUFFIXES = -supplement.add -docs.add
t=`echo $@ | sed -e 's,-docs.add,,'`; \
sed -e s/@target\@/$$t/g < $< >$@
rtemsdoc.spec.in: $(SUBPACKAGES)
cat $^ > $@
CLEANFILES += rtemsdoc.spec.in
rtemsdoc.spec: $(MKSPEC_DEPS) $(SUBPACKAGES)
$(MKSPEC) -cfg $(top_builddir)/setup.cache > $@
rtemsdoc.spec: $(SUBPACKAGES) Makefile
cat $(SUBPACKAGES) | sed \
-e 's,[@]rtems_version[@],$(RTEMS_VERSION),g' \
-e 's,[@]rtems_rpm_release[@],$(RTEMS_RPM_RELEASE),g' \
> $@
CLEANFILES += rtemsdoc.spec
RPM_SPECS_DATA = rtemsdoc.spec
TEMPLATES = rtemsdoc.spec.in
noinst_DATA = $(TEMPLATES)
EXTRA_DIST = $(TEMPLATES)
CLEANFILES += $(RPM_SPECS_DATA)
noinst_DATA = rtemsdoc.spec
include $(top_srcdir)/../automake/local.am

2
scripts/rtemsdoc/header.add
View File

@@ -1,4 +1,4 @@
#
# spec file for package rtemsdoc
#
# Copyright (c) 2003 Ralf Corsepius, Ulm, Germany
# Copyright (c) 2003, 2004 Ralf Corsepius, Ulm, Germany

51
scripts/rtemsdoc/mkspec.in
View File

@@ -1,51 +0,0 @@
#! /bin/sh
RTEMS_DIR=`dirname $0`/@top_srcdir@
PACKAGE_BUGREPORT=@PACKAGE_BUGREPORT@
CFG=../setup.cache
usage()
{
echo "$0 [options]"
echo " options:"
echo " -cfg <setup.cache>"
echo " -o <rpm-spec-dir>"
exit 1 ;
}
specsrc=${RTEMS_DIR}/rtemsdoc/rtemsdoc.spec.in
while test $# -ge 2; do
case $1 in
-cfg)
shift
CFG=$1
shift
;;
-o)
shift
dst=$1
shift
;;
-*)
echo "invalid option $1";
usage
;;
esac
done
if test ! $# -eq 0;
then
echo "Invalid number of arguments" >&2
usage >&2
fi
. ./$CFG
sed -e "s%@PACKAGE_BUGREPORT\@%@PACKAGE_BUGREPORT@%g" \
-e "s%@rtems_rpm_release\@%${rtems_rpm_release}%g" \
-e "s%@rtems_version\@%${rtems_version}%g" \
-e "s%@rtems_rpm_version\@%${rtems_rpm_version}%g" \
-e "s,@rpm_build_root\@,${rpm_build_root},g" \
< ${specsrc}

8
scripts/rtemsdoc/rtemsdoc.add
View File

@@ -4,10 +4,11 @@
%define srcvers @rtems_version@
%define rpmvers %{expand:%%(echo @rtems_version@ | tr - _ )}
Name: rtemsdoc
Name: %{rpmprefix}rtemsdoc
Release: @rtems_rpm_release@
Epoch: 0
License: Distributable
Group: rtems
Group: %{rpmgroup}/Documentation
Autoreqprov: on
Packager: corsepiu@faw.uni-ulm.de and joel@OARcorp.com
@@ -64,13 +65,12 @@ cd build
rm -rf ${RPM_BUILD_ROOT}/%{_datadir}/rtems/html/supplements/template*
gzip -9qf ${RPM_BUILD_ROOT}/%{_infodir}/*
bzip2 -9qf ${RPM_BUILD_ROOT}/%{_datadir}/rtems/ps/*
## base
%package base
Summary: Documentation for RTEMS ada support
Group: rtems/documentation
Group: %{rpmgroup}/Documentation
%description base
RTEMS is a free operating system for embedded systems.

4
scripts/rtemsdoc/supplement.add.in
View File

@@ -2,9 +2,9 @@
%package @target@
Summary: Documentation for RTEMS @target@ support
Group: rtems/documentation
Group: %{rpmgroup}/Documentation
PreReq: /sbin/install-info
Requires: rtemsdoc-base
Requires: %{rpmprefix}rtemsdoc-base
%description @target@
RTEMS is a free operating system for embedded systems.

4
scripts/rtemsdoc/templ.add.in
View File

@@ -2,9 +2,9 @@
%package @target@
Summary: Documentation for RTEMS @target@ support
Group: rtems/documentation
Group: %{rpmgroup}/Documentation
PreReq: /sbin/install-info
Requires: rtemsdoc-base
Requires: %{rpmprefix}rtemsdoc-base
%description @target@
RTEMS is a free operating system for embedded systems.