Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

zlib dep, build script fixes, v0.2

Browse Source
This commit is contained in:
Oliver Giles 2015-12-06 14:07:16 +01:00
parent 82b39c2961
commit 9521ba0bab
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker-build-centos.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
VERSION=0.1 VERSION=0.2
OUTPUT_DIR=$PWD OUTPUT_DIR=$PWD
@ -8,7 +8,7 @@ SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output centos bash -xe <<EOS docker run --rm -i -v $SOURCE_DIR:/root/rpmbuild/SOURCES/laminar-$VERSION:ro -v $OUTPUT_DIR:/output centos bash -xe <<EOS
yum -y install rpm-build cmake make gcc gcc-c++ wget sqlite-devel boost-devel yum -y install rpm-build cmake make gcc gcc-c++ wget sqlite-devel boost-devel zlib-devel
mkdir /build mkdir /build
cd /build cd /build
@ -47,7 +47,7 @@ Version: $VERSION
Release: 1 Release: 1
License: GPL License: GPL
BuildRequires: systemd-units BuildRequires: systemd-units
Requires: boost-filesystem Requires: boost-filesystem zlib
%description %description
Lightweight Continuous Integration Service Lightweight Continuous Integration Service
@ -55,7 +55,7 @@ Lightweight Continuous Integration Service
%prep %prep
%build %build
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ %{_sourcedir}/laminar-0.1 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ %{_sourcedir}/laminar-$VERSION
pwd pwd
make make
@ -76,5 +76,5 @@ chown -R laminar: %{_sharedstatedir}/laminar
EOF EOF
rpmbuild -ba laminar.spec rpmbuild -ba laminar.spec
mv rpmbuild/RPMS/x86_64/laminar-0.1-1.x86_64.rpm /output/ mv rpmbuild/RPMS/x86_64/laminar-$VERSION-1.x86_64.rpm /output/
EOS EOS

9
docker-build-ubuntu.sh
View File

@ -1,16 +1,15 @@
#!/bin/bash #!/bin/bash
VERSION=0.1 VERSION=0.2
OUTPUT_DIR=$PWD OUTPUT_DIR=$PWD
SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]})) SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
#docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output ubuntu bash -xe <<EOS docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output ubuntu bash -xe <<EOS
docker run -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output ubuntu bash -xe <<EOS
apt-get update apt-get update
apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.55-dev apt-get install -y wget cmake g++ libsqlite3-dev libboost-filesystem1.55-dev zlib1g-dev
mkdir /build mkdir /build
cd /build cd /build
@ -55,7 +54,7 @@ Section:
Priority: optional Priority: optional
Architecture: amd64 Architecture: amd64
Maintainer: Oliver Giles <web ohwg net> Maintainer: Oliver Giles <web ohwg net>
Depends: libboost-filesystem1.55.0 Depends: libboost-filesystem1.55.0, zlib1g
Description: Lightweight Continuous Integration Service Description: Lightweight Continuous Integration Service
EOF EOF
cat <<EOF > laminar/DEBIAN/postinst cat <<EOF > laminar/DEBIAN/postinst