mirror of
https://github.com/nsacyber/HIRS.git
synced 2025-02-06 11:10:15 +00:00
Add git timestamp and hash to the rpm name. Also centralize version number to package.sh.
This commit is contained in:
parent
65471c87f1
commit
f8c593c4b7
@ -1,5 +1,4 @@
|
|||||||
apply plugin: 'java'
|
apply plugin: 'java'
|
||||||
version = '2.1.0'
|
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
@ -1,17 +1,20 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
VERSION=2.1.0
|
||||||
|
GIT_HASH=`git rev-parse HEAD | head -c6`
|
||||||
|
GIT_COMMIT_UNIX_TIMESTAMP=`git show -s --format=%ct | xargs echo -n`
|
||||||
|
RELEASE="$((GIT_COMMIT_UNIX_TIMESTAMP)).$GIT_HASH"
|
||||||
|
name="tcg_rim_tool"
|
||||||
|
|
||||||
# Enter package directory
|
# Enter package directory
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
pushd $SCRIPT_DIR
|
pushd $SCRIPT_DIR
|
||||||
|
|
||||||
name="tcg_rim_tool"
|
tar -cf "$name-$VERSION.$RELEASE".tar build.gradle gradle* src/ docs/ rim_fields.json keystore.jks scripts/
|
||||||
|
gzip -f "$name-$VERSION.$RELEASE".tar
|
||||||
tar -cf $name.tar build.gradle gradle* src/ docs/ rim_fields.json keystore.jks scripts/
|
|
||||||
gzip -f $name.tar
|
|
||||||
if [ -d rpmbuild ]; then
|
if [ -d rpmbuild ]; then
|
||||||
rm -rf rpmbuild
|
rm -rf rpmbuild
|
||||||
fi
|
fi
|
||||||
mkdir -p rpmbuild/BUILD rpmbuild/BUILDROOT rpmbuild/SOURCES rpmbuild/RPMS rpmbuild/SPECS rpmbuild/SRPMS
|
mkdir -p rpmbuild/BUILD rpmbuild/BUILDROOT rpmbuild/SOURCES rpmbuild/RPMS rpmbuild/SPECS rpmbuild/SRPMS
|
||||||
rpmbuild -bb $name.spec --define "_sourcedir $PWD" --define "_topdir $PWD/rpmbuild"
|
rpmbuild -bb $name.spec --define "_sourcedir $PWD" --define "_topdir $PWD/rpmbuild" --define 'RELEASE '$RELEASE --define 'VERSION '$VERSION
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
Name: tcg_rim_tool
|
Name: tcg_rim_tool
|
||||||
Version: 2.1.0
|
Version: %{?VERSION}
|
||||||
Release: 1%{?dist}
|
Release: %{?RELEASE}
|
||||||
Summary: A java command-line tool to create PC client root RIM
|
Summary: A java command-line tool to create PC client root RIM
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: https://github.com/nsacyber/HIRS
|
URL: https://github.com/nsacyber/HIRS
|
||||||
Source0: %{name}.tar.gz
|
Source0: %{name}-%{version}.%{release}.tar.gz
|
||||||
|
|
||||||
BuildRequires: java-headless >= 1:1.8.0
|
BuildRequires: java-headless >= 1:1.8.0
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ This tool will generate a base RIM file for PC clients in accordance with the sc
|
|||||||
rm -f /opt/hirs/rimtool/%{name}*.jar
|
rm -f /opt/hirs/rimtool/%{name}*.jar
|
||||||
|
|
||||||
%build
|
%build
|
||||||
./gradlew build
|
./gradlew -Pversion=%{version} build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
mkdir -p %{buildroot}/opt/hirs/rimtool/ %{buildroot}/usr/local/bin
|
mkdir -p %{buildroot}/opt/hirs/rimtool/ %{buildroot}/usr/local/bin
|
||||||
|
Loading…
x
Reference in New Issue
Block a user