From dc509f030d51b252b4cdb0ef9f2de8021a898084 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cenk=20G=C3=BCndo=C4=9Fan?= <cnkgndgn@gmail.com>
Date: Thu, 10 Mar 2016 15:21:09 +0100
Subject: [PATCH] dist/tools/desvirt: proper integration

---
 Makefile.include                              |   3 +
 .../desvirt/0001-add-example-topology.patch   | Bin 2054 -> 0 bytes
 dist/tools/desvirt/Makefile                   |  35 -----------
 dist/tools/desvirt/Makefile.desvirt           |  57 ++++++++++++++++++
 4 files changed, 60 insertions(+), 35 deletions(-)
 delete mode 100644 dist/tools/desvirt/0001-add-example-topology.patch
 delete mode 100644 dist/tools/desvirt/Makefile
 create mode 100644 dist/tools/desvirt/Makefile.desvirt

diff --git a/Makefile.include b/Makefile.include
index ad2a7f29ab..c1439114a5 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -448,3 +448,6 @@ ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD)))
     include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab
   endif
 endif
+
+# Include desvirt Makefile
+include $(RIOTBASE)/dist/tools/desvirt/Makefile.desvirt
diff --git a/dist/tools/desvirt/0001-add-example-topology.patch b/dist/tools/desvirt/0001-add-example-topology.patch
deleted file mode 100644
index 8d2017ca5ed2e6d2cc9b2dc4f948f1019f2a82a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2054
zcmc&#(QcbC6n*zsT={8J3K&8{5<#13Q?-|B)tWs`Q)RG8y%HONleW`7eis5AY8$N&
z?P~GD;ofuZIT&+VnGHmIKI7p;@GzQ%)0~Z?d6uUljH3B?nolDh@I0ENV>mM!E@TOQ
z1dJ`(3j)S`a*8wyIKNVbDoglkYN@X)u75#X?lHHz$CmllNo7?i?FxBJK5;7-u)5kF
zK>%Mei-dlN3JW%0i~|@k6d)Jd^ry`10=}PrSbh8qzUTh{E(FM1z9|a{)|93&>pMam
z$02~s^-fjR>z=!}n*x4AFoDsbMZkw#Aysz8^;!xXX97ysva-tP`rYU~fvl1^Eo_XC
z;4?N2!zYyp5h~BYan{NL_nsUkeG(>G-t4CsXb`1^yv4-Z<+^evSP+JdQ}Be`d3swE
z1bx8)(&Z8ycEn)hAEBq^l8oY$CXk)1YV?*+-(?h}&WuocozQQqQ)fm`j<K%Kbx=zY
z2VAk17BJ_mQe_iSLhX%#tWZ*0&=^q-TnjK-LRpy<nOl^C<{O#N?#=XUdq(V9-IcQL
zBpR?;aYNTU=z1$<?4{;b?c}h3UyS8STUq5idqniOqGP-%xW)`DY9w^V0@wG`HT53M
z(az!>WRJam&OzT_aOkRaGz41erX4UTUfm_sb-nwm3#;~o%=xyk9u|4~0D8!kMc!x2
z{ocwjsfTXb8D2y#_`h=Ff647LAI2NwadSNc+PoVO(#mj=@!DP%rmhppnvWsJ1MO1f
z3GFsUd*8gCgf`(0Dy<pT;ayjSnQXO6XwHjTKH5p`Jg+5<`MkU|`gw+H%;v46U&S?&
jzLo3eNgv*3u{YfF_(@2M$5QO|NBS}TK#1?oU7!2`P-a^A

diff --git a/dist/tools/desvirt/Makefile b/dist/tools/desvirt/Makefile
deleted file mode 100644
index 1739f176e6..0000000000
--- a/dist/tools/desvirt/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-PKG_NAME=desvirt
-PKG_URL=https://github.com/des-testbed/desvirt.git
-PKG_VERSION=master
-PKG_DIR=$(CURDIR)/$(PKG_NAME)
-
-.PHONY: all clean patch distclean desvirtdefine
-
-all: clean $(PKG_NAME) patch desvirtdefine
-
-patch:
-	cd "$(PKG_DIR)" && git am --ignore-whitespace "$(CURDIR)"/*.patch
-
-desvirtdefine: patch
-	$(foreach topology,$(shell ls $(PKG_NAME)/.desvirt/*.xml), \
-		cd $(PKG_NAME) && \
-		./vnet --define --name "$(basename $(notdir $(topology)))";)
-
-$(PKG_NAME):
-	# Get $(PKG_VERSION) of package from $(PKG_URL)
-	$(if $(wildcard $(PKG_NAME)),cd $(CURDIR)/$(PKG_NAME) && \
-		git clean -x -f && \
-		git reset --hard $(PKG_VERSION) \
-		, git clone $(PKG_URL) $(PKG_NAME) && \
-		cd $(PKG_NAME) && \
-		git reset --hard $(PKG_VERSION))
-
-clean::
-	# Reset package to checkout state.
-	$(if $(wildcard $(PKG_NAME)),cd $(CURDIR)/$(PKG_NAME) && \
-		git clean -x -f && \
-		git reset --hard $(PKG_VERSION) \
-		, )
-
-distclean::
-	rm -rf $(CURDIR)/$(PKG_NAME)
diff --git a/dist/tools/desvirt/Makefile.desvirt b/dist/tools/desvirt/Makefile.desvirt
new file mode 100644
index 0000000000..c43a31cf4f
--- /dev/null
+++ b/dist/tools/desvirt/Makefile.desvirt
@@ -0,0 +1,57 @@
+TOOL_NAME=desvirt
+TOOL_URL=https://github.com/des-testbed/desvirt.git
+TOOL_VERSION=master
+TOOL_DIR=$(RIOTBASE)/dist/tools/$(TOOL_NAME)/$(TOOL_NAME)
+
+.PHONY: desvirt-check desvirt-check-topo-file desvirt-check-topo-args desvirt-clean \
+        desvirt-distclean desvirt-define desvirt-undefine desvirt-start desvirt-stop desvirt-list
+
+desvirt-check:
+
+    ifeq ($(wildcard $(TOOL_DIR)),)
+	    git clone $(TOOL_URL) $(TOOL_DIR)
+	    cd $(TOOL_DIR) && git reset --hard $(TOOL_VERSION)
+    endif
+
+desvirt-check-topo-file: desvirt-check
+
+    ifndef TOPO
+	    $(error TOPO is not set)
+    endif
+
+desvirt-check-topo-args: desvirt-check
+
+    ifndef TOPO_TYPE
+	    $(error TOPO_TYPE is not set)
+    endif
+    ifndef TOPO_SIZE
+	    $(error TOPO_SIZE is not set)
+    endif
+
+desvirt-define: desvirt-check-topo-file
+	cd $(TOOL_DIR) && ./vnet -d $(TOOL_DIR)/.desvirt/$(TOPO_FLE) -n $(basename $(TOPO))
+
+desvirt-undefine: desvirt-check-topo-file
+	cd $(TOOL_DIR) && ./vnet -u $(TOOL_DIR)/.desvirt/$(TOPO_FLE) -n $(basename $(TOPO))
+
+desvirt-start: desvirt-check-topo-file
+	cd $(TOOL_DIR) && ./vnet -s -n $(basename $(TOPO))
+
+desvirt-stop: desvirt-check-topo-file
+	cd $(TOOL_DIR) && ./vnet -q -n $(basename $(TOPO))
+
+desvirt-topology: desvirt-check-topo-args all
+	cd $(TOOL_DIR) && \
+	./topology_creator -e $(ELFFILE) -n riot_native -r ieee802154 -s$(TOPO_SIZE) -t$(TOPO_TYPE) -f $(TOPO_TYPE)$(TOPO_SIZE)
+
+desvirt-list: desvirt-check
+	cd $(TOOL_DIR) && ./vnet -l
+
+desvirt-clean::
+
+    ifneq ($(wildcard $(TOOL_DIR)),"")
+	    cd $(TOOL_DIR) && git clean -x -f && git reset --hard $(TOOL_VERSION)
+    endif
+
+desvirt-distclean::
+	rm -rf $(TOOL_DIR)