diff options
author | Harel Ben-Attia <harelba@gmail.com> | 2017-04-06 19:11:07 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-06 19:11:07 +0300 |
commit | f8bbceafb991f5580ea89266f298ae10865bcf42 (patch) | |
tree | d543b254177909dfe9b9550f0c5f16aa28b24188 /dist | |
parent | cfe2d047810cc54821bc3832e2076d373c643d0a (diff) | |
parent | 94bae328b5e083a2e1fbe87b9d40062efd97971a (diff) |
Merge pull request #143 from harelba/v1.6.0-release-test1.6.2
V1.6.2 stuff
Diffstat (limited to 'dist')
-rwxr-xr-x | dist/create-rpm | 20 | ||||
-rw-r--r-- | dist/deb-builder-Dockerfile | 8 | ||||
-rw-r--r-- | dist/q-text-as-data.spec.template | 10 | ||||
-rw-r--r-- | dist/rpm-builder-Dockerfile | 12 |
4 files changed, 38 insertions, 12 deletions
diff --git a/dist/create-rpm b/dist/create-rpm index a841db5..7d86661 100755 --- a/dist/create-rpm +++ b/dist/create-rpm @@ -5,9 +5,9 @@ # # -if [ $# -ne 2 ]; +if [ $# -ne 1 ]; then - echo 'create-rpm <commit-hash> <version>' + echo 'create-rpm <version>' exit 1 fi @@ -26,9 +26,7 @@ mkdir -p ${rpm_build_area}/{SOURCES,SPECS,BUILD,RPMS,SRPMS,BUILDROOT} echo RPM build area is in ${rpm_build_area} -COMMIT_HASH=$1 -SHORT_HASH=${COMMIT_HASH:0:7} -VERSION=$2 +VERSION=$1 REAL_PACKAGE_NAME=q RPM_PACKAGE_NAME=q-text-as-data @@ -40,11 +38,15 @@ then exit 1 fi -rm -vf ${rpm_build_area}/SOURCES/q-${COMMIT_HASH}.tar.gz - -curl -o ${rpm_build_area}/SOURCES/q-${COMMIT_HASH}.tar.gz -L -R "https://github.com/harelba/q/tarball/${COMMIT_HASH}" +curl -o ${rpm_build_area}/SOURCES/q.tar.gz -L -R "https://github.com/harelba/q/tarball/${VERSION}" +mkdir -p ${rpm_build_area}/SOURCES +pushd ${rpm_build_area}/SOURCES >/dev/null +tar xvzf ./q.tar.gz --strip-components=1 +rm -vf ./q.tar.gz +popd >/dev/null +find ${rpm_build_area}/ -ls -cat ${RPM_PACKAGE_NAME}.spec.template | sed "s/VERSION_PLACEHOLDER/$VERSION/g" | sed "s/COMMIT_HASH_PLACEHOLDER/${COMMIT_HASH}/g" | sed "s/SHORT_HASH_PLACEHOLDER/${SHORT_HASH}/g" > ${rpm_build_area}/SPECS/${RPM_PACKAGE_NAME}.spec +cat ${RPM_PACKAGE_NAME}.spec.template | sed "s/VERSION_PLACEHOLDER/$VERSION/g" > ${rpm_build_area}/SPECS/${RPM_PACKAGE_NAME}.spec rpmbuild -v --define "_topdir ${rpm_build_area}" -ba ${rpm_build_area}/SPECS/${RPM_PACKAGE_NAME}.spec diff --git a/dist/deb-builder-Dockerfile b/dist/deb-builder-Dockerfile new file mode 100644 index 0000000..7ff7b08 --- /dev/null +++ b/dist/deb-builder-Dockerfile @@ -0,0 +1,8 @@ + +FROM ubuntu:12.04 + +RUN apt-get update && apt-get install -y alien + +ENTRYPOINT "/bin/bash" + + diff --git a/dist/q-text-as-data.spec.template b/dist/q-text-as-data.spec.template index 4f271e6..ad3d0c2 100644 --- a/dist/q-text-as-data.spec.template +++ b/dist/q-text-as-data.spec.template @@ -10,7 +10,6 @@ Summary: q - Text as Data Group: Applications/Text License: GPLv3 URL: https://github.com/harelba/q -Source: q-COMMIT_HASH_PLACEHOLDER.tar.gz BuildArch: noarch %description @@ -18,10 +17,12 @@ q allows to perform SQL-like statements on tabular text data. %prep -%setup -qn harelba-q-SHORT_HASH_PLACEHOLDER +cd %{_topdir}/BUILD +cp -vrf %{_topdir}/SOURCES/* %{_topdir}/BUILD/ +chmod -Rf a+rX,u+w,g-w,o-w %{_topdir}/BUILD/ %build -ls -ltr +cd %{_topdir}/BUILD ronn doc/USAGE.markdown %install @@ -43,6 +44,9 @@ gzip ${RPM_BUILD_ROOT}%{_mandir}/man1/q.1 %doc %_mandir/man1/q.1.gz %changelog +*Wed Apr 05 2017 Harel Ben-Attia <harelba@gmail.com> 1.6.0-1 +- Moved RPM building to be dockerized +- Removed the need for providing commit hashes *Fri Dec 12 2014 Harel Ben-Attia <harelba@gmail.com> 1.5.0-1 - Moved stuff from create-rpm script into the rpm spec itself *Sat Jun 14 2014 Harel Ben-Attia <harelba@gmail.com> 1.4.0-1 diff --git a/dist/rpm-builder-Dockerfile b/dist/rpm-builder-Dockerfile new file mode 100644 index 0000000..dafcd1e --- /dev/null +++ b/dist/rpm-builder-Dockerfile @@ -0,0 +1,12 @@ + +FROM centos:centos6 + +RUN yum install -y which curl gcc make rpm rpm-build + +RUN curl -sSL https://get.rvm.io | bash + +RUN /bin/bash -l -c "rvm install 2.4.1" && /bin/bash -l -c "gem install ronn" + +ENTRYPOINT "/bin/bash" + + |