Merge pull request #8 from simonduq/contrib/rm-collect-view

Removing collect-view
contiki-ng · Jan 28, 2018 · 22b1262 · 22b1262
2 parents c1a1b4f + 9fefb89
commit 22b1262
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 321 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,5 +6,4 @@ build
 /apps/avrora/cooja-avrora.jar
 /apps/serial_socket/serial-socket.jar
 /apps/powertracker/powertracker.jar
-/apps/collect-view/cooja-collect-view.jar
 /tools/coffee-manager/coffee.jar
diff --git a/apps/collect-view/build.xml b/apps/collect-view/build.xml
diff --git a/apps/collect-view/cooja.config b/apps/collect-view/cooja.config
diff --git a/apps/collect-view/java/org/contikios/cooja/plugins/collectview/CollectView.java b/apps/collect-view/java/org/contikios/cooja/plugins/collectview/CollectView.java
diff --git a/build.xml b/build.xml
@@ -99,7 +99,6 @@ The COOJA Simulator
     <ant antfile="build.xml" dir="apps/mspsim" target="clean" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/avrora" target="clean" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/serial_socket" target="clean" inheritAll="false"/>
-    <ant antfile="build.xml" dir="apps/collect-view" target="clean" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/powertracker" target="clean" inheritAll="false"/>
   </target>
 
@@ -199,7 +198,6 @@ The COOJA Simulator
     <ant antfile="build.xml" dir="apps/mspsim" target="jar" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/avrora" target="jar" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/serial_socket" target="jar" inheritAll="false"/>
-    <ant antfile="build.xml" dir="apps/collect-view" target="jar" inheritAll="false"/>
     <ant antfile="build.xml" dir="apps/powertracker" target="jar" inheritAll="false"/>
   </target>
 

diff --git a/config/external_tools.config b/config/external_tools.config
@@ -18,11 +18,11 @@ COMPILER_ARGS = -I'$(JAVA_HOME)/include' -I'$(JAVA_HOME)/include/linux' -fno-bui
 LINK_COMMAND_1 = gcc -I'$(JAVA_HOME)/include' -I'$(JAVA_HOME)/include/linux' -shared -Wl,-Map=$(MAPFILE) -o $(LIBFILE)
 LINK_COMMAND_2 =
 AR_COMMAND_1 = ar rcf $(ARFILE)
-AR_COMMAND_2 = 
+AR_COMMAND_2 =
 CONTIKI_STANDARD_PROCESSES = sensors_process;etimer_process
 CORECOMM_TEMPLATE_FILENAME = corecomm_template.java
 PATH_JAVAC = javac
-DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/collect-view;[CONTIKI_DIR]/tools/cooja/apps/powertracker
+DEFAULT_PROJECTDIRS = [CONTIKI_DIR]/tools/cooja/apps/mrm;[CONTIKI_DIR]/tools/cooja/apps/mspsim;[CONTIKI_DIR]/tools/cooja/apps/avrora;[CONTIKI_DIR]/tools/cooja/apps/serial_socket;[CONTIKI_DIR]/tools/cooja/apps/powertracker
 
 PARSE_WITH_COMMAND=false
 MAPFILE_DATA_START = ^.data[ \t]*0x([0-9A-Fa-f]*)[ \t]*0x[0-9A-Fa-f]*[ \t]*$