OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-re Date: 01-Apr-2003 17:16:23
Branch: HEAD Handle: 2003040116162300
Modified files:
openpkg-re openpkg-dev pmod-psod.txt
Log:
implement PBE logic into list(), peek(), diff() and release(); add
branch support to release(); upload PMOD instructions
Summary:
Revision Changes Path
1.82 +184 -74 openpkg-re/openpkg-dev
1.37 +18 -19 openpkg-re/pmod-psod.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/openpkg-dev
============================================================================
$ cvs diff -u -r1.81 -r1.82 openpkg-dev
--- openpkg-re/openpkg-dev 1 Apr 2003 08:42:44 -0000 1.81
+++ openpkg-re/openpkg-dev 1 Apr 2003 15:16:23 -0000 1.82
@@ -52,7 +52,7 @@
OPENPKG_DIST=ftp://ftp.openpkg.org/contrib/00UPLOAD/ # contributor
#OPENPKG_MODE=developer # developer
[EMAIL PROTECTED]:/e/openpkg/cvs # developer
-#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/current/SRC/ # developer
+#OPENPKG_DIST=master.openpkg.org:/e/openpkg/ftp/ # developer
export OPENPKG_INST OPENPKG_WILD OPENPKG_WORK OPENPKG_TEMP OPENPKG_MODE
OPENPKG_REPO OPENPKG_DIST
# enforced and user controlled (through package/branch/execute) variables
@@ -594,7 +594,7 @@
canonifybranch "${OPENPKG_CTAG}"
OPENPKG_CTAG="${RV}"
- # canonify OPENPKG_EXEC, default to HEAD
+ # canonify OPENPKG_EXEC
canonifybranch "${OPENPKG_EXEC:-$OPENPKG_CTAG}"
matchinstance "${RV}" exact
OPENPKG_EXEC="${RV}"
@@ -854,29 +854,43 @@
list () {
if [ ".$1" = . ]; then
if [ ".$P" = . ]; then
- die "package cannot be identified. \$P might not be set properly."
- fi
- if [ ".$E" = . -o ! -x $E/bin/rpm ]; then
- die "$E/bin/rpm not executable. \$E might not be set properly."
+ die "package cannot be identified. Neither parameter given nor \$P set."
fi
- locationid=`$E/bin/rpm --eval %{_rpmfilename} | sed -e 's;^.*}-;;' -e
's;\.rpm$;;'`
- ls -l ${OPENPKG_WORK}/pkg/src/$P* | egrep "/$P-[^-]+-[^-]+\.(no)?src.rpm$"
- ls -l ${OPENPKG_WORK}/pkg/bin/$P* | egrep
"/$P-[^-]+-[^-]+\.[^-]+-[^-]+-${locationid}.rpm$"
+ all="$P"
else
- ls -l ${OPENPKG_WORK}/pkg/src/$1*
- ls -l ${OPENPKG_WORK}/pkg/bin/$1*
+ all="$*"
fi
+ if [ ".$E" = . -o ! -x $E/bin/rpm ]; then
+ die "$E/bin/rpm not executable. \$E might not be set properly."
+ fi
+ locationid=`HOME=${OPENPKG_WORK} $E/bin/rpm --eval %{_rpmfilename} | sed -e
's;^.*}-;;' -e 's;\.rpm$;;'`
+ for name in $all; do
+ name=`echo $name | sed -e 's;\.src\.rpm$;;' -e 's;\.nosrc\.rpm$;;'` #
convenience
+ ls -l ${OPENPKG_WORK}/pkg/src/$name* | egrep
"/$name[^-]*-[^-]+-[^-]+\.(no)?src.rpm$"
+ ls -l ${OPENPKG_WORK}/pkg/bin/$name* | egrep
"/$name[^-]*-[^-]+-[^-]+\.[^-]+-[^-]+-${locationid}.rpm$"
+ done
}
peek () {
- for name in $*; do
+ if [ ".$1" = . ]; then
+ if [ ".$P" = . ]; then
+ die "package cannot be identified. Neither parameter given nor \$P set."
+ fi
+ all="$P"
+ else
+ all="$*"
+ fi
+ if [ ".$E" = . -o ! -x $E/bin/rpm ]; then
+ die "$E/bin/rpm not executable. \$E might not be set properly."
+ fi
+ for name in $all; do
+ name=`echo $name | sed -e 's;\.src\.rpm$;;' -e 's;\.nosrc\.rpm$;;'` #
convenience
if [ ! -f "${OPENPKG_WORK}/src/${name}/${name}.spec" ]; then
warn "${OPENPKG_WORK}/src/${name}/${name}.spec not found"
continue
fi
- template=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval
'%{_rpmfilename}'`
- rpmfile=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -q --qf "${template}"
\
- --specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+ template=`HOME=${OPENPKG_WORK} $E/bin/rpm --eval '%{_rpmfilename}'`
+ rpmfile=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "${template}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
rpmdir=`HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm --eval '%{_rpmdir}'`
if [ ! -f "$rpmdir/$rpmfile" ]; then
die "binary RPM not found: $rpmdir/$rpmfile"
@@ -886,7 +900,7 @@
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
OIFS="$IFS"; IFS="
"
- for configfile in `HOME=${OPENPKG_WORK} ${OPENPKG_INST}/bin/rpm -qplc
$rpmdir/$rpmfile`; do
+ for configfile in `HOME=${OPENPKG_WORK} $E/bin/rpm -qplc $rpmdir/$rpmfile`;
do
IFS="$OIFS"
filter="$filter -e \"s;^ \\\\(.* ${configfile}\\\\)\$;C\\\\1;\""
done
@@ -902,75 +916,164 @@
}
release () {
- # check for "dry" run
- if [ .$1 = .-dry ]; then
- dry=1
+ # honor optional parameters [-dry] [-m "message"]
+ dry=0
+ msg=""
+ while [ ".$1" != . ]; do
+ case ".$1" in
+ .-dry ) dry=1 ;;
+ .-m ) [ ".$2" = . ] && die "-m option requires argument"
+ [ ".$msg" != . ] && die "-m can only be specified once"
+ shift
+ msg="$1" ;;
+ * ) packages="$packages $1"
+ esac
shift
+ done
+
+ # examine if environment supports colorized diff
+ if [ ".`which cvs-diff-colorize`" != . ]; then
+ cvs_diff_colorize="cvs-diff-colorize"
else
- dry=0
+ cvs_diff_colorize="cat"
fi
- basename=`echo $1 | sed -e 's;\.src\.rpm$;;' -e 's;\.nosrc\.rpm$;;'`
- name=`echo ${basename} | sed -e 's;-[^-][^-]*-[^-][^-]*$;;'`
- if [ ".${OPENPKG_MODE}" = .developer ]; then
- echo "++ perform environment consistency checks"
- ext=""
- if [ -f "${OPENPKG_WORK}/pkg/src/${basename}.src.rpm" ]; then
- ext="src.rpm"
- fi
- if [ -f "${OPENPKG_WORK}/pkg/src/${basename}.nosrc.rpm" ]; then
- ext="nosrc.rpm"
- fi
- if [ ".$ext" = . ]; then
- die "${OPENPKG_WORK}/pkg/src/${basename}.[no]src.rpm not found"
+ # sanity check
+ [ ".${OPENPKG_SPEC:-$P}" != ".$P" ] && die "release requires OPENPKG_SPEC
(=${OPENPKG_SPEC}) and P (=$P) being in sync"
+ [ ".${OPENPKG_CTAG:-$B}" != ".$B" ] && die "release requires OPENPKG_CTAG
(=${OPENPKG_CTAG}) and B (=$B) being in sync"
+ [ ".${OPENPKG_EXEC:-$E}" != ".$E" ] && die "release requires OPENPKG_EXEC
(=${OPENPKG_EXEC}) and E (=$E) being in sync"
+
+ if [ ".$packages" = . ]; then
+ if [ ".$P" = . ]; then
+ die "package cannot be identified. Neither parameter given nor \$P set."
fi
+ all="$P"
+ else
+ all="$packages"
+ fi
+ if [ ".$E" = . -o ! -x $E/bin/rpm ]; then
+ die "$E/bin/rpm not executable. \$E might not be set properly."
+ fi
+
+ for name in $all; do
+ name=`echo $name | sed -e 's;\.src\.rpm$;;' -e 's;\.nosrc\.rpm$;;'` #
convenience
+ name=`echo ${name} | sed -e 's;-[^-][^-]*-[^-][^-]*$;;'` #
convenience
+ echo "++ processing package ${name}"
if [ ! -f "${OPENPKG_WORK}/src/${name}/${name}.spec" ]; then
die "${OPENPKG_WORK}/src/${name}/${name}.spec not found"
fi
+ template=`HOME=${OPENPKG_WORK} $E/bin/rpm --eval '%{_rpmfilename}' | sed -e
's;\..*$;;'`
+ rpmfile=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "${template}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+ if [ ".${OPENPKG_MODE}" = .developer ]; then
- echo "++ linting package specification (${name}.spec)"
- perl ${OPENPKG_WORK}/re/speclint.pl
${OPENPKG_WORK}/src/${name}/${name}.spec
- if [ $? -gt 0 ]; then
- die "unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec"
+ # compatiblity FIXME
+ echo "${OPENPKG_DIST}" | egrep -q "/current/src/?$"
+ if [ $? -eq 0 ]; then
+ warn "deprecated suffix /current/src in OPENPKG_DIST=${OPENPKG_DIST}.
Please fix."
+ sleep 3
+ OPENPKG_DIST=`echo ${OPENPKG_DIST} | sed -e 's;/$;;' -e
's;/current/src$;;'`
fi
- echo "++ determine information about old version"
+ echo "++ determine [no]src extension"
+ ext=""
+ [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.rpm" ] && ext="src.rpm"
+ [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.nosrc.rpm" ] && ext="nosrc.rpm"
+ [ ".$ext" = . ] && die "${OPENPKG_WORK}/pkg/src/${rpmfile}.[no]src.rpm not
found"
+
+ echo "++ determine old version (if any)"
tmpfile="${OPENPKG_TEMP}/${name}${GUID}"
cvs_rev=`cd ${OPENPKG_WORK}; cvs -d ${OPENPKG_REPO} stat
src/${name}/${name}.spec 2>/dev/null | awk '/Repository revision:/ { print $3; }'`
- cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev} openpkg-src/${name}/${name}.spec
>${tmpfile} 2>/dev/null
- rpm_version_old=`${OPENPKG_INST}/bin/rpm -q --qf "%{VERSION}" --specfile
${tmpfile} 2>/dev/null`
- rpm_release_old=`${OPENPKG_INST}/bin/rpm -q --qf "%{RELEASE}" --specfile
${tmpfile} 2>/dev/null`
- rm -f ${tmpfile}
-
- echo "++ determine information about new version"
- rpm_version_new=`${OPENPKG_INST}/bin/rpm -q --qf "%{VERSION}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_release_new=`${OPENPKG_INST}/bin/rpm -q --qf "%{RELEASE}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_name=`${OPENPKG_INST}/bin/rpm -q --qf "%{NAME}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
- rpm_summary=`${OPENPKG_INST}/bin/rpm -q --qf "%{SUMMARY}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+ if [ ".${cvs_rev}" != .No ]; then
+ cvs -d ${OPENPKG_REPO} co -p -r${cvs_rev}
openpkg-src/${name}/${name}.spec >${tmpfile} 2>/dev/null
+ rpm_version_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{VERSION}"
--specfile ${tmpfile} 2>/dev/null`
+ rpm_release_old=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{RELEASE}"
--specfile ${tmpfile} 2>/dev/null`
+ rm -f ${tmpfile}
+ [ ".${rpm_version_old}" = . ] && die "cannot determine old version
number"
+ [ ".${rpm_release_old}" = . ] && die "cannot determine old release
number"
+ fi
+
+ echo "++ determine new version"
+ rpm_version_new=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{VERSION}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_release_new=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{RELEASE}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_name=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{NAME}" --specfile
${OPENPKG_WORK}/src/${name}/${name}.spec`
+ rpm_summary=`HOME=${OPENPKG_WORK} $E/bin/rpm -q --qf "%{SUMMARY}"
--specfile ${OPENPKG_WORK}/src/${name}/${name}.spec`
+ [ ".${rpm_version_new}" = . ] && die "cannot determine new version number"
+ [ ".${rpm_release_new}" = . ] && die "cannot determine new release number"
+
+ echo "++ determine branch and related release number and upload suffix"
+ if [ ".$B" = .HEAD ]; then
+ BRANCH="HEAD"
+ else
+ BRANCH=`echo "$B" | sed -e 's;^OPENPKG_;;' -e 's;_STABLE$;;' -e
's;SOLID$;;' -e 's;^HEAD$;;' -e 's;_;;g'`
+ OPMAJORV=`echo ${BRANCH} | cut -c 1`
+ OPMINORV=`echo ${BRANCH} | cut -c 2`
+ if [ ".${OPMINORV}" != . ]; then
+ BRANCH="SOLID"
+ elif [ ".${OPMAJORV}" != . ]; then
+ BRANCH="STABLE"
+ else
+ BRANCH=""
+ fi
+ fi
+ rpm_release_req=""
+ upload=""
+ if [ ".${BRANCH}" = .HEAD ]; then
+ rpm_release_req=`date '+%Y%m%d'`
+ upload="current/SRC/"
+ fi
+ if [ ".${BRANCH}" = .STABLE ]; then
+ rpm_release_req="${OPMAJORV}.`date '+%Y%m%d'`"
+ upload="stable/${OPMAJORV}/SRC/"
+ fi
+ if [ ".${BRANCH}" = .SOLID ]; then
+ update=`echo ${rpm_release_old} | sed -e 's;^.*\.;;'`
+ if [ ".${update}" = . ]; then
+ update=0
+ else
+ update=`expr ${update} + 1`
+ fi
+ rpm_release_req="${OPMAJORV}.${OPMINORV}.${update}"
+ upload="release/${OPMAJORV}.${OPMINORV}/UPD/00UPLOAD/"
+ fi
- echo "++ consistency checking release number"
- rpm_release_req=`date '+%Y%m%d'`
+ echo "++ checking release number"
+ if [ ".$rpm_release_req" = . ]; then
+ die "cannot predict required release number for branch $B"
+ fi
if [ ".$rpm_release_new" != ".$rpm_release_req" ]; then
- die "package has release number \"$rpm_release_new\" (expected
\"$rpm_release_req\")"
+ die "release number ${rpm_release_new} does not match expectation
${rpm_release_req}"
fi
- echo "++ releasing ${basename}.${ext} to OpenPKG distribution area"
+ echo "++ checking upload suffix"
+ if [ ".$upload" = . ]; then
+ die "cannot determine upload suffix for branch $B"
+ fi
+
+ if [ ".${BRANCH}" = .HEAD ]; then
+ echo "++ linting ${name}.spec for HEAD branch"
+ perl ${OPENPKG_WORK}/re/speclint.pl
${OPENPKG_WORK}/src/${name}/${name}.spec
+ if [ $? -gt 0 ]; then
+ die "unacceptable specification:
${OPENPKG_WORK}/src/${name}/${name}.spec"
+ fi
+ fi
+
+ echo "++ releasing ${rpmfile}.${ext} to OpenPKG distribution area ${upload}"
if [ ${dry} -eq 0 ]; then
- chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.${ext}
- scp -p ${OPENPKG_WORK}/pkg/src/${basename}.${ext} ${OPENPKG_DIST}
+ chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
+ scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
${OPENPKG_DIST}/${upload}
else
- echo chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.${ext}
- echo scp -p ${OPENPKG_WORK}/pkg/src/${basename}.${ext} ${OPENPKG_DIST}
+ echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
+ echo scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.${ext}
${OPENPKG_DIST}/${upload}
fi
- if [ -f "${OPENPKG_WORK}/pkg/src/${basename}.src.sh" ]; then
- echo "++ releasing ${basename}.src.sh to OpenPKG distribution area"
+ if [ -f "${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh" ]; then
+ echo "++ releasing ${rpmfile}.src.sh to OpenPKG distribution area
${upload}"
if [ ${dry} -eq 0 ]; then
- chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.src.sh
- scp ${OPENPKG_WORK}/pkg/src/${basename}.src.sh ${OPENPKG_DIST}
+ chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
+ scp ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
${OPENPKG_DIST}/${upload}
else
- echo chmod 664 ${OPENPKG_WORK}/pkg/src/${basename}.src.sh
- echo scp -p ${OPENPKG_WORK}/pkg/src/${basename}.src.sh
${OPENPKG_DIST}
+ echo chmod 664 ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
+ echo scp -p ${OPENPKG_WORK}/pkg/src/${rpmfile}.src.sh
${OPENPKG_DIST}/${upload}
fi
fi
@@ -984,7 +1087,7 @@
else
package_type="Upgraded"
fi
- entry="`date +%d-%b-%Y`: ${package_type} package: P<${basename}>"
+ entry="`date +%d-%b-%Y`: ${package_type} package: P<${rpmfile}>"
grep "${entry}" ${OPENPKG_WORK}/web/news.txt >/dev/null
if [ $? -ne 0 ]; then
echo "++ updating news.txt"
@@ -997,9 +1100,7 @@
fi
echo "++ determining commit message"
- if [ ".$2" != . ]; then
- msg="$2"
- else
+ if [ ".$msg" = . ]; then
if [ ".${rpm_version_old}" = . \
-a ".${rpm_version_new}" != . \
-a ".${rpm_name}" != . \
@@ -1009,9 +1110,19 @@
-a ".${rpm_version_new}" != . \
-a ".${rpm_version_old}" != ".${rpm_version_new}" ]; then
msg="upgrading package: ${rpm_name} ${rpm_version_old} ->
${rpm_version_new}"
+ elif [ ".${rpm_version_old}" != . \
+ -a ".${rpm_version_new}" != . \
+ -a ".${rpm_version_old}" = ".${rpm_version_new}" \
+ -a ".${rpm_release_old}" != ".${rpm_release_new}" ]; then
+ msg="modifying package: ${rpm_name}-${rpm_version_new}
${rpm_release_old} -> ${rpm_release_new}"
+ elif [ ".${rpm_version_old}" != . \
+ -a ".${rpm_version_new}" != . \
+ -a ".${rpm_version_old}" = ".${rpm_version_new}" \
+ -a ".${rpm_release_old}" = ".${rpm_release_new}" ]; then
+ msg="modifying package: ${rpm_name}-${rpm_version_new}
${rpm_release_old} again"
fi
if [ ".${msg}" = . ]; then
- die "unable to determine type of source changes -- commit manually
or specifiy commit message"
+ die "unable to determine type of source changes. Please specifiy
commit message"
fi
fi
@@ -1024,32 +1135,30 @@
done
echo "++ comitting changes to CVS repository"
- cd ${OPENPKG_WORK} || die "cannot cd to ${OPENPKG_WORK}"
+ cd "${OPENPKG_WORK}" || die "cannot cd to ${OPENPKG_WORK}"
if [ ".${msg}" != . -a -f "${msg}" ]; then
if [ ${dry} -eq 0 ]; then
cvs -d ${OPENPKG_REPO} commit -F "${msg}" $files
else
echo cvs commit -F "${msg}" $files
- cvs -d ${OPENPKG_REPO} diff $files
+ cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
fi
elif [ ".${msg}" = ".-" ]; then
if [ ${dry} -eq 0 ]; then
cvs -d ${OPENPKG_REPO} commit $files
else
echo cvs commit $files
- cvs -d ${OPENPKG_REPO} diff $files
+ cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
fi
else
if [ ${dry} -eq 0 ]; then
cvs -d ${OPENPKG_REPO} commit -m "${msg}" $files
else
echo cvs commit -m "${msg}" $files
- cvs -d ${OPENPKG_REPO} diff $files
+ cvs -d ${OPENPKG_REPO} diff $files | ${cvs_diff_colorize}
fi
fi
else
- msg="$2"
-
echo "++ determining contributor identification"
thisdate=`${OPENPKG_INST}/lib/openpkg/shtool echo -e '%D-%m-%Y'`
username=`${OPENPKG_INST}/lib/openpkg/shtool echo -e '%u'`
@@ -1079,9 +1188,10 @@
${OPENPKG_INST}/lib/openpkg/curl --upload-file
${OPENPKG_WORK}/${basename}.diff ${OPENPKG_DIST}/${basename}.diff
else
echo ${OPENPKG_INST}/lib/openpkg/curl --upload-file
${OPENPKG_WORK}/${basename}.diff ${OPENPKG_DIST}/${basename}.diff
- cat ${OPENPKG_WORK}/${basename}.diff
+ cat ${OPENPKG_WORK}/${basename}.diff | ${cvs_diff_colorize}
fi
fi
+ done
}
kill () {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-re/pmod-psod.txt
============================================================================
$ cvs diff -u -r1.36 -r1.37 pmod-psod.txt
--- openpkg-re/pmod-psod.txt 1 Apr 2003 08:40:48 -0000 1.36
+++ openpkg-re/pmod-psod.txt 1 Apr 2003 15:16:23 -0000 1.37
@@ -139,7 +139,7 @@
openpkg-dev$ rm ${OPENPKG_WORK}/dst/$P/*
#OPTION2
openpkg-dev$ rpm --fetch $P.spec
openpkg-dev$ rpm -ba $P.spec
- openpkg-dev$ openpkg-dev peek $P
+ openpkg-dev$ openpkg-dev peek
openpkg-dev$ root rpm -Uvh ${OPENPKG_WORK}/pkg/bin/$P-*-`date +%Y%m%d`.*.rpm
openpkg-dev$ vi ${OPENPKG_WORK}/re/vcheck/vc.$P
@@ -149,36 +149,35 @@
#OPTION1 removes files provided by OpenPKG from dst cache (i.e. patches, rc
files, config)
#OPTION2 removes all files from dst cache (required if vendor uses same
filename for different releases)
-- list source and binary packages by executing the "list" function. The
- wildcard argument is optional and a asterix is added to it automatically.
- If the wildcard is omitted, $P will be taken and a more restrictive match
- to OpenPKG/RPM filename conventions will be used.
+- list source and binary packages by executing the "list" function. The
+ package argument is optional and defaults to $P. Multiple packages
+ might be specified.
openpkg-dev$ openpkg-dev list
- openpkg-dev$ openpkg-dev list <wildcard>
+ openpkg-dev$ openpkg-dev list [[package] ...]
-- diff before a release by executing the "diff" function. This is a
- "dry" run of the "release" function without altering anything.
-
- openpkg-dev$ openpkg-dev diff <package>
- openpkg-dev$ openpkg-dev diff <package> "comment"
+- diff before a release by executing the "diff" function. This is the
+ same as adding the "-dry" option to the "release" function.
- release a package to the OpenPKG community by executing the "release"
function. Members of the OpenPKG development team commit changes
directly into the CVS repository and website while contributers upload
- news and changes to the contributor area.
+ news and changes to the contributor area. The package argument is
+ optional and defaults to $P. Multiple packages might be specified.
- openpkg-dev$ openpkg-dev release <package>
+ Adding the "-dry" option executes a dry run and does not alter
+ anything.
For packaging updates and new vendor releases, the commit message is
usually generated automatically. If the automatic fails or a manual
- message should be given, use
-
- openpkg-dev$ openpkg-dev release <package> "comment"
+ message should be given, use the "-m" option with an argument to
+ specify a comment for the cvs commit. If a file with name of the
+ argument exists, it's contents will be read to retrieve the actual
+ message. Using '-' as the filename will omit the comment so the cvs
+ command will open an editor.
- where "comment" is checked to be a file and if found, the contents of
- the file are used otherwise "comment" is treated as the comment
- itself.
+ openpkg-dev$ openpkg-dev release -dry
+ openpkg-dev$ openpkg-dev release [[package] ...] [-m "comment"] [-dry]
- kill the development environment by executing the "kill" function.
This will discard the wholly directory structure and any unsaved data
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]