Update liquidsoup compile files

dev_tools/liquidsoap_compile/liquidsoap-compile.sh

@@ -5,6 +5,20 @@ code=`lsb_release -cs`
 cpu=`getconf LONG_BIT`
 cpuvalue=
 
+#enable apt.sourcefabric.org source
+set +e
+grep -E "deb http://apt.sourcefabric.org $code main" /etc/apt/sources.list
+returncode=$?
+set -e
+if [ "$returncode" -ne "0" ]; then
+   echo "deb http://apt.sourcefabric.org $code main" >> /etc/apt/sources.list
+fi
+apt-get update
+apt-get -y --force-yes install sourcefabric-keyring
+apt-get update
+
+
+
 if [ "$dist" = "Ubuntu" ]; then
     set +e
     grep -E "deb http://ca.archive.ubuntu.com/ubuntu/ $code multiverse" /etc/apt/sources.list
@@ -36,35 +50,72 @@ fi
 
 apt-get update
 apt-get -o Dpkg::Options::="--force-confold" upgrade
-apt-get install wget
+apt-get -y --force-yes install libopus0 libopus-dev libopus-dbg libopus-doc
-wget http://apt.sourcefabric.org/misc/libopus_1.0.1/libopus-dbg_1.0.1~$code~sfo-1_$cpuvalue.deb
+#obsoleted code start
-wget http://apt.sourcefabric.org/misc/libopus_1.0.1/libopus-dev_1.0.1~$code~sfo-1_$cpuvalue.deb
+#apt-get -y --force-yes install wget
-wget http://apt.sourcefabric.org/misc/libopus_1.0.1/libopus0_1.0.1~$code~sfo-1_$cpuvalue.deb
+#rm -f libopu*
+#rm -f aacplus*
+#wget http://apt.sourcefabric.org/misc/libopus_1.0.1/libopus-dbg_1.0.1~$code~sfo-1_$cpuvalue.deb
+#wget http://apt.sourcefabric.org/misc/libopus_1.0.1/libopus-dev_1.0.1~$code~sfo-1_$cpuvalue.deb
+#wget http://apt.sourcefabric.org/misc/libopus_1.0.1/libopus0_1.0.1~$code~sfo-1_$cpuvalue.deb
+#wget http://packages.medibuntu.org/pool/free/a/aacplusenc/aacplusenc_0.17.5-0.0medibuntu1_$cpuvalue.deb
+#obsoleted code end
 
 apt-get -y --force-yes install git-core ocaml-findlib libao-ocaml-dev \
 libportaudio-ocaml-dev libmad-ocaml-dev libtaglib-ocaml-dev libalsa-ocaml-dev \
 libvorbis-ocaml-dev libladspa-ocaml-dev libxmlplaylist-ocaml-dev libflac-dev \
 libxml-dom-perl libxml-dom-xpath-perl patch autoconf libmp3lame-dev \
 libcamomile-ocaml-dev libcamlimages-ocaml-dev libtool libpulse-dev camlidl \
-libfaad-dev libpcre-ocaml-dev
+libfaad-dev libpcre-ocaml-dev libfftw3-3 dialog
+
+if [ "$code" != "lucid" ]; then
+    apt-get -y --force-yes install libvo-aacenc-dev
+fi
+
+#dpkg -i libopus-dbg_1.0.1~$code~sfo-1_$cpuvalue.deb libopus-dev_1.0.1~$code~sfo-1_$cpuvalue.deb libopus0_1.0.1~$code~sfo-1_$cpuvalue.deb aacplusenc_0.17.5-0.0medibuntu1_$cpuvalue.deb
+
+#for aac+
+#rm -rf libaac*
+#apt-get -y --force-yes install libfftw3-dev pkg-config autoconf automake libtool unzip
+#wget http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz
+#tar -xzf libaacplus-2.0.2.tar.gz
+#cd libaacplus-2.0.2
+#./autogen.sh --enable-shared --enable-static
+#make
+#make install
+#ldconfig
+#cd ..
+#end of aac+
 
-dpkg -i libopus-dbg_1.0.1~$code~sfo-1_$cpuvalue.deb libopus-dev_1.0.1~$code~sfo-1_$cpuvalue.deb libopus0_1.0.1~$code~sfo-1_$cpuvalue.deb 
 rm -rf liquidsoap-full
 git clone https://github.com/savonet/liquidsoap-full
-chmod -R 777 liquidsoap-full
 cd liquidsoap-full
-sudo -u tmp make init
+git checkout master 
-sudo -u tmp make update
+make init
+make update
 
-sudo -u tmp cp PACKAGES.minimal PACKAGES
+#tmp
+#cd liquidsoap
+#git checkout ifdef-encoder
+#git merge master
+#cd ..
+#tmp end
+
+cp PACKAGES.minimal PACKAGES
 
 sed -i "s/#ocaml-portaudio/ocaml-portaudio/g" PACKAGES
 sed -i "s/#ocaml-alsa/ocaml-alsa/g" PACKAGES
 sed -i "s/#ocaml-pulseaudio/ocaml-pulseaudio/g" PACKAGES
 sed -i "s/#ocaml-faad/ocaml-faad/g" PACKAGES
 sed -i "s/#ocaml-opus/ocaml-opus/g" PACKAGES
+#sed -i "s/#ocaml-aacplus/ocaml-aacplus/g" PACKAGES
 #sed -i "s/#ocaml-shine/ocaml-shine/g" PACKAGES
+if [ "$code" != "lucid" ]; then
+    sed -i "s/#ocaml-voaacenc/ocaml-voaacenc/g" PACKAGES
+fi
 
+chown -R tmp /liquidsoap-full
+chmod -R 777 /liquidsoap-full
 sudo -u tmp ./bootstrap
 sudo -u tmp ./configure
 sudo -u tmp make

dev_tools/liquidsoap_compile/run.sh

@@ -10,8 +10,8 @@ if [ "$UID" -ne "$ROOT_UID" ] ; then
         exit 1
 fi
 
-rm -rf ./liquidsoap_compile_logs
+rm -rf ./liquidsoap-compile_logs
-mkdir -p ./liquidsoap_compile_logs
+mkdir -p ./liquidsoap-compile_logs
 
 showhelp () {
     echo "Usage: run.sh [options] [parameters]
@@ -77,19 +77,19 @@ compile_liq () {
     echo "complie_liq $1"
     #exec > >(tee ./liquidsoap_compile_logs/compile_liq_$1.log)
     binfilename=`echo $1 | sed -e 's/ubuntu/liquidsoap/g' -e 's/debian/liquidsoap/g' -e 's/32/i386/g' -e 's/64/amd64/g'`
-    rm -f /srv/chroot/$1/liquidsoap_compile.sh
+    rm -f /srv/chroot/$1/liquidsoap-compile.sh
     rm -f /srv/chroot/$1/liquidsoap
-    cp liquidsoap_compile.sh /srv/chroot/$1/
+    cp liquidsoap-compile.sh /srv/chroot/$1/
-    schroot -c $1 -u root -d / -- /liquidsoap_compile.sh
+    schroot -c $1 -u root -d / -- /liquidsoap-compile.sh
     cp /srv/chroot/$1/liquidsoap ./$binfilename
-    if [ $? -ne 0 ];then
+    if [ $? = 0 ];then
         echo "$binfilename is generated successfully"
     else
-        mv ./liquidsoap_compile_logs/compile_liq_$1.log ./liquidsoap_compile_logs/fail_to_compile_liq_$1.log
+        mv ./liquidsoap-compile_logs/compile_liq_$1.log ./liquidsoap-compile_logs/fail_to_compile_liq_$1.log
     fi
 }  
 
-os_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_oneiric_32" "ubuntu_oneiric_64" "ubuntu_precise_32" "ubuntu_precise_64" "ubuntu_quantal_32" "ubuntu_quantal_64" "debian_squeeze_32" "debian_squeeze_64" "debian_wheezy_32" "debian_wheezy_64")
+os_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_precise_32" "ubuntu_precise_64" "ubuntu_quantal_32" "ubuntu_quantal_64" "ubuntu_raring_32" "ubuntu_raring_64" "debian_squeeze_32" "debian_squeeze_64" "debian_wheezy_32" "debian_wheezy_64")
 
 num=${#os_versions[@]}
 flag=
@@ -106,9 +106,9 @@ do
         b)
 	    if [ "$OPTARG" = "all" ];then
 	        echo "Building all platforms on server..."
-                for i in $(seq 0 $(($num -1)))
+                for i in $(seq 0 $(($num -1)));
                 do
-		    build_env ${os_versions[$i]} | tee ./liquidsoap_compile_logs/build_env_${os_versions[$i]}.log
+		    build_env ${os_versions[$i]} | tee ./liquidsoap-compile_logs/build_env_${os_versions[$i]}.log
 		done
 	    else
 	        flag=1
@@ -116,7 +116,7 @@ do
 		do
 		    if [ "$OPTARG" = ${os_versions[$i]} ];then
 		        echo "Building platform: $OPTARG ..."
-                        build_env ${os_versions[$i]} | tee ./liquidsoap_compile_logs/build_env_${os_versions[$i]}.log
+                        build_env ${os_versions[$i]} | tee ./liquidsoap-compile_logs/build_env_${os_versions[$i]}.log
                         flag=0
 		    fi
 		done
@@ -135,7 +135,7 @@ do
                  echo "Compiling liquidsoap for all platforms on server..."
                  for i in $(seq 0 $(($num -1)))
                  do
-                     compile_liq ${os_versions[$i]} | tee ./liquidsoap_compile_logs/compile_liq_${os_versions[$i]}.log
+                     compile_liq ${os_versions[$i]} | tee ./liquidsoap-compile_logs/compile_liq_${os_versions[$i]}.log
                  done
 
              else
@@ -144,7 +144,7 @@ do
                  do
                      if [ "$OPTARG" = ${os_versions[$i]} ];then
                          echo "Compiling liquidsoap for platform: $OPTARG ..."
-                         compile_liq ${os_versions[$i]} | tee ./liquidsoap_compile_logs/compile_liq_${os_versions[$i]}.log
+                         compile_liq ${os_versions[$i]} | tee ./liquidsoap-compile_logs/compile_liq_${os_versions[$i]}.log
                          flag=0
                      fi
                  done