comparison Makefile @ 458:84841654c606 prerelease

update is a bit more clean through Makefile

 	@echo uncompressed size: `unzip -l \`ls $(UPDATES_DIR)/*.zip\` | tail -n1 | awk '{print $$1}'`
 	# Delete and re-create the temp directory (first, make sure it is not an empty string!)
 	@[ -n $(UPDATE_SOURCE_DIR_BASE) ] && rm -rf $(UPDATE_SOURCE_DIR_BASE) && mkdir -p $(UPDATE_SOURCE_DIR_BASE)
 	# Unzip the contents to the temp folder
 	@cd $(UPDATE_SOURCE_DIR_BASE) && unzip -qq $(UPDATES_DIR)/*zip
-# Strip the top-level folder ( if there is only one )
+#TODO: this should not be needed. Remove comments.  Strip the top-level folder ( if there is only one )
 #@DIR=`ls -d $(UPDATE_SOURCE_DIR)` && COUNT=`echo $$DIR | wc -l` &&\
 	  [ $$COUNT -eq 1 ] && mv $(UPDATE_SOURCE_DIR)/* /tmp/supertemp && rm -rf $(UPDATE_SOURCE_DIR) && mv /tmp/supertemp $(UPDATE_SOURCE_DIR)
+	
 	# Now actually check if some key-files and folders are there
 	@cd $(UPDATE_SOURCE_DIR) && FAIL=0 && for path in $(UPDATE_REQUIRED_PATHS); do `ls $$path >/dev/null 2>&1` || { FAIL=1; break; }; done;\
 	  [ $$FAIL -eq 0 ] || { echo "$$path was not found in the zip archive. Maybe it is corrupted?"; exit 1; }
 	# Success. You can continue the install with "make update"
 UPDATE_LOG?=~/update.log

 	@echo > $(UPDATE_LOG)
 	# Re-perform the check, just in case ...	
 	# Now actually check if some key-files and folders are there
 	@cd $(UPDATE_SOURCE_DIR) && FAIL=0 && for path in $(UPDATE_REQUIRED_PATHS); do `ls $$path >/dev/null 2>&1` || { FAIL=1; break; }; done;\
 	  [ $$FAIL -eq 0 ] || { echo "$$path was not found in the zip archive. Maybe it is corrupted?"; exit 1; }
-	# Duplicate the Bela folder $(BELA_DIR) to $(UPDATE_BELA_PATCH) ...
 	@[ -n $(UPDATE_BELA_PATCH) ] && mkdir -p $(UPDATE_BELA_PATCH)
 	@#TODO: this would allow to trim trailing slashes in case we want to be safer: a="`pwd`/" ; target=${a%/} ; echo $target
-	@rsync -a --delete-before $(BELA_DIR)/ $(UPDATE_BELA_PATCH)
-	# Also backing it up in $(UPDATE_BELA_BACKUP)...
+	# Clean folder 
+	@$(MAKE) --no-print-directory coreclean
+	# Duplicate the Bela folder $(BELA_DIR) to $(UPDATE_BELA_PATCH) ...
+	@rsync -a --delete-during --exclude Documentation $(BELA_DIR)/ $(UPDATE_BELA_PATCH)
+	# Also backing it up in $(UPDATE_BELA_BACKUP) ...
 	@[ -n $(UPDATE_BELA_BACKUP) ] && mkdir -p $(UPDATE_BELA_BACKUP)
-	@rsync -a $(BELA_DIR)/ $(UPDATE_BELA_BACKUP)
+	@rsync -a --delete-during $(BELA_DIR)/ $(UPDATE_BELA_BACKUP)
 	# Here's the trick: we run "update_board" ssh'ing into the BeagleBone itself! 
 	@cd $(UPDATE_SOURCE_DIR)/scripts && BBB_ADDRESS=root@127.0.0.1 BBB_BELA_HOME=$(UPDATE_BELA_PATCH) ./update_board -y --no-frills
 	# If everything went ok, we now have the updated version of $(BELA_DIR) in $(UPDATE_BELA_PATCH) and a backup of $(BELA_DIR) in $(UPDATE_BELA_BACKUP)
 	# So let's operate the magic swap. $(BELA_DIR) is moved to $(UPDATE_BELA_MV_BACKUP) and $(UPDATE_BELA_PATCH) is moved to $(BELA_DIR).
 	# If something goes wrong at thie stage, you can always find your old $(BELA_DIR) folder at $(UPDATE_BELA_BACKUP)