Hinzugefügt:

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

diff --git a/make.sh b/make.sh
index 4a19aa2f6ef0caa8e3653e151f3f76a4efd6492a..6bf3bebdb0e28bcd5832eb3378a1f11c02763d28 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -540,6 +540,7 @@ buildipcop() {
        ipcopmake fcdslsl       SMP=1
        ipcopmake fcdslusb      SMP=1
        ipcopmake fcdslslusb    SMP=1
+       ipcopmake fcpci SMP=1
        ipcopmake pulsar        SMP=1
        ipcopmake unicorn       SMP=1
   fi
@@ -559,7 +560,8 @@ buildipcop() {
        ipcopmake fcdsl2        
        ipcopmake fcdslsl       
        ipcopmake fcdslusb      
-       ipcopmake fcdslslusb    
+       ipcopmake fcdslslusb 
+       ipcopmake fcpci 
        ipcopmake pulsar        
        ipcopmake unicorn       
   fi
@@ -623,6 +625,15 @@ buildipcop() {
   ipcopmake Net-DNS
   ipcopmake Net-IPv4Addr
   ipcopmake Net_SSLeay
+  ipcopmake IO-Stringy
+  ipcopmake Unix-Syslog
+  ipcopmake Mail-Tools
+  ipcopmake MIME-Tools
+  ipcopmake Net-Server
+  ipcopmake Convert-TNEF
+  ipcopmake Convert-UUlib
+  ipcopmake Archive-Tar
+  ipcopmake Archive-Zip
   ipcopmake noip_updater
   ipcopmake ntp
   ipcopmake oinkmaster
@@ -642,9 +653,11 @@ buildipcop() {
   ipcopmake wireless
   ipcopmake libsafe
   ipcopmake 3c5x9setup
-  echo -ne "`date -u '+%b %e %T'`: Building IPFire modules \n" | tee -a $LOGFILE
+  echo -ne "`date -u '+%b %e %T'`: Building ### IPFire modules ### \n" | tee -a $LOGFILE
+  ipcopmake pakfire
 ## Zuerst die Libs und dann die Programme. Ordnung muss sein!
   ipcopmake berkeley
+  ipcopmake BerkeleyDB ## The Perl module
   ipcopmake libtiff
   ipcopmake libjpeg
   ipcopmake libxml2
@@ -661,6 +674,7 @@ buildipcop() {
   ipcopmake xinetd
   ipcopmake ghostscript
   ipcopmake cups
+#  ipcopmake lpd ## Im Moment aus, da CUPS vorhanden ist.
   ipcopmake samba
   ipcopmake sudo
   ipcopmake mc
@@ -668,20 +682,24 @@ buildipcop() {
   ipcopmake openh323
   ipcopmake wget
   ipcopmake bridge-utils
+  echo -ne "`date -u '+%b %e %T'`: Building ### Mailserver ### \n" | tee -a $LOGFILE
   ipcopmake postfix
   ipcopmake fetchmail
   ipcopmake cyrusimap
   ipcopmake procmail
+  ipcopmake clamav
+  ipcopmake razor
+  ipcopmake spamassassin
+  ipcopmake amavisd
+  echo -ne "`date -u '+%b %e %T'`: Building ### VoIP-Server ### \n" | tee -a $LOGFILE
   ipcopmake stund
-#  ipcopmake lpd
-  ipcopmake openvpn
   ipcopmake asterisk
+  ipcopmake openvpn
   ipcopmake edonkeyclc
   ipcopmake sane
+  echo -ne "`date -u '+%b %e %T'`: Building ### MP3-Server ### \n" | tee -a $LOGFILE
   ipcopmake lame
   ipcopmake gnump3d
-  ipcopmake clamav
-#  ipcopmake spamassassin
   ipcopmake rsync
   ipcopmake tcpwrapper
   ipcopmake portmap
@@ -853,7 +871,7 @@ shell)
        ;;
 changelog)
        echo -n "Loading new Changelog from SVN: "
-       svn log > doc/ChangeLog
+       svn log http://svn.ipfire.eu/svn/ipfire > doc/ChangeLog
        echo "Finished!"
        ;;
 check)
@@ -902,18 +920,19 @@ clean)
        done
        rm -rf $BASEDIR/build
        rm -rf $BASEDIR/cdrom
+       rm -rf $BASEDIR/packages
        rm -rf $BASEDIR/log
-       rm -f $BASEDIR/updates/$VERSION/patch.tar.gz;
        if [ -h /tools ]; then
                rm -f /tools
        fi
        ;;
 dist)
-       echo "Updating & building source package from SVN: "
+       echo -ne "Updating & building source package from SVN: "
        svn up > /dev/null
        svn export http://svn.ipfire.eu/svn/ipfire ipfire-source/ --force > /dev/null
        tar cfz ipfire-source-`date +'%Y-%m-%d'`-r`svn info | grep Revision | cut -c 11-`.tar.gz ipfire-source
        rm ipfire-source/ -r
+       echo "Finished!"
        ;;
 newpak)
        # create structure for a new package
@@ -1039,6 +1058,7 @@ gettoolchain)
                        echo "`date -u '+%b %e %T'`: toolchain md5 ok" | tee -a $LOGFILE
                        echo "`date -u '+%b %e %T'`: Uncompressing toolchain" | tee -a $LOGFILE
                        cd $BASEDIR && tar xvfz cache/$PACKAGE.tar.gz -C .
+                       rm -vf $BASEDIR/cache/$PACKAGE.{tar.gz,md5}
                else
                        exiterror "$PACKAGE.md5 did not match, check downloaded package"
                fi
@@ -1053,8 +1073,18 @@ commit)
        svn commit
        svn up > /dev/null
        ;;
+make)
+       echo "Do a complete compile:"   
+       ./make.sh prefetch && ./make.sh build
+       ;;
+diff)
+       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
+       echo "Finished!"
+       echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
+       ;;
 *)
-       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|dist|gettoolchain|newpak|prefetch|shell|toolchain|update}"
+       echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|toolchain|update}"
        cat doc/make.sh-usage
        exit 1
        ;;