mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-18 03:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2018-11-18 20:25:46 -08:00
parent 9e2687b532 7c0540c556
commit cd5f3cc54f
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -54,11 +54,13 @@ EMULEX_DIR=emulex
ISCSI_DIR=iscsi-scst
REVISION ?= $(shell if svn info >/dev/null 2>&1; \
then svn info | sed -n 's/^Revision:[[:blank:]]*//p';\
else git log | grep -c ^commit; \
REVISION ?= $(shell if [ -e .svn ]; then \
svn info | sed -n 's/^Revision:[[:blank:]]*/./p'; \
elif [ -e .git ]; then \
echo -n .; \
git log | grep -c ^commit; \
fi)
VERSION := $(shell echo -n "$$(sed -n 's/^\#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^-]*\).*\"/\1/p' scst/include/scst_const.h).$(REVISION)")
VERSION := $(shell echo -n "$$(sed -n 's/^\#define[[:blank:]]SCST_VERSION_NAME[[:blank:]]*\"\([^-]*\).*\"/\1/p' scst/include/scst_const.h)$(REVISION)")
DEBIAN_REVISION=1
help:

8
scripts/generate-release-archive
View File

@@ -20,7 +20,9 @@ if [ -z "$files" ]; then
fi
fi
result=../$name-$version.tar.bz2
rm -f "${result}"
for f in "${files[@]}"; do echo "$f"; done | \
tar --owner=root --group=root --transform="s|^|$name-$version/|" \
-cjf "$name-$version.tar.bz2" -T- -h &&
ls -l "$name-$version.tar.bz2"
tar --owner=root --group=root --transform="s|^|$name-$version/|;s|^$name-$version/../scst/include/backport.h$|../scst/include/backport.h|;s|^$name-$version/scstadmin.sysfs$|scstadmin.sysfs|" \
-cjf "${result}" -T- &&
ls -l "${result}"

4
scripts/list-source-files
View File

@@ -17,7 +17,7 @@ list_source_files() {
grep -vE '^[D?]|^Performing|^$' | \
cut -c3- | \
while read -r a b c f; do
if [ -f "$f" ]; then
if [ -f "$f" -o -h "$f" ]; then
echo "$a $b $c" >/dev/null
echo "$f"
fi
@@ -39,7 +39,7 @@ list_source_files() {
hg manifest
fi
else
echo "Not under source control: $1 ?" >&2
( cd "$d" && find -type f -o -type l | sed 's|^\./||' )
fi
}

10
scstadmin/Makefile
View File

@@ -2,11 +2,13 @@ ifndef PREFIX
PREFIX=/usr/local
endif
REVISION ?= $(shell if svn info >/dev/null 2>&1; \
then svn info | sed -n 's/^Revision:[[:blank:]]*//p';\
else git log | grep -c ^commit; \
REVISION ?= $(shell if [ -e .svn ]; then \
svn info | sed -n 's/^Revision:[[:blank:]]*/./p'; \
elif [ -e .git ]; then \
echo -n .; \
git log | grep -c ^commit; \
fi)
VERSION = $(shell echo -n "$$(sed -n 's/^[[:blank:]]*\$$VERSION[[:blank:]]*=[[:blank:]]*[\"'"'"']\([0-9.]*\)[\"'"'"'];$$/\1/p' scstadmin/scst-*/lib/SCST/SCST.pm).$(REVISION)")
VERSION = $(shell echo -n "$$(sed -n 's/^[[:blank:]]*\$$VERSION[[:blank:]]*=[[:blank:]]*[\"'"'"']\([0-9.]*\)[\"'"'"'];$$/\1/p' scstadmin/scst-*/lib/SCST/SCST.pm)$(REVISION)")
SCSTADMIN_DIR = $(shell if [ ! -h scstadmin ]; then \
rm -f scstadmin; \