[Blends-commit] [SCM] blends-gsoc branch, master, updated. 5f0bd18eefce330e07cd57acda7b6906f71835f7

[Emmanouil Kiagias]

The following commit has been merged in the master branch:
commit 075187927ee1ec2722ab8c01c147ec59d455061f
Author: Emmanouil Kiagias <e.kiagias at gmail.com>
Date:   Thu Aug 1 21:27:58 2013 +0200

    made devtools/rules a little more fault tolerant. Clean up custom local path from Makefile/rules files

diff --git a/devtools/Makefile b/devtools/Makefile
index 9980ef9..3626a5a 100755
--- a/devtools/Makefile
+++ b/devtools/Makefile
@@ -13,9 +13,8 @@ BLEND := $(shell /usr/share/blends-dev/blend-get-names blendname)
 
 VERSION  := $(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
 
-##FIXME custom path for local testing
-GENCONTROL := /home/alamagestest/Projects/blends-gsoc/devtools/blend-gen-control
-TASKSDIFF := /home/alamagestest/Projects/blends-gsoc/tasks_diff
+GENCONTROL := /usr/share/blends-dev/blend-gen-control
+TASKSDIFF := /usr/share/blends-dev/tasks_diff
 
 # Verify whether config/control exists, if yes, add it to the depends of debian/control
 CONFIGCONTROL := $(shell if [ -d config -a -e config/control ] ; then echo config/control; fi)
@@ -49,7 +48,24 @@ statusdump: dependency_data/
 	$(TASKSDIFF) --status-dump --tasks .  --output dependency_data/$(BLEND)_$(VERSION).json
 
 #update changelog with dependencies changes
-changelogentry: debian/changelog dependency_data/$(BLEND)_$(LATEST).json dependency_data/$(BLEND)_$(PREVIOUS).json
+changelogentry: debian/changelog statusdump
+	if [ ! -f dependency_data/$(BLEND)_$(LATEST).json ]; then \
+		echo "dependency_data/$(BLEND)_$(LATEST).json does not exist, can not generate changelog dependencies-changes entry"; \
+		exit -1; \
+	fi
+	if [ ! -f dependency_data/$(BLEND)_$(PREVIOUS).json ]; then \
+		echo "dependency_data/$(BLEND)_$(PREVIOUS).json does not exist, can not generate changelog dependencies-changes entry"; \
+		exit -1; \
+	fi
+	if [ -z "$(LINESTART)" ]; then \
+		echo "Could not locate  '* start automatically injected changes *' flag into changelog, aborting."; \
+		exit -1; \
+	fi
+	if [ -z "$(LINEEND)" ]; then \
+		echo "Could not locate  '* end automatically injected changes *' flag into changelog, aborting."; \
+		exit -1; \
+	fi
+
 	(sed $(LINESTART)q debian/changelog; echo;\
 	 $(TASKSDIFF) --compare $(CURRENTPARH)/dependency_data/$(BLEND)_$(LATEST).json,$(CURRENTPARH)/dependency_data/$(BLEND)_$(PREVIOUS).json | sed 's/^/  /'; \
 	 echo; sed -n '$(LINEEND),$$p' debian/changelog; ) > debian/changelog.new
diff --git a/devtools/rules b/devtools/rules
index 44e31ee..6f0d155 100755
--- a/devtools/rules
+++ b/devtools/rules
@@ -10,14 +10,14 @@ BLENDNAME   := $(shell /usr/share/blends-dev/blend-get-names blendname)
 PREFIX      := $(shell /usr/share/blends-dev/blend-get-names metapackageprefix)
 
 ##FIXME custom path for local testing
-BLENDMKFILE :=/home/alamagestest/Projects/blends-gsoc/devtools/Makefile
+BLENDMKFILE :=/usr/share/blends-dev/Makefile
 BLEND_INSTALL_HELPER := /usr/share/blends-dev/blend-install-helper
 
 TARGET_DIST := $(shell head -1 debian/changelog |awk '{print $$3}'|tr -d ';')
 BLEND       := $(shell /usr/share/blends-dev/blend-get-names blendname)
 
 ##FIXME custom path for local testing
-GENCONTROL  := /home/alamagestest/Projects/blends-gsoc/devtools/blend-gen-control
+GENCONTROL  := /usr/share/blends-dev/blend-gen-control
 
 VERSION     := $(shell dpkg-parsechangelog -ldebian/changelog | grep Version: | cut -f2 -d' ' | cut -f1 -d- )
 DISTDIR     := $(BLENDNAME)-$(VERSION)
diff --git a/dumpsTags b/dumpsTags
index 5bf67c0..d260f6a 100755
--- a/dumpsTags
+++ b/dumpsTags
@@ -10,7 +10,7 @@ list_tags() {
     			echo "${fold}"
     			break
   			fi
-		done
+		  done
     fi
  done
 }

-- 
Git repository for blends-gsoc code