andreacavalli/scylla-jmx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dist: merge product name parameter on single place

Browse Source 
When we add product name customization, we mistakenly defined the
parameter on each package build script.
Number of script is increasing since we recently added relocatable
python3 package, we should merge it in single place.

Also we should save the parameter on relocatable package, just like
version-release parameters.

So move the definition to SCYLLA-VERSION-GEN, save it to
build/SCYLLA-PRODUCT-FILE then archive it to relocatable package.

Signed-off-by: Takuya ASADA <syuu@scylladb.com>
Message-Id: <20190422105304.23454-1-syuu@scylladb.com>
This commit is contained in:
Takuya ASADA 2019-04-22 19:53:04 +09:00 committed by Avi Kivity
parent cb1ac4a58c
commit 5e50090bfd
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SCYLLA-VERSION-GEN
View File

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
PRODUCT=scylla
VERSION=666.development VERSION=666.development
if test -f version if test -f version
@ -17,3 +18,4 @@ echo "$SCYLLA_VERSION-$SCYLLA_RELEASE"
mkdir -p build mkdir -p build
echo "$SCYLLA_VERSION" > build/SCYLLA-VERSION-FILE echo "$SCYLLA_VERSION" > build/SCYLLA-VERSION-FILE
echo "$SCYLLA_RELEASE" > build/SCYLLA-RELEASE-FILE echo "$SCYLLA_RELEASE" > build/SCYLLA-RELEASE-FILE
echo "$PRODUCT" > build/SCYLLA-PRODUCT-FILE

2
dist/debian/build_deb.sh vendored
View File

@ -1,6 +1,6 @@
#!/bin/bash -e #!/bin/bash -e
PRODUCT=scylla PRODUCT=$(cat SCYLLA-PRODUCT-FILE)
. /etc/os-release . /etc/os-release
print_usage() { print_usage() {

2
dist/redhat/build_rpm.sh vendored
View File

@ -1,6 +1,6 @@
#!/bin/bash -e #!/bin/bash -e
PRODUCT=scylla PRODUCT=$(cat SCYLLA-PRODUCT-FILE)
. /etc/os-release . /etc/os-release
print_usage() { print_usage() {

2
reloc/build_rpm.sh
View File

@ -25,6 +25,6 @@ if [[ ! $OPTS =~ --reloc-pkg ]]; then
OPTS="$OPTS --reloc-pkg $RELOC_PKG" OPTS="$OPTS --reloc-pkg $RELOC_PKG"
fi fi
mkdir -p build/redhat/scylla-package mkdir -p build/redhat/scylla-package
tar -C build/redhat/scylla-package -xpf $RELOC_PKG SCYLLA-RELEASE-FILE SCYLLA-RELOCATABLE-FILE SCYLLA-VERSION-FILE dist/redhat tar -C build/redhat/scylla-package -xpf $RELOC_PKG SCYLLA-RELEASE-FILE SCYLLA-RELOCATABLE-FILE SCYLLA-VERSION-FILE SCYLLA-PRODUCT-FILE dist/redhat
cd build/redhat/scylla-package cd build/redhat/scylla-package
exec ./dist/redhat/build_rpm.sh $OPTS exec ./dist/redhat/build_rpm.sh $OPTS

1
scripts/create-relocatable-package.py
View File

@ -41,6 +41,7 @@ pathlib.Path('build/SCYLLA-RELOCATABLE-FILE').touch()
ar.add('build/SCYLLA-RELOCATABLE-FILE', arcname='SCYLLA-RELOCATABLE-FILE') ar.add('build/SCYLLA-RELOCATABLE-FILE', arcname='SCYLLA-RELOCATABLE-FILE')
ar.add('build/SCYLLA-RELEASE-FILE', arcname='SCYLLA-RELEASE-FILE') ar.add('build/SCYLLA-RELEASE-FILE', arcname='SCYLLA-RELEASE-FILE')
ar.add('build/SCYLLA-VERSION-FILE', arcname='SCYLLA-VERSION-FILE') ar.add('build/SCYLLA-VERSION-FILE', arcname='SCYLLA-VERSION-FILE')
ar.add('build/SCYLLA-PRODUCT-FILE', arcname='SCYLLA-PRODUCT-FILE')
ar.add('dist') ar.add('dist')
ar.add('target/scylla-jmx-1.0.jar', arcname='scylla-jmx-1.0.jar') ar.add('target/scylla-jmx-1.0.jar', arcname='scylla-jmx-1.0.jar')
ar.add('scripts/scylla-jmx', arcname='scylla-jmx') ar.add('scripts/scylla-jmx', arcname='scylla-jmx')