Permalink
Browse files

This patch splits the "clean" script into two parts -- one for lifene…

…t-core, and the other for lifenet applications.

This is done for maintaining consistency with the start and stop scripts.
Updated the README to indicate this change.

--
ashwin@thelifenetwork.org
  • Loading branch information...
1 parent c76a7ea commit 7aafe355b7161d5405cf4e65397f0c2d28be2564 ashwin committed Mar 23, 2012
Showing with 94 additions and 127 deletions.
  1. +24 −17 README
  2. +21 −110 clean
  3. +49 −0 clean_additional_apps
View
@@ -23,34 +23,41 @@ Last updated - 27 Jun 2011
1. Description of code
----------------------
- LifeNet --> applications/ - this directory contains 7 applications (Sniffer, Injector, Network visualization, Communicator, File Transfer, ArpUpdater, PathTraceLogger)
- --> config/ - this directory contains configuration information that is generated during installation
- --> firewall/ - this directory contains iptables scripts for automated gateway configuration
- --> src/ - this directory contains the code for LifeNet Kernel Module
- --> scripts/ - this directory contains executable scripts that are used to start and stop LifeNet and its applications
- --> openwrt/ - this directory contains the source and configuration files required for compilation on and installation on OpenWRT platform
- --> configure - this executable script is used for configuring LifeNet before compilation and installation
- --> compile
- - this executable script is used for compiling LifeNet after configuration and before installation
- --> compile_optional_apps
- - this optional executable script is used for compiling additional LifeNet applications
- --> install
- - this executable script is used to install LifeNet after configuration and compilation
- --> install_optional_apps
- - this optional executable script is used to install additional LifeNet applications
-
+ LifeNet --> applications/ - this directory contains 7 applications (Sniffer, Injector, Network visualization, Communicator, File Transfer, ArpUpdater, PathTraceLogger)
+ --> config/ - this directory contains configuration information that is generated during installation
+ --> firewall/ - this directory contains iptables scripts for automated gateway configuration
+ --> src/ - this directory contains the code for LifeNet Kernel Module
+ --> scripts/ - this directory contains executable scripts that are used to start and stop LifeNet and its applications
+ --> openwrt/ - this directory contains the source and configuration files required for compilation on and installation on OpenWRT platform
+ --> configure
+ - this executable script is used for configuring LifeNet before compilation and installation
+ --> compile
+ - this executable script is used for compiling LifeNet after configuration and before installation
+ --> compile_optional_apps
+ - this optional executable script is used for compiling additional LifeNet applications
+ --> install
+ - this executable script is used to install LifeNet after configuration and compilation
+ --> install_optional_apps
+ - this optional executable script is used to install additional LifeNet applications
+ --> clean
+ - This script clears the build artifacts of the core Lifenet code
+ --> clean_additional_apps
+ - This script clears the build artifacts of the additional Lifenet applications' code
----------------
2. Compatibility
----------------
LifeNet supports and has been fully tested on the following operating systems:
- Ubuntu Linux distributions including and after 8.04
+*NOTE: We have not tested Lifenet on latest Ubuntu versions running a 3.0+ kernel.
+
- Kubuntu Linux distributions including and after 8.04
+*NOTE: We have not tested Lifenet on latest Kubuntu versions running a 3.0+ kernel.
LifeNet can also work on other Linux distributions. However, the developers haven't yet fully tested LifeNet onto Linux distros other than those mentioned above. Please feel free to try it out on other Linux distributions that you may have and email your feedback to any of the following with 'LifeNet feedback' as your email subject:
- hrushi@gatech.edu
-- ashwin1985@gmail.com
+- ashwin.p@gatech.edu
- vempala@cc.gatech.edu
---------------------
View
@@ -63,124 +63,35 @@ export MYMANET_ALPHA
export MYMANET_BETA
export MYMANET_STORE_PATH
-#HAS_KERNEL_SUPPORT=`uname -r | grep -i "2.6.3" | wc -l`
-#if [ "$HAS_KERNEL_SUPPORT" -eq "1" ]; then
-
-# echo "do nothing"
-# MYMANET_KERNEL_VERSION_6_30_PLUS=1
-# export MYMANET_KERNEL_VERSION_6_30_PLUS
- #exit
-
-#else
-# MYMANET_KERNEL_VERSION_6_30_PLUS=0
-# export MYMANET_KERNEL_VERSION_6_30_PLUS
-
-#fi
-
-
-#echo "Kernel 6.3 plus? = $MYMANET_KERNEL_VERSION_6_30_PLUS"
-
-
-#echo -e "Completed\n"
-
rm -rf ./*~
rm -rf ./config/*
cd src
+if [ $? == 0 ]; then
+ make clean
+ cd ..
+fi
-#echo -e "\nCompiling LifeNet kernel module...\n"
-
-#sleep 2
-
-make clean
-#kern_version=`uname -r`
-#echo "Your kernel version is : $kern_version"
-#v1=$(echo $kern_version | sed -e 's![^0-9]\+! & !g' -e 's![\.\-]!!g')
-#echo $v1
-#set -- $v1; v1comp=$2; v2comp=$3; shift; v1=$*
-
-
-#if [ $v1comp -lt "6" -o $v1comp -eq "6" -a $v2comp -lt "24" ]; then
-# echo "Seems like you are having an older kernel - version (2.$v1comp.$v2comp). Setting compilation flag to NEW_KERNEL=0"
-# NEW_KERNEL_TRUE=0
-#else
-# echo "Seems like you are having a new kernel - version (2.$v1comp.$v2comp). Setting compilation flag to NEW_KERNEL=1"
-# NEW_KERNEL_TRUE=1
-#fi
-
-#make NEW_KERNEL=$NEW_KERNEL_TRUE MYMANET_ALPHA=$MYMANET_ALPHA MYMANET_BETA=$MYMANET_BETA MYMANET_KERNEL_VERSION_6_30_PLUS=$MYMANET_KERNEL_VERSION_6_30_PLUS MYMANET_STORE_PATH=$MYMANET_STORE_PATH
-
-cd ..
-
-#echo -e "\nCompilation successful!!"
-
-#echo -e "\nCompiling Applications...\n"
-
-#if [ "$MYMANET_STORE_PATH" -eq "1" ]; then
-
+if [ "$MYMANET_STORE_PATH" -eq "1" ]; then
cd applications/PathTraceLogger
- make clean
- rm -rf dist/ build/
- #make
- cd ./../../
-
-#fi
-
-#cd applications/LifeNet
-#make clean
-#rm -rf dist/ build/
-#make
-#cd ./../../
-
-cd applications/CommandListener
-make clean
-rm -rf dist/ build
-#ant jar
-cd ./../../
-
-cd applications/LifeNetSMS
-ant clean
-#ant jar
-cd ./../../
-
-cd applications/DisplayGnst
-make clean
-rm -rf dist/ build/
-#make
-cd ./../../
-
-cd applications/ArpUpdater
-make clean
-rm -rf dist/ build/
-#make
-cd ./../../
+ if [ $? == 0 ]; then
+ make clean
+ rm -rf dist/ build/
+ cd ./../../
+ fi
+fi
cd applications/Inject
-make clean
-rm -rf dist/ build/
-#make
-cd ./../../
+if [ $? == 0 ]; then
+ make clean
+ rm -rf dist/ build/
+ cd ./../../
+fi
cd applications/Sniff
-make clean
-rm -rf dist/ build/
-#make
-cd ../../
-
-cd applications/LifeNetFTP
-ant clean
-#ant jar
-cd ../../
-
-cd applications/MyMANET-chat
-ant clean
-#ant jar
-cd ../../
-
-cd applications/NetVisualize
-ant clean
-#ant jar
-cd ../../
-
-#echo -e "\nIf no errors are seen, please run installation script -> sudo ./install\n\n"
+if [ $? == 0 ]; then
+ make clean
+ rm -rf dist/ build/
+ cd ../../
+fi
View
@@ -0,0 +1,49 @@
+#!/bin/bash
+clear
+
+
+cd applications/CommandListener
+if [ $? == 0 ]; then
+ make clean
+ rm -rf dist/ build
+ cd ./../../
+fi
+
+cd applications/LifeNetSMS
+if [ $? == 0 ]; then
+ ant clean
+ cd ./../../
+fi
+
+cd applications/DisplayGnst
+if [ $? == 0 ]; then
+ make clean
+ rm -rf dist/ build/
+ cd ./../../
+fi
+
+cd applications/ArpUpdater
+if [ $? == 0 ]; then
+ make clean
+ rm -rf dist/ build/
+ cd ./../../
+fi
+
+cd applications/LifeNetFTP
+if [ $? == 0 ]; then
+ ant clean
+ cd ../../
+fi
+
+cd applications/MyMANET-chat
+if [ $? == 0 ]; then
+ ant clean
+ cd ../../
+fi
+
+cd applications/NetVisualize
+if [ $? == 0 ]; then
+ ant clean
+ cd ../../
+fi
+

0 comments on commit 7aafe35

Please sign in to comment.