From f8e97ab2c522911bd60f06e978051cc297487aec Mon Sep 17 00:00:00 2001 From: Jaeho Shin Date: Sun, 15 Jan 2017 23:37:19 -0800 Subject: [PATCH] Improves deepdive-compile to record and check deepdive version and not skip compilation when a different version is used --- compiler/app-has-nothing-to-compile | 7 +++++++ compiler/deepdive-compile | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/compiler/app-has-nothing-to-compile b/compiler/app-has-nothing-to-compile index c9dcca657..1050029d0 100755 --- a/compiler/app-has-nothing-to-compile +++ b/compiler/app-has-nothing-to-compile @@ -11,6 +11,13 @@ DEEPDIVE_APP=$(find-deepdive-app) export DEEPDIVE_APP cd "$DEEPDIVE_APP" +# check if deepdive version has changed +deepdive-version | +diff -q "$DEEPDIVE_APP"/run/compiled/deepdive.version - || { + warning 'deepdive version updated since last `deepdive compile`' + exit 127 +} + # source files to check set -- app.ddlog deepdive.conf schema.json diff --git a/compiler/deepdive-compile b/compiler/deepdive-compile index 2f306dfb6..71c7d6b3d 100755 --- a/compiler/deepdive-compile +++ b/compiler/deepdive-compile @@ -71,6 +71,12 @@ PATH="$DEEPDIVE_HOME"/util/compile-config:"$PATH" PATH="$DEEPDIVE_HOME"/util/compile-code:"$PATH" export DEEPDIVE_ERROR_PREFIX="[ERROR] " +############################################################################### +## record which version of DeepDive compiled this +deepdive version >run/"$compileDir"/deepdive.version +## record the environment used for compilation +env >run/"$compileDir"/environ + ############################################################################### ## compile a full deepdive.conf from source code if ! [[ -e $DEEPDIVE_COMPILE_INPUT_JSON ]]; then