[paparazzi-commits] [6448] checkin again, some files are missing

[Oliver Riesener]

Revision: 6448
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6448
Author:   olri
Date:     2011-03-30 13:17:36 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
checkin again, some files are missing

Modified Paths:
--------------
    toolchains/stm32/paparazzi-stm32-1.0.0/Makefile
    toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh
    toolchains/stm32/paparazzi-stm32-1.0.0/summon-arm-toolchain

Modified: toolchains/stm32/paparazzi-stm32-1.0.0/Makefile
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/Makefile     2011-03-30 12:58:34 UTC 
(rev 6447)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/Makefile     2011-03-30 13:17:36 UTC 
(rev 6448)
@@ -26,15 +26,17 @@
 #
 
 all:
-       ./summon-arm-toolchain
+       @LANG=C ./summon-arm-toolchain
 
-
 install:
        mkdir -p $(DESTDIR)/opt/paparazzi
        cp -a /opt/paparazzi/stm32 $(DESTDIR)/opt/paparazzi
 
 clean:
-       rm -rf *~ sources build .binutils* .gcc* .gdb* .libcmsis* .libstm32* 
.newlib* .openocd* build-arch-stamp build-indep-stamp configure-stamp my_log
+       address@hidden -rf *~ sources build .binutils* .gcc* .gdb* .libcmsis* \
+                .libstm32* .newlib* .openocd* build-arch-stamp \
+                build-indep-stamp configure-stamp my_log \
+                .libopenstm32* debian/paparazzi-stm32
 
 package:
-       debian/rules binary
+       @LANG=C debian/rules binary

Modified: toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh  2011-03-30 12:58:34 UTC 
(rev 6447)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/develenv.sh  2011-03-30 13:17:36 UTC 
(rev 6448)
@@ -1,15 +1,26 @@
 #/bin/sh
 
 #
-# install needed debian packages
+# installing needed debian/ubuntu packages
 #
 
-aptitude -y install \
-       autoconf\
-       debhelper\
-       git\
-       libftdi-dev\
-       libgmp3-dev\
-       libmpfr-dev\
-       libncurses5-dev\
-       libtool
+case `lsb_release -si` in
+    Debian)
+       aptitude -y install \
+               autoconf \
+               debhelper \
+               git \
+               libftdi-dev \
+               libgmp3-dev \
+               libmpfr-dev \
+               libncurses5-dev \
+               libtool
+    ;;
+    Ubuntu)
+       aptitude -y install \
+               libmpfr-dev \
+               libtool
+    ;;
+    *)
+    ;;
+esac

Modified: toolchains/stm32/paparazzi-stm32-1.0.0/summon-arm-toolchain
===================================================================
--- toolchains/stm32/paparazzi-stm32-1.0.0/summon-arm-toolchain 2011-03-30 
12:58:34 UTC (rev 6447)
+++ toolchains/stm32/paparazzi-stm32-1.0.0/summon-arm-toolchain 2011-03-30 
13:17:36 UTC (rev 6448)
@@ -385,15 +385,16 @@
     make arch_prefix=${TARGET} prefix=${PREFIX} install 2>&1 >> ${BUILDLOG} || 
exit
     cd ..
     PATCH_CMSIS=`pwd`/patch_libcmsis
-    pushd ${PREFIX}
+    pushd ${PREFIX} >/dev/null
     patch -p2 < ${PATCH_CMSIS} >> ${BUILDLOG} 2>&1 || exit
-    popd
+    popd >/dev/null
     echo "******************************************************************"
     echo "* Cleaning up libcmsis-${LIBCMSIS}"
     echo "******************************************************************"
     touch .libcmsis-${LIBCMSIS}.build
     rm -rf libcmsis-${LIBCMSIS}
 fi
+fi
 
 if [ ! -e .libstm32-${LIBSTM32}.build ]; then
     echo "******************************************************************"
@@ -454,9 +455,9 @@
     touch .libstm32usb-${LIBSTM32USB}.build
     rm -rf libstm32usb-${LIBSTM32USB}
 fi
-fi
 
 if [ $LIBOPENSTM32_EN != 0 ]; then
+if [ ! -e .libstm32usb-${LIBSTM32USB}.build ]; then
     echo "******************************************************************"
     echo "* Unpacking libopenstm32-${LIBOPENSTM32}"
     echo "******************************************************************"
@@ -477,6 +478,7 @@
     touch .libopenstm32-${LIBOPENSTM32}.build
     rm -rf libopenstm32-${LIBOPENSTM32}
 fi
+fi
 
 
 if [ ! -e .${OPENOCD}.build ]; then