Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Pull in changes to build scripts that were merged to develop #6362

Merged
merged 1 commit into from
Nov 20, 2018
Merged

Pull in changes to build scripts that were merged to develop #6362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/generate_bottle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
VERS=`sw_vers -productVersion | awk '/10\.13\..*/{print $0}'`
if [[ -z "$VERS" ]];
then
VERS=`sw_vers -productVersion | awk '/10\.14\..*/{print $0}'`
VERS=`sw_vers -productVersion | awk '/10\.14.*/{print $0}'`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there version strings that omit the dot after 10.14, if so, is that the same for line 3 where we have 10.13. as the literal match?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason the mojave version string is just 10.14 where as high sierra is 10.13.xx. So in the case of high sierra we need that extra dot.

if [[ -z "$VERS" ]];
then
echo "Error, unsupported OS X version"
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_deb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/bash

NAME="${PROJECT}-${VERSION}.x86_64"
NAME="${PROJECT}_${VERSION}-1_amd64"
PREFIX="usr"
SPREFIX=${PREFIX}
SUBPREFIX="opt/${PROJECT}/${VERSION}"
Expand Down
8 changes: 4 additions & 4 deletions scripts/generate_rpm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/bash

NAME="${PROJECT}-${VERSION}.x86_64"
NAME="${PROJECT}-${VERSION}-1"
PREFIX="usr"
SPREFIX=${PREFIX}
SUBPREFIX="opt/${PROJECT}/${VERSION}"
Expand All @@ -13,7 +13,7 @@ export SSUBPREFIX

bash generate_tarball.sh ${NAME}.tar.gz

RPMBUILD=`realpath ~/rpmbuild/BUILDROOT/${NAME}-0.x86_64`
RPMBUILD=`realpath ~/rpmbuild/BUILDROOT/${NAME}.x86_64`
mkdir -p ${RPMBUILD}
FILES=$(tar -xvzf ${NAME}.tar.gz -C ${RPMBUILD})
PFILES=""
Expand All @@ -26,15 +26,15 @@ echo -e ${PFILES} &> ~/rpmbuild/BUILD/filenames.txt

mkdir -p ${PROJECT}
echo -e "Name: ${PROJECT}
Version: ${VERSION}.x86_64
Version: ${VERSION}
License: MIT
Vendor: ${VENDOR}
Source: ${URL}
Requires: openssl-devel.x86_64, gmp-devel.x86_64, libstdc++-devel.x86_64, bzip2.x86_64, bzip2-devel.x86_64, mongodb.x86_64, mongodb-server.x86_64
URL: ${URL}
Packager: ${VENDOR} <${EMAIL}>
Summary: ${DESC}
Release: 0
Release: 1
%description
${DESC}
%files -f filenames.txt" &> ${PROJECT}.spec
Expand Down