From 1b49a7e69c5480f5af48bb3c08193e0d20327e0e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 13 Nov 2014 14:21:01 +0100 Subject: Pimped thrift compilation script to warn if not using 0.9.1 --- thrift-compile.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'thrift-compile.sh') diff --git a/thrift-compile.sh b/thrift-compile.sh index 4ff5b17..d9a0428 100755 --- a/thrift-compile.sh +++ b/thrift-compile.sh @@ -1,10 +1,21 @@ #!/bin/sh -rm -r gen-java -thrift --gen java src/main/thrift/imagemaster.thrift && { -# find gen-java -type f -name "*.java" -exec sed -i 's/Autogenerated by Thrift Compiler \(.*\)/Autogenerated by Thrift Compiler/g' {} \; - rm -r src/main/java/org/openslx/imagemaster/thrift/iface - cp -r gen-java/org src/main/java/ -} +if ! thrift --version | grep -q "0\.9\.1"; then + echo -n "Warning! You should be using Thrift 0.9.1, but you have $(thrift --version), do you still want to continue? [y/N]: " + read choice + if [ "x${choice:0:1}" != "xy" ]; then + echo "Aborting!" + exit 0 + fi + echo "OK, compiling..." +fi +[ -e gen-java ] && rm -r gen-java +if thrift --gen java src/main/thrift/imagemaster.thrift; then + [ -e "src/main/java/org/openslx/imagemaster/thrift/iface" ] && rm -rf src/main/java/org/openslx/imagemaster/thrift/iface + cp -r gen-java/org src/main/java/ && echo "Success." && exit 0 +fi + +echo "Error!" +exit 1 -- cgit v1.2.3-55-g7522