Gordons Projects

--> Projects Top-Level GIT

Bother. Small issue crept into the SPI code.
[wiringPi] / build
diff --git a/build b/build
index 2afafa6..048ebb3 100755 (executable)
--- a/build
+++ b/build
@@ -1,20 +1,5 @@
 #!/bin/bash
 
-i2c-install()
-{
- echo "* wiringPi needs the I2C Development Libraires installing."
- echo ""
- echo "If using Debian/Raspbian, then type this command:"
- echo "  sudo apt-get install libi2c-dev"
- echo "then run ./build again."
- echo ""
- echo "If using another Linux distribution, then you will have to"
- echo "work out how to install the I2C Developmen Libraries for your"
- echo "system. (Sorry - I don't know - do let me know though!)"
- echo ""
- exit 1
-}
-
 check-make-ok()
 {
   if [ $? != 0 ]; then
@@ -28,62 +13,68 @@ check-make-ok()
   fi
 }
 
-
 if [ x$1 = "xclean" ]; then
-  echo Cleaning
-  echo
   cd wiringPi
-  make clean
+  echo -n "wiringPi:  "        ; make clean
+  cd ../devLib
+  echo -n "DevLib:    "        ; make clean
   cd ../gpio
-  make clean
+  echo -n "gpio:      "        ; make clean
   cd ../examples
-  make clean
-  cd ..
-elif [ x$1 = "xuninstall" ]; then
-  echo Uninstalling
-  echo
-  echo "WiringPi library"
+  echo -n "Examples:  "        ; make clean
+  cd Gertboard
+  echo -n "Gertboard: "        ; make clean
+  cd ../PiFace
+  echo -n "PiFace:    "        ; make clean
+  exit
+fi
+
+if [ x$1 = "xuninstall" ]; then
   cd wiringPi
-  sudo make uninstall
-  echo
-  echo "GPIO Utility"
+  echo -n "wiringPi: " ; sudo make uninstall
+  cd ../devLib
+  echo -n "DevLib:   " ; sudo make uninstall
   cd ../gpio
-  sudo make uninstall
-  cd ..
-else
-  echo wiringPi Build script - please wait...
-  echo
+  echo -n "gpio:     " ; sudo make uninstall
+  exit
+fi
 
-# Check for I2C being installed...
 
-  if [ ! -f /usr/include/linux/i2c-dev.h ]; then
-    i2c-install
-  fi
-  grep -q i2c_smbus_read_byte /usr/include/linux/i2c-dev.h
-  if [ $? = 1 ]; then
-    i2c-install
-  fi
+  echo "wiringPi Build script"
+  echo "====================="
+  echo
 
-  echo "WiringPi library"
+  echo
+  echo "WiringPi Library"
   cd wiringPi
   sudo make uninstall
   make
   check-make-ok
   sudo make install
   check-make-ok
+
   echo
-  echo "GPIO Utility"
-  cd ../gpio
+  echo "WiringPi Devices Library"
+  cd ../devLib
+  sudo make uninstall
   make
   check-make-ok
   sudo make install
   check-make-ok
+
   echo
-  echo "Examples"
-  cd ../examples
+  echo "GPIO Utility"
+  cd ../gpio
   make
-  cd ..
-fi
+  check-make-ok
+  sudo make install
+  check-make-ok
+
+# echo
+# echo "Examples"
+# cd ../examples
+# make
+# cd ..
 
 echo
 echo All Done.