--- gvpe/mkdistro 2003/10/16 21:12:43 1.1 +++ gvpe/mkdistro 2004/02/08 07:24:25 1.7 @@ -2,28 +2,55 @@ TARGET="dist-$1" -#autoconf -#autoheader -#automake +autoconf +autoheader +automake #./configure CONFIGURE="--prefix=/opt/vpe --sysconfdir=/etc --localstatedir=/var --enable-tcp --enable-http-proxy" -eval $(grep VERSION= distdir/configure) +eval $(grep VERSION= configure) mkdir -p $TARGET -case "$1" in - linux ) +BASE=/tmp +MAKE=make +ARCH="$1" + +case "$ARCH" in + gnu-linux ) HOST=root@localhost - BASE=/tmp CONFIGURE="$CONFIGURE --enable-icmp" ;; + freebsd ) + HOST=root@192.168.108.4 + CONFIGURE="$CONFIGURE --enable-icmp" + MAKE=gmake + ARCH="$ARCH-x86" + ;; + openbsd ) + HOST=root@192.168.108.6 + CONFIGURE="$CONFIGURE --enable-icmp" + ARCH="$ARCH-x86" + ;; + netbsd ) + HOST=root@192.168.108.5 + CONFIGURE="$CONFIGURE --enable-icmp --with-openssl-include=/usr/local/ssl/include --with-openssl-lib=/usr/local/ssl/lib" + ARCH="$ARCH-x86" + ;; darwin ) HOST=root@imac.laendle BASE=/Users/schmorp - CONFIGURE="$CONFIGURE --enable-icmp --with-openssl-include=$BASE/include" - MAKE="LIBS='$BASE/lib/libcrypto.a -lintl'" + CONFIGURE="$CONFIGURE --enable-icmp --with-openssl-include=$BASE/include --with-libintl-prefix=/sw" + MAKE="make LIBS='$BASE/lib/libcrypto.a -L/sw/lib -lintl'" + ARCH="$ARCH-x86" + ;; + cygwin ) + HOST=vm + CONFIGURE="$CONFIGURE --enable-icmp" + ;; + * ) + exit 1 ;; esac @@ -34,13 +61,21 @@ echo "$CONFIGURE" >$TARGET/configure ssh $HOST " + set -x cd $BASE/vpe || exit 1; ./configure $CONFIGURE || exit 2; rm -rf $BASE/dist; - make $MAKE all || exit 3; - make $MAKE prefix=$BASE/dist install || exit 4; + $MAKE all || exit 3; + $MAKE prefix=$BASE/dist install || exit 4; strip $BASE/dist/sbin/vped $BASE/dist/bin/vpectrl; -" 2>&1 | tee $TARGET/buildlog + strip $BASE/dist/sbin/vped.exe $BASE/dist/bin/vpectrl.exe; + echo vpectrl; + ldd $BASE/dist/bin/vpectrl; + echo vped; + ldd $BASE/dist/sbin/vped; + uname -a + true; +" 2>&1 | tee $TARGET/buildlog || exit 1 mkdir -p $TARGET/opt rsync -avzPessh $HOST:$BASE/dist/. $TARGET/opt/. --delete @@ -54,5 +89,6 @@ ) mkdir -p bindist -tar cCf $TARGET - . | gzip -9 >bindist/vpe-$VERSION-$1.tar.gz +tar cCf $TARGET - . | gzip -9 >bindist/vpe-$VERSION-$ARCH.tar.gz +rm -rf $TARGET