Skip to content

Commit

Permalink
Merge pull request #18 in HSE/hse-ycsb from updates/NFSE-4169 to v0.1…
Browse files Browse the repository at this point in the history
…7.0-hse

* commit 'f8afb001fd8d4ac64e7a0e2e0356330d38bdbf5a':
  Use a version file to determine release versions.
  • Loading branch information
jjacob512 committed May 27, 2020
2 parents 1fe91cb + f8afb00 commit f0fd96e
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ ifeq ($(YCSBSHA),.)
endif
TSTAMP:=.$(shell date +"%Y%m%d.%H%M%S")

HSE_YCSB_VER=$(shell cat hse/VERSION)
HSE_BINDING_VER=$(shell cut -d . -f 4- hse/VERSION)

.PHONY: all check-hse cleansrcs dist help srcs rpm
all: rpm

Expand All @@ -107,8 +110,9 @@ cleanbuilds:
rm -rf $(TOPDIR)/{BUILD,RPMS,SRPMS}

dist: check-hse
mvn versions:set-property -DnewVersion=$(HSE_BINDING_VER) -Dproperty=hse.version
mvn install:install-file -Dfile=$(HSE_JAR) -DgroupId=test.org.hse\
-DartifactId=hse -Dversion=0.1 -Dpackaging=jar
-DartifactId=hse -Dversion=$(HSE_BINDING_VER) -Dpackaging=jar
mvn clean package

help:
Expand All @@ -126,6 +130,7 @@ rpm: dist srcs
--define="_topdir $(TOPDIR)" \
--define="rel_candidate $(REL_CANDIDATE)" \
--define="buildno $(JENKINS_BUILDNO)" \
--define="hseycsbversion $(HSE_YCSB_VER)" \
$(RPMSRCDIR)/hse-ycsb.spec

srcs: cleansrcs
Expand Down
2 changes: 1 addition & 1 deletion hse-ycsb.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Summary: Yahoo! Cloud Serving Benchmark
Name: hse-ycsb
Version: 0.17.0.1
Version: %{hseycsbversion}
%if %{rel_candidate} == "FALSE"
Release: %{hseversion}.%{buildno}%{hsesha}%{ycsbsha}%{?dist}
%else
Expand Down
1 change: 1 addition & 0 deletions hse/VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.17.0.0.0
2 changes: 1 addition & 1 deletion hse/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ This code is derived from the ycsb project.
<dependency>
<groupId>test.org.hse</groupId>
<artifactId>hse</artifactId>
<version>0.1</version>
<version>${hse.version}</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ This code is derived from the ycsb project.
<tablestore.version>4.8.0</tablestore.version>
<voltdb.version>9.1.1</voltdb.version>

<hse.version>0.1</hse.version>
<hse.version>0.0</hse.version>
</properties>

<modules>
Expand Down

0 comments on commit f0fd96e

Please sign in to comment.