mirror of
				https://github.com/ohwgiles/laminar.git
				synced 2025-06-13 12:54:29 +00:00 
			
		
		
		
	build scripts: debian 10 is now current stable
This commit is contained in:
		
							parent
							
								
									5d31d4152e
								
							
						
					
					
						commit
						2ee950d1c3
					
				@ -4,11 +4,11 @@ OUTPUT_DIR=$PWD
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 | 
					SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
 | 
					VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian10
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DOCKER_TAG=$(docker build -q - <<EOS
 | 
					DOCKER_TAG=$(docker build -q - <<EOS
 | 
				
			||||||
FROM debian:9-slim
 | 
					FROM debian:10-slim
 | 
				
			||||||
RUN apt-get update && apt-get install -y wget cmake g++ libsqlite3-dev libboost-dev zlib1g-dev
 | 
					RUN apt-get update && apt-get install -y wget cmake g++ capnproto libcapnp-dev rapidjson-dev libsqlite3-dev libboost-dev zlib1g-dev
 | 
				
			||||||
EOS
 | 
					EOS
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -17,26 +17,6 @@ docker run --rm -i -v $SOURCE_DIR:/laminar:ro -v $OUTPUT_DIR:/output $DOCKER_TAG
 | 
				
			|||||||
mkdir /build
 | 
					mkdir /build
 | 
				
			||||||
cd /build
 | 
					cd /build
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/v0.7.0.tar.gz
 | 
					 | 
				
			||||||
wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
 | 
					 | 
				
			||||||
md5sum -c <<EOF
 | 
					 | 
				
			||||||
a9de5f042f4cf05515c2d7dfc7f5df21  capnproto.tar.gz
 | 
					 | 
				
			||||||
badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
 | 
					 | 
				
			||||||
EOF
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
tar xzf capnproto.tar.gz
 | 
					 | 
				
			||||||
tar xzf rapidjson.tar.gz
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
cd /build/capnproto-0.7.0/c++/
 | 
					 | 
				
			||||||
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off .
 | 
					 | 
				
			||||||
make -j4
 | 
					 | 
				
			||||||
make install
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
cd /build/rapidjson-1.1.0/
 | 
					 | 
				
			||||||
cmake -DRAPIDJSON_BUILD_EXAMPLES=off .
 | 
					 | 
				
			||||||
make install
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
cd /build
 | 
					 | 
				
			||||||
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix /laminar
 | 
					cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/ -DZSH_COMPLETIONS_DIR=/usr/share/zsh/functions/Completion/Unix /laminar
 | 
				
			||||||
make -j4
 | 
					make -j4
 | 
				
			||||||
mkdir laminar
 | 
					mkdir laminar
 | 
				
			||||||
 | 
				
			|||||||
@ -4,11 +4,11 @@ OUTPUT_DIR=$PWD
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 | 
					SOURCE_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian9
 | 
					VERSION=$(cd "$SOURCE_DIR" && git describe --tags --abbrev=8 --dirty)-1~upstream-debian10
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DOCKER_TAG=$(docker build -q - <<EOS
 | 
					DOCKER_TAG=$(docker build -q - <<EOS
 | 
				
			||||||
FROM debian:9-slim
 | 
					FROM debian:10-slim
 | 
				
			||||||
RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y wget cmake crossbuild-essential-armhf libsqlite3-dev:armhf libboost-dev:armhf zlib1g-dev:armhf
 | 
					RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y wget cmake crossbuild-essential-armhf capnproto libcapnp-dev:armhf rapidjson-dev libsqlite3-dev:armhf libboost-dev:armhf zlib1g-dev:armhf
 | 
				
			||||||
EOS
 | 
					EOS
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -23,31 +23,6 @@ SET(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
 | 
				
			|||||||
set(CMAKE_LIBRARY_ARCHITECTURE arm-linux-gnueabihf)
 | 
					set(CMAKE_LIBRARY_ARCHITECTURE arm-linux-gnueabihf)
 | 
				
			||||||
EOF
 | 
					EOF
 | 
				
			||||||
 | 
					
 | 
				
			||||||
wget -O capnproto.tar.gz https://github.com/capnproto/capnproto/archive/v0.7.0.tar.gz
 | 
					 | 
				
			||||||
wget -O rapidjson.tar.gz https://github.com/miloyip/rapidjson/archive/v1.1.0.tar.gz
 | 
					 | 
				
			||||||
md5sum -c <<EOF
 | 
					 | 
				
			||||||
a9de5f042f4cf05515c2d7dfc7f5df21  capnproto.tar.gz
 | 
					 | 
				
			||||||
badd12c511e081fec6c89c43a7027bce  rapidjson.tar.gz
 | 
					 | 
				
			||||||
EOF
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
tar xzf capnproto.tar.gz
 | 
					 | 
				
			||||||
tar xzf rapidjson.tar.gz
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
mkdir capnproto-host
 | 
					 | 
				
			||||||
cd capnproto-host
 | 
					 | 
				
			||||||
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=off /build/capnproto-0.7.0/c++/
 | 
					 | 
				
			||||||
make -j4
 | 
					 | 
				
			||||||
make install
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
cd /build/capnproto-0.7.0/c++/
 | 
					 | 
				
			||||||
cmake -DCMAKE_TOOLCHAIN_FILE=../../toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/usr/arm-linux-gnueabihf/ .
 | 
					 | 
				
			||||||
make -j4
 | 
					 | 
				
			||||||
make install
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
cd /build/rapidjson-1.1.0/
 | 
					 | 
				
			||||||
cmake -DRAPIDJSON_BUILD_EXAMPLES=off -DCMAKE_INSTALL_PREFIX=/usr/arm-linux-gnueabihf/ .
 | 
					 | 
				
			||||||
make install
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
cd /build
 | 
					cd /build
 | 
				
			||||||
cmake \
 | 
					cmake \
 | 
				
			||||||
	-DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
 | 
						-DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user