From 2edce5400e516dd3514431249457362ffcc7be91 Mon Sep 17 00:00:00 2001 From: Jaeho Shin Date: Mon, 23 Jan 2017 15:54:10 -0800 Subject: [PATCH] Adapts Makefile and stage.sh for subtree'd ddlog --- Makefile | 10 +++++++--- stage.sh | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8302064c2..26b85a5f0 100644 --- a/Makefile +++ b/Makefile @@ -138,10 +138,15 @@ build: util/build/generate-build-info.sh >$(BUILD_INFO) # build DimmWitted -build: inference/dimmwitted/dw +.PHONY build: inference/dimmwitted/dw inference/dimmwitted/dw: $(@D).build.sh +# build DDlog compiler +.PHONY build: compiler/ddlog/ddlog.jar +compiler/ddlog/ddlog.jar: + $(@D).build.sh + # ensure some submodules required by stage.sh is there build: \ extern/buildkit/install-shared-libraries-required-by \ @@ -189,7 +194,6 @@ checkstyle: # submodules to build and the files to copy out from each of them include util/build/build-submodules.mk -$(call BUILD_SUBMODULE_AND_COPY, compiler/ddlog , target/scala-2.11/ddlog-assembly-0.1-SNAPSHOT.jar ) $(call BUILD_SUBMODULE_AND_COPY, runner/mkmimo , mkmimo ) ifndef NO_MINDBENDER $(call BUILD_SUBMODULE_AND_COPY, util/mindbender , @prefix@/ ) @@ -203,6 +207,6 @@ build-dimmwitted: inference/dimmwitted/dw .PHONY: build-mindbender build-mindbender: build-submodule-mindbender .PHONY: build-ddlog -build-ddlog: build-submodule-ddlog +build-ddlog: compiler/ddlog/ddlog.jar .PHONY: build-mkmimo build-mkmimo: build-submodule-mkmimo diff --git a/stage.sh b/stage.sh index 9578be897..b7cf75dd6 100755 --- a/stage.sh +++ b/stage.sh @@ -75,7 +75,7 @@ stage compiler/compile-code util/ stage compiler/compile-codegen util/ stage compiler/ddlog-wrapper.sh bin/ddlog -stage .build/submodule/compiler/ddlog/target/scala-2.11/ddlog-assembly-0.1-SNAPSHOT.jar lib/ddlog.jar +stage compiler/ddlog/ddlog.jar lib/ddlog.jar stage compiler/hocon2json util/ # DeepDive execution planner and runner