Skip to content

Commit

Permalink
Makefile: pass external dependency information to assembly sub-project
Browse files Browse the repository at this point in the history
  • Loading branch information
bertfrees committed Aug 9, 2022
1 parent f1b267e commit 5a1dc2b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
19 changes: 10 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ ifneq ($(MAKECMDGOALS), dump-gradle-cmd)
ifneq ($(MAKECMDGOALS), clean-website)
include .make/main.mk
assembly/BASEDIR := assembly
assembly/SOURCES : assembly/.compile-dependencies
include assembly/deps.mk
-include webui/.deps.mk
else
Expand Down Expand Up @@ -215,39 +216,39 @@ $(dev_launcher) : assembly/.compile-dependencies | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,dev-launcher)

.SECONDARY : assembly/.install.deb
assembly/.install.deb : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install.deb : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,deb)

.SECONDARY : assembly/.install-linux.rpm
assembly/.install-linux.rpm : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install-linux.rpm : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,rpm)

.SECONDARY : assembly/.install-linux.zip
assembly/.install-linux.zip : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install-linux.zip : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,zip-linux)

.SECONDARY : assembly/.install-minimal.zip
assembly/.install-minimal.zip : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install-minimal.zip : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,zip-minimal)

.SECONDARY : assembly/.install-mac.zip
assembly/.install-mac.zip : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install-mac.zip : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,zip-mac)

.SECONDARY : assembly/.install-win.zip
assembly/.install-win.zip : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install-win.zip : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,zip-win)

.SECONDARY : assembly/.install.dmg
assembly/.install.dmg : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install.dmg : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,dmg)

.SECONDARY : assembly/.install.exe
assembly/.install.exe : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install.exe : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,exe)

.SECONDARY : assembly/.install-cli.deb
assembly/.install-cli.deb : assembly/.compile-dependencies | .maven-init .group-eval
assembly/.install-cli.deb : | .maven-init .group-eval
+$(call eval-for-host-platform,./assembly-make.sh,deb-cli)

webui/.deps.mk : webui/build.sbt
Expand Down
4 changes: 1 addition & 3 deletions assembly-make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ else
if [[ -z ${HOST_PLATFORM} ]]; then
# MAKECMDGOALS exported from main Makefile, but messes up recursive invocation of make
unset MAKECMDGOALS
# unconditionally make targets because this is what was decided by super-project based on the dependency analysis
# ideally, the external dependency information should be passed to sub-project so that it can make the decision
eval $MAKE -B -C assembly "$@"
eval $MAKE -C assembly "$@"
else
exit 1
fi
Expand Down

0 comments on commit 5a1dc2b

Please sign in to comment.