--- App-Staticperl/staticperl.sh	2010/12/06 20:53:44	1.2
+++ App-Staticperl/staticperl.sh	2010/12/10 20:29:17	1.14
@@ -3,15 +3,14 @@
 #############################################################################
 # configuration to fill in
 
-PERLVER=5.12.2 # 5.8.9 is also a good choice
 STATICPERL=~/.staticperl
-CPAN=http://mirror.netcologne.de/cpan/ # which mirror to use
+CPAN=http://mirror.netcologne.de/cpan # which mirror to use
 EMAIL="read the documentation <rtfm@example.org>"
 
-MKBUNDLE="$STATICPERL/mkbundle"
 
 # perl build variables
-PREFIX="$STATICPERL/perl" # where the perl gets installed
+PERL_VERSION=5.12.2 # 5.8.9 is also a good choice
+PERL_CONFIGURE="" # additional Configure arguments
 PERL_CPPFLAGS="-DPERL_DISABLE_PMC -DPERL_ARENA_SIZE=65536 -D_GNU_SOURCE -DNDEBUG -USITELIB_EXP -USITEARCHEXP -UARCHLIB_EXP"
 PERL_OPTIMIZE="-Os -ffunction-sections -fdata-sections -finline-limit=8 -ffast-math"
 
@@ -47,21 +46,32 @@
 EXTRA_MODULES=""
 
 # overridable functions
+preconfigure()  { : ; }
 postconfigure() { : ; }
 postbuild()     { : ; }
 postinstall()   { : ; }
 
 # now source user config, if any
-[ -r /etc/staticperlrc ] && . /etc/staticperlrc
-[ -r ~/.staticperlrc   ] && . ~/.staticperlrc
-[ -r "$STATICPERL/rc"  ] && . "$STATICPERL/rc"
+if [ "$STATICPERLRC" ]; then
+   . "$STATICPERLRC"
+else
+   [ -r /etc/staticperlrc ] && . /etc/staticperlrc
+   [ -r ~/.staticperlrc   ] && . ~/.staticperlrc
+   [ -r "$STATICPERL/rc"  ] && . "$STATICPERL/rc"
+fi
 
 #############################################################################
 # support
 
+MKBUNDLE="${MKBUNDLE:=$STATICPERL/mkbundle}"
+PERL_PREFIX="${PERL_PREFIX:=$STATICPERL/perl}" # where the perl gets installed
+
+unset PERL5OPT PERL5LIB PERLLIB PERL_UNICODE PERLIO_DEBUG 
+export LC_ALL=C # just to be on the safe side
+
 # set version in a way that Makefile.PL can extract
 VERSION=VERSION; eval \
-$VERSION=0.1
+$VERSION=0.9
 
 BZ2=bz2
 BZIP2=bzip2
@@ -104,7 +114,7 @@
 
 distclean() {
    verblock <<EOF
-deleting everything installed by this script
+   deleting everything installed by this script (rm -rf $STATICPERL)
 EOF
 
    rm -rf "$STATICPERL"
@@ -114,10 +124,7 @@
 # download/configure/compile/install perl
 
 clean() {
-   cd "$STATICPERL/src/perl-$PERLVER" 2>/dev/null || return
-
-   rm -f staticstamp.configure
-   make distclean >/dev/null 2>&1
+   rm -rf "$STATICPERL/src/perl-$PERL_VERSION"
 }
 
 fetch() {
@@ -126,22 +133,23 @@
    mkdir -p src
    rcd src
 
-   if ! [ -d "perl-$PERLVER" ]; then
-      if ! [ -e "perl-$PERLVER.tar.$BZ2" ]; then
+   if ! [ -d "perl-$PERL_VERSION" ]; then
+      if ! [ -e "perl-$PERL_VERSION.tar.$BZ2" ]; then
 
-         URL="$CPAN/src/5.0/perl-$PERLVER.tar.$BZ2"
+         URL="$CPAN/src/5.0/perl-$PERL_VERSION.tar.$BZ2"
 
          verblock <<EOF
 downloading perl
 to manually download perl yourself, place
-perl-$PERLVER.tar.$BZ2 in $STATICPERL
+perl-$PERL_VERSION.tar.$BZ2 in $STATICPERL
 trying $URL
 EOF
 
-         curl >perl-$PERLVER.tar.$BZ2~ "$URL" \
-            || wget -O perl-$PERLVER.tar.$BZ2~ "$URL" \
-            || fatal "$URL: error during downloading"
-         mv perl-$PERLVER.tar.$BZ2~ perl-$PERLVER.tar.$BZ2
+         rm -f perl-$PERL_VERSION.tar.$BZ2~ # just to be on the safe side
+         wget -O perl-$PERL_VERSION.tar.$BZ2~ "$URL" \
+            || curl >perl-$PERL_VERSION.tar.$BZ2~ "$URL" \
+            || fatal "$URL: unable to download"
+         mv perl-$PERL_VERSION.tar.$BZ2~ perl-$PERL_VERSION.tar.$BZ2
       fi
 
       verblock <<EOF
@@ -149,9 +157,10 @@
 EOF
 
       mkdir -p unpack
-      $BZIP2 -d <perl-$PERLVER.tar.bz2 | tar xpC unpack \
-         || fatal "perl-$PERLVER.tar.bz2: error during unpacking"
-      mv unpack/perl-$PERLVER perl-$PERLVER
+      $BZIP2 -d <perl-$PERL_VERSION.tar.bz2 | tar xfC - unpack \
+         || fatal "perl-$PERL_VERSION.tar.bz2: error during unpacking"
+      chmod -R u+w unpack/perl-$PERL_VERSION
+      mv unpack/perl-$PERL_VERSION perl-$PERL_VERSION
       rmdir -p unpack
    fi
 }
@@ -165,22 +174,24 @@
 configure() {
    fetch
 
-   rcd "$STATICPERL/src/perl-$PERLVER"
+   rcd "$STATICPERL/src/perl-$PERL_VERSION"
 
    [ -e staticstamp.configure ] && return
 
    verblock <<EOF
-configuring $STATICPERL/src/perl-$PERLVER
+configuring $STATICPERL/src/perl-$PERL_VERSION
 EOF
 
-   clean
+   rm -f "$PERL_PREFIX/staticstamp.install"
 
-   rm -f "$PREFIX/staticstamp.install"
+   make distclean >/dev/null 2>&1
 
    # I hate them
    grep -q -- -fstack-protector Configure && \
       sedreplace 's/-fstack-protector/-fno-stack-protector/g' Configure
 
+   preconfigure
+
 #   trace configure \
    sh Configure -Duselargefiles \
                 -Uuse64bitint \
@@ -197,13 +208,13 @@
                 -Doptimize="$PERL_OPTIMIZE" \
                 -Dldflags="$PERL_LDFLAGS" \
                 -Dlibs="$PERL_LIBS" \
-                -Dprefix="$PREFIX" \
-                -Dbin="$PREFIX/bin" \
-                -Dprivlib="$PREFIX/lib" \
-                -Darchlib="$PREFIX/lib" \
+                -Dprefix="$PERL_PREFIX" \
+                -Dbin="$PERL_PREFIX/bin" \
+                -Dprivlib="$PERL_PREFIX/lib" \
+                -Darchlib="$PERL_PREFIX/lib" \
                 -Uusevendorprefix \
-                -Dsitelib="$PREFIX/lib" \
-                -Dsitearch="$PREFIX/lib" \
+                -Dsitelib="$PERL_PREFIX/lib" \
+                -Dsitearch="$PERL_PREFIX/lib" \
                 -Usitelibexp \
                 -Uman1dir \
                 -Uman3dir \
@@ -213,6 +224,7 @@
                 -Demail="$EMAIL" \
                 -Dcf_email="$EMAIL" \
                 -Dcf_by="$EMAIL" \
+                $PERL_CONFIGURE \
                 -dE || fatal "Configure failed"
 
    sedreplace '
@@ -230,13 +242,13 @@
 build() {
    configure
 
-   rcd "$STATICPERL/src/perl-$PERLVER"
+   rcd "$STATICPERL/src/perl-$PERL_VERSION"
 
    verblock <<EOF
-building $STATICPERL/src/perl-$PERLVER
+building $STATICPERL/src/perl-$PERL_VERSION
 EOF
 
-   rm -f "$PREFIX/staticstamp.install"
+   rm -f "$PERL_PREFIX/staticstamp.install"
 
    make || fatal "make: error while building perl"
 
@@ -244,59 +256,73 @@
 }
 
 install() {
-   [ -e "$PREFIX/staticstamp.install" ] && return
-
-   build
+   if ! [ -e "$PERL_PREFIX/staticstamp.install" ]; then
+      build
 
-   verblock <<EOF
-installing $STATICPERL/src/perl-$PERLVER
-to $PREFIX
+      verblock <<EOF
+installing $STATICPERL/src/perl-$PERL_VERSION
+to $PERL_PREFIX
 EOF
 
-   rm -rf "$PREFIX"
-   
-   make install || fatal "make install: error while installing"
+      ln -sf "perl/bin/" "$STATICPERL/bin"
+      ln -sf "perl/lib/" "$STATICPERL/lib"
 
-   rcd "$PREFIX"
+      ln -sf "$PERL_PREFIX" "$STATICPERL/perl" # might get overwritten
+      rm -rf "$PERL_PREFIX"                    # by this rm -rf
+
+      make install || fatal "make install: error while installing"
+
+      rcd "$PERL_PREFIX"
+
+      # create a "make install" replacement for CPAN
+      cat >"$PERL_PREFIX"/bin/cpan-make-install <<EOF
+make || exit
 
-   # create a "make install" replacement for CPAN
-   cat >"$PREFIX"/bin/cpan-make-install <<EOF
-make install UNINST=1
 if find blib/arch/auto -type f | grep -q -v .exists; then
    echo Probably an XS module, rebuilding perl
-   make perl
-   rm -f "$PREFIX"/bin/perl
-   make -f Makefile.aperl inst_perl
-   make -f Makefile.aperl map_clean
+   if make perl; then
+      mv perl "$PERL_PREFIX"/bin/perl
+      make -f Makefile.aperl map_clean
+   else
+      make -f Makefile.aperl map_clean
+      exit 1
+   fi
 fi
+
+make install UNINST=1
 EOF
-   chmod 755 "$PREFIX"/bin/cpan-make-install
+      chmod 755 "$PERL_PREFIX"/bin/cpan-make-install
 
-   # try to trick CPAN into avoiding ~/.cpan completely
-   echo 1 >"$PREFIX/lib/CPAN/MyConfig.pm"
+      # trick CPAN into avoiding ~/.cpan completely
+      echo 1 >"$PERL_PREFIX/lib/CPAN/MyConfig.pm"
 
-   "$PREFIX"/bin/perl -MCPAN -e '
-      CPAN::Shell->o (conf => urllist => push => "'"$CPAN"'");
-      CPAN::Shell->o (conf => q<cpan_home>, "'"$STATICPERL"'/cpan");
-      CPAN::Shell->o (conf => q<init>);
-      CPAN::Shell->o (conf => q<cpan_home>, "'"$STATICPERL"'/cpan");
-      CPAN::Shell->o (conf => q<build_dir>, "'"$STATICPERL"'/cpan/build");
-      CPAN::Shell->o (conf => q<prefs_dir>, "'"$STATICPERL"'/cpan/prefs");
-      CPAN::Shell->o (conf => q<histfile> , "'"$STATICPERL"'/cpan/histfile");
-      CPAN::Shell->o (conf => q<keep_source_where>, "'"$STATICPERL"'/cpan/sources");
-      CPAN::Shell->o (conf => q<make_install_make_command>, "'"$PREFIX"'/bin/cpan-make-install");
-      CPAN::Shell->o (conf => q<prerequisites_policy>, q<follow>);
-      CPAN::Shell->o (conf => q<build_requires_install_policy>, q<no>);
-      CPAN::Shell->o (conf => q<commit>);
-   ' || fatal "error while initialising CPAN"
-
-   NOCHECK_INSTALL=+
-   instcpan $STATICPERL_MODULES
-   [ $EXTRA_MODULES ] && instcpan $EXTRA_MODULES
+      "$PERL_PREFIX"/bin/perl -MCPAN -e '
+         CPAN::Shell->o (conf => urllist => push => "'"$CPAN"'");
+         CPAN::Shell->o (conf => q<cpan_home>, "'"$STATICPERL"'/cpan");
+         CPAN::Shell->o (conf => q<init>);
+         CPAN::Shell->o (conf => q<cpan_home>, "'"$STATICPERL"'/cpan");
+         CPAN::Shell->o (conf => q<build_dir>, "'"$STATICPERL"'/cpan/build");
+         CPAN::Shell->o (conf => q<prefs_dir>, "'"$STATICPERL"'/cpan/prefs");
+         CPAN::Shell->o (conf => q<histfile> , "'"$STATICPERL"'/cpan/histfile");
+         CPAN::Shell->o (conf => q<keep_source_where>, "'"$STATICPERL"'/cpan/sources");
+         CPAN::Shell->o (conf => q<make_install_make_command>, "'"$PERL_PREFIX"'/bin/cpan-make-install");
+         CPAN::Shell->o (conf => q<prerequisites_policy>, q<follow>);
+         CPAN::Shell->o (conf => q<build_requires_install_policy>, q<no>);
+         CPAN::Shell->o (conf => q<commit>);
+      ' || fatal "error while initialising CPAN"
+
+      touch "$PERL_PREFIX/staticstamp.install"
+   fi
 
-   postinstall || fatal "postinstall hook failed"
+   if ! [ -e "$PERL_PREFIX/staticstamp.postinstall" ]; then
+      NOCHECK_INSTALL=+
+      instcpan $STATICPERL_MODULES
+      [ $EXTRA_MODULES ] && instcpan $EXTRA_MODULES
 
-   touch "$PREFIX/staticstamp.install"
+      postinstall || fatal "postinstall hook failed"
+
+      touch "$PERL_PREFIX/staticstamp.postinstall"
+   fi
 }
 
 #############################################################################
@@ -311,7 +337,7 @@
 EOF
 
    for mod in "$@"; do
-      "$PREFIX"/bin/perl -MCPAN -e 'notest install => "'"$mod"'"' \
+      "$PERL_PREFIX"/bin/perl -MCPAN -e 'notest install => "'"$mod"'"' \
          || fatal "$mod: unable to install from CPAN"
    done
    rm -rf "$STATICPERL/build"
@@ -335,9 +361,9 @@
          rcd $mod
          make -f Makefile.aperl map_clean >/dev/null 2>&1
          make distclean >/dev/null 2>&1
-         "$PREFIX"/bin/perl Makefile.PL || fatal "$mod: error running Makefile.PL"
+         "$PERL_PREFIX"/bin/perl Makefile.PL || fatal "$mod: error running Makefile.PL"
          make || fatal "$mod: error building module"
-         "$PREFIX"/bin/cpan-make-install || fatal "$mod: error installing module"
+         "$PERL_PREFIX"/bin/cpan-make-install || fatal "$mod: error installing module"
          make distclean >/dev/null 2>&1
          exit 0
       ) || exit $?
@@ -345,38 +371,12 @@
 }
 
 #############################################################################
-# do schmorpy stuff
-
-MODSRCDIR=~/src
-
-instmodsrc() {
-   for mod in "$@"; do
-      instmod_src "$MODSRCDIR/$mod"
-   done
-}
-
-install_schmorp() {
-   install
-
-   instcpan Data::Dump Term::ReadLine::Perl Term::ANSIColor Term::ReadKey
-   instcpan Digest::SHA Digest::MD6 Digest::SHA256 Digest::MD4 Digest::HMAC_MD5 Digest::HMAC_MD6 Digest::FNV
-   #instcpan Net::SSLeay # requires static -ldl
-
-   instmodsrc common-sense Crypt-Twofish2 Array-Heap Convert-Scalar Compress-LZF JSON-XS
-   instmodsrc EV Guard Async-Interrupt IO-AIO
-   instmodsrc AnyEvent AnyEvent-AIO Coro AnyEvent-HTTP
-   instmodsrc Linux-Inotify2 EV-Loop-Async
-
-   instcpan AnyEvent::HTTPD
-}
-
-#############################################################################
 # main
 
 podusage() {
    echo
-   if [ -e "$PREFIX/bin/perl" ]; then
-      "$PREFIX/bin/perl" -MPod::Usage -e \
+   if [ -e "$PERL_PREFIX/bin/perl" ]; then
+      "$PERL_PREFIX/bin/perl" -MPod::Usage -e \
          'pod2usage -input => *STDIN, -output => *STDOUT, -verbose => '$1', -exitval => 0, -noperldoc => 1' <"$0" \
          2>/dev/null && exit
    fi
@@ -395,7 +395,7 @@
 catmkbundle() {
    {
       read dummy
-      echo "#!$PREFIX/bin/perl"
+      echo "#!$PERL_PREFIX/bin/perl"
       cat
    } <<'MKBUNDLE'
 #CAT mkbundle
@@ -405,48 +405,52 @@
 bundle() {
    catmkbundle >"$MKBUNDLE~" || fatal "$MKBUNDLE~: cannot create"
    chmod 755 "$MKBUNDLE~" && mv "$MKBUNDLE~" "$MKBUNDLE"
-   "$PREFIX/bin/perl" -- "$MKBUNDLE" "$@"
+   CACHE="$STATICPERL/cache"
+   mkdir -p "$CACHE"
+   "$PERL_PREFIX/bin/perl" -- "$MKBUNDLE" --cache "$CACHE" "$@"
 }
 
 if [ $# -gt 0 ]; then
    while [ $# -gt 0 ]; do
       mkdir -p "$STATICPERL" || fatal "$STATICPERL: cannot create"
-      mkdir -p "$PREFIX" || fatal "$PREFIX: cannot create"
+      mkdir -p "$PERL_PREFIX" || fatal "$PERL_PREFIX: cannot create"
 
       command="${1#--}"; shift
       case "$command" in
+         version )
+            echo "staticperl version $VERSION"
+            ;;
          fetch | configure | build | install | clean | distclean)
-            verblock <<EOF
-$command
-EOF
-            "$command"
+            ( "$command" )
             ;;
          instsrc )
-            instsrc "$@"
+            ( instsrc "$@" )
             exit
             ;;
          instcpan )
-            instcpan "$@"
+            ( instcpan "$@" )
             exit
             ;;
-         instschmorp )
-            install_schmorp
-            ;;
          cpan )
-            install
-            "$PREFIX/bin/cpan" "$@"
+            ( install )
+            "$PERL_PREFIX/bin/cpan" "$@"
             exit
             ;;
          mkbundle )
-            install
+            ( install )
             bundle "$@"
             exit
             ;;
          mkperl )
-            install
+            ( install )
             bundle --perl "$@"
             exit
             ;;
+         mkapp )
+            ( install )
+            bundle --app "$@"
+            exit
+            ;;
          help )
             podusage 2
             ;;