MONSTER-REVISION!

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 6b886be62ab59540b71c49bbb0d0b7af4f8c802d..eb036346500e4abec4236e62acbee9f4d2ece930 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -606,7 +606,6 @@ buildipcop() {
   ipcopmake mysql
   ipcopmake saslauthd PASS=1
   ipcopmake openldap
-  #ipcopmake apache
   ipcopmake apache2
   ipcopmake php
   ipcopmake arping
@@ -676,7 +675,6 @@ buildipcop() {
   ipcopmake setserial
   ipcopmake setup
   ipcopmake snort
-  #ipcopmake speedycgi
   ipcopmake squid
   ipcopmake squid-graph
   ipcopmake squidguard
@@ -686,10 +684,8 @@ buildipcop() {
   ipcopmake wireless
   ipcopmake libsafe
   ipcopmake 3c5x9setup
-#  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
   ipcopmake pakfire
   ipcopmake startscripts
-## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake java
   ipcopmake bootsplash
   ipcopmake spandsp
@@ -697,19 +693,15 @@ buildipcop() {
   ipcopmake openvpn
   ipcopmake pkg-config
   ipcopmake glib
-  ipcopmake xampp
   ipcopmake pam
   ipcopmake pammysql
   ipcopmake saslauthd PASS=2
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
-#  ipcopmake lpd ## Im Moment aus, da CUPS vorhanden ist.
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
-#  ipcopmake pwlib
-#  ipcopmake openh323
   ipcopmake wget
   ipcopmake wput
   ipcopmake bridge-utils
@@ -723,7 +715,7 @@ buildipcop() {
   ipcopmake procmail
   ipcopmake fetchmail
   ipcopmake cyrusimap
-  ipcopmake web-cyradm
+  ipcopmake webcyradm
   ipcopmake mailx
   ipcopmake clamav
   ipcopmake razor
@@ -751,11 +743,9 @@ buildipcop() {
   ipcopmake applejuice
   ipcopmake ocaml
   ipcopmake mldonkey
-#  ipcopmake edonkeyclc
-#  ipcopmake sane
   echo -ne "`date -u '+%b %e %T'`: Building ### Net-Tools ### \n" | tee -a $LOGFILE
   ipcopmake ntop
-#  ipcopmake rsync
+  ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
   ipcopmake nfs
@@ -767,11 +757,11 @@ buildipcop() {
   ipcopmake etherwake
   ipcopmake ethereal
   ipcopmake tftp-hpa
-  #ipcopmake subversion
+  ipcopmake subversion
   ipcopmake iptraf
   ipcopmake nagios
   ipcopmake yasuc
-#  ipcopmake stunnel # Ausgeschaltet, weil wir es doch nicht nutzen
+  ipcopmake apache2 PASS=CONFIG
 }
 
 buildinstaller() {
@@ -840,11 +830,11 @@ buildpackages() {
   rm -f $BASEDIR/doc/packages-list
   for i in `ls -1tr $BASEDIR/log/[^_]*`; do
        if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
-               echo "  * `basename $i`" >>$BASEDIR/doc/packages-list
+               echo "* `basename $i`" >>$BASEDIR/doc/packages-list
        fi
   done
-  echo "====== List of softwares used to build $NAME Version: $VERSION ======" > $BASEDIR/doc/packages-list.txt
-  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipfire$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|^ipfire-logs' \
+  echo "== List of softwares used to build $NAME Version: $VERSION ==" > $BASEDIR/doc/packages-list.txt
+  grep -v 'configroot$\|img$\|initrd$\|initscripts$\|installer$\|install$\|ipfire$\|setup$\|pakfire$\|stage2$\|smp$\|tools$\|tools1$\|tools2$\|.tgz$' \
        $BASEDIR/doc/packages-list | sort >> $BASEDIR/doc/packages-list.txt
   rm -f $BASEDIR/doc/packages-list
   # packages-list.txt is ready to be displayed for wiki page
@@ -884,7 +874,7 @@ ipfirepackages() {
                touch $BASEDIR/build/install/packages/$i.empty
          done
   fi
-  ipfiredist amavisd
+#  ipfiredist amavisd
   ipfiredist applejuice
   ipfiredist asterisk
   ipfiredist clamav
@@ -900,7 +890,6 @@ ipfirepackages() {
   ipfiredist libogg
   ipfiredist libtiff
   ipfiredist libvorbis
-  ipfiredist libxml2
   ipfiredist mailx
   ipfiredist mldonkey
   ipfiredist mpeg2dec
@@ -916,9 +905,7 @@ ipfirepackages() {
   ipfiredist spamassassin
   ipfiredist subversion
   ipfiredist videolan
-  ipfiredist web-cyradm
-  ipfiredist xampp
-#  ipfiredist xinetd
+  ipfiredist webcyradm
   ipfiredist xvid
   ipfiredist yasuc
   test -d $BASEDIR/packages || mkdir $BASEDIR/packages
@@ -1181,7 +1168,11 @@ svn)
          update|up)
                # clear
                echo "Loading the latest source files..."
-               svn update | tee -a $PWD/log/_build.svn.update.log
+               if [ $3 ]; then
+                       svn update -r $3 | tee -a $PWD/log/_build.svn.update.log
+               else
+                       svn update | tee -a $PWD/log/_build.svn.update.log
+               fi
                if [ $? -eq 0 ]; then
                        echo "Finished!"
                else
@@ -1216,32 +1207,49 @@ svn)
                $0 svn up
          ;;
          dist)
-               #$0 svn up
-               echo -ne "Download source package from svn..."
+               if [ $3 ]; then
+                       SVN_REVISION=$3
+               fi
+               if [ -f ipfire-source-r$SVN_REVISION.tar.gz ]; then
+                       echo -ne "REV $SVN_REVISION: SKIPPED!\n"
+                       exit 0
+               fi
+               echo -en "REV $SVN_REVISION: Downloading..."
                svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
+               svn log http://svn.ipfire.eu/svn/ipfire -r 1:$SVN_REVISION > ipfire-source/Changelog
+               #svn info http://svn.ipfire.eu/svn/ipfire -r $SVN_REVISION > ipfire-source/svn_status
                if [ "$?" -eq "0" ]; then
-                       echo ".Done!"
+                       echo -en "\r"
                else
-                       echo ".Fail!"
+                       echo -en "\n"
                        exit 1
                fi
-               echo -n "Compress files..."
+               echo -en "REV $SVN_REVISION: Compressing files..."
+               if [ -e ipfire-source/trunk/make.sh ]; then
+                       chmod 755 ipfire-source/trunk/make.sh
+               fi
                tar cfz ipfire-source-r$SVN_REVISION.tar.gz ipfire-source
                if [ "$?" -eq "0" ]; then
-                       echo ".Done!"
+                       echo -ne "\r"
                else
-                       echo ".Fail!"
+                       echo -ne "\n"
                        exit 1
                fi
-               echo -n "Cleanup..."
+               echo -en "REV $SVN_REVISION: Cleaning up..."
                rm ipfire-source/ -r
                if [ "$?" -eq "0" ]; then
-                       echo ".Done!"
+                       echo -ne "\rREV $SVN_REVISION: ##### FINISHED! #####\n"
                else
-                       echo ".Fail!"
+                       echo -ne "\n"
                        exit 1
                fi
          ;;
+         alldist|ad)
+               echo -e "### THIS WILL TAKE A LONG TIME!\nDOING A FETCH FROM REV 1 TO REV $SVN_REVISION!\n"
+               for i in `seq 1 $SVN_REVISION`; do
+                       $0 svn dist $i
+               done
+         ;;
          diff|di)
                echo -ne "Make a local diff to last svn revision..."
                svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
@@ -1359,12 +1367,6 @@ sync)
                        fi
                fi
        done
-#      for i in `cat ftplist`; do
-#              ls -w1 cache/ | grep $i
-#              if [ "$?" -eq "1" ]; then
-#                      echo $i | grep -v toolchain >> doc/packages-to-remove-from-ftp
-#              fi
-#      done
        rm -f ftplist
        ;;
 upload)