Hi,
I made some modifications to the snapshot scripts in order to include
xdriinfo and its manpage in the snapshots of the config-0-0-1-branch or
the trunk after the merge. A patch is attached.
I chose to use the extras subdirectory with its own install script. The
disadvantage is that this does not allow restoring of backup files on
deinstallation. But this is no problem as these files don't exist
XFree86 releases. The advantage is that I didn't have to touch the
install script.
I tested the modifications by building snapshots for the trunk and the
branch with the changed scripts. They looked all right, though I didn't
try a full installation. I only tested the generated extras.sh script.
Regards,
Felix
------------ __\|/__ ___ ___ -------------------------
Felix ___\_e -_/___/ __\___/ __\_____ You can do anything,
K�hling (_____\�/____/ /_____/ /________) just not everything
[EMAIL PROTECTED] \___/ \___/ U at the same time.
--- package.sh~ 2003-10-02 13:54:43.000000000 +0200
+++ package.sh 2003-10-04 01:29:09.000000000 +0200
@@ -12,6 +12,7 @@
case $BRANCH in
config-*-*-*-branch)
DRIVERS="MGA R128 R200 RADEON"
+ EXTRAS="XDRIINFO"
;;
mach64-*-*-*-branch)
DRIVERS="MACH64"
@@ -29,7 +30,7 @@
for DRIVER in $DRIVERS
do
- ./dripkg.sh $BUILD cvs/$BRANCH build/$BRANCH $DRIVER || EXIT=1
+ ./dripkg.sh $BUILD cvs/$BRANCH build/$BRANCH $DRIVER "$EXTRAS" || EXIT=1
done
rm -rf dripkg
--- dripkg.sh~ 2003-10-02 13:54:32.000000000 +0200
+++ dripkg.sh 2003-10-04 01:22:31.000000000 +0200
@@ -10,9 +10,10 @@
# Usage:
#
-# dripkg.sh <tag> <srcdir> <bindir> <driver>
+# dripkg.sh <tag> <srcdir> <bindir> <driver> <extras>
#
# <driver> is one of the following... R128, RADEON, MGA, TDFX, I810
+# <extras> is a list of extras... XDRIINFO
set -e
@@ -23,6 +24,7 @@
DRV_CVS_DIR=$2
DRV_BLD_DIR=$3
DRV=$4
+EXTRAS="$5"
# CVS Variables
DDX_SUBDIR=xc/programs/Xserver/hw/xfree86/drivers
@@ -31,6 +33,7 @@
DRI_SUBDIR=xc/lib/GL/mesa/src/drv
LIB_SUBDIR=xc/lib
CORE_SUBDIR=xc/programs/Xserver
+XDRIINFO_SUBDIR=xc/programs/xdriinfo
# Package Variables
PKG_DIR="dripkg"
@@ -170,6 +173,7 @@
DRV_DRI_DIR=$DRV_BLD_DIR/$DRI_SUBDIR/$DRV_DRI_SUBDIR
DRV_LIB_DIR=$DRV_BLD_DIR/$LIB_SUBDIR
DRV_CORE_DIR=$DRV_BLD_DIR/$CORE_SUBDIR
+XDRIINFO_DIR=$DRV_BLD_DIR/$XDRIINFO_SUBDIR
# Get package name
if [ -n "$DRV_BUILD_TAG" ]
@@ -248,6 +252,44 @@
cp $DRV_CORE_DIR/hw/xfree86/os-support/linux/drm/libdrm.a $PKG_CORE_DIR
strip -g $PKG_CORE_DIR/libdrm.a
+# Copy extras and write extras.sh
+if [ -n "$EXTRAS" ]
+then
+ vecho -n "Copying extras and writing extras.sh..."
+ mkdir -p $PKG_DIR/extras
+ cat > $PKG_DIR/extras/extras.sh <<EOF
+#!/bin/sh
+cd extras
+XF86_DIR=\$1
+EOF
+ chmod 755 $PKG_DIR/extras/extras.sh
+fi
+for EXT in $EXTRAS
+do
+ vecho -n " $EXT"
+ case $EXT in
+ XDRIINFO)
+ cp $XDRIINFO_DIR/xdriinfo $PKG_DIR/extras
+ cp $XDRIINFO_DIR/xdriinfo._man $PKG_DIR/extras/xdriinfo.1x
+ cat >> $PKG_DIR/extras/extras.sh <<EOF
+XF86_BIN_DIR="\$XF86_DIR/bin"
+XF86_MAN1_DIR="\$XF86_DIR/man/man1"
+mkdir -p \$XF86_BIN_DIR
+cp -f xdriinfo \$XF86_BIN_DIR
+mkdir -p \$XF86_MAN1_DIR
+cp -f xdriinfo.1x \$XF86_MAN1_DIR
+EOF
+ ;;
+ *)
+ echo "Unknown extra $EXT." 1>&2
+ ;;
+ esac
+done
+if [ -n "$EXTRAS" ]
+then
+ vecho ""
+fi
+
# Execute Driver Specific Commands
vecho "Running driver specific commands..."
`$DRV_COMMAND`
