Permalink
Browse files

Heavy support in the Makefile was broken, fixed

  • Loading branch information...
giuliomoro committed Sep 30, 2017
1 parent a53e3ae commit 37c791057300d764325e4c11e22432f09394ddad
Showing with 15 additions and 1 deletion.
  1. +14 −0 Makefile
  2. +1 −1 scripts/build_pd_heavy.sh
View
@@ -76,6 +76,20 @@ SHOULD_BUILD=false
HAS_RUN_FILE=true
PROJECT_TYPE=custom
endif
# if heavy-unzip-archive, then we should have a HEAVY_ARCHIVE=...
ifeq (heavy-unzip-archive,$(filter heavy-unzip-archive,$(MAKECMDGOALS)))
# which hopefully points to a valid Heavy zip archive.
ifeq (,$(HEAVY_ARCHIVE))
$(error Missing HEAVY_ARCHIVE=... for target heavy-unzip-archive)
else
# If that is the case, then we can consider this project a cpp project
# (assuming there are some other targets AFTER heavy-unzip-archive,
# otherwise it will fail miserably)
PROJECT_TYPE=cpp
endif
endif # heavy-unzip-archive
ifeq ($(filter $(SUPERCOLLIDER_FILE),$(FILE_LIST)),$(SUPERCOLLIDER_FILE))
PROJECT_TYPE=sc
SHOULD_BUILD=false
@@ -224,7 +224,7 @@ uploadBuildRun(){
# copy the archive
scp "$projectpath/$ARCHIVE_NAME" $BBB_ADDRESS:$BBB_ARCHIVE_PATH
rm "$projectpath/$ARCHIVE_NAME"
ssh $BBB_ADDRESS "mkdir -p '$BBB_BELA_HOME/projects/$BBB_PROJECT_NAME' && $MAKE_COMMAND_BASE heavy-unzip-archive HEAVY_ARCHIVE=$BBB_ARCHIVE_PATH" || exit 1
ssh $BBB_ADDRESS "mkdir -p '$BBB_BELA_HOME/projects/$BBB_PROJECT_NAME' && $MAKE_COMMAND_BASE heavy-unzip-archive HEAVY_ARCHIVE=$BBB_ARCHIVE_PATH" $BBB_MAKEFILE_OPTIONS || exit 1
# in this case, most files at the destination will not exist in the
# source folder, as the latter will only contain the zip archive and
# any files (if any) from the heavy/ subfolder OR the default heavy

0 comments on commit 37c7910

Please sign in to comment.