assorted-commits

[Assorted-commits] SF.net SVN: assorted: [522] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 522
          http://assorted.svn.sourceforge.net/assorted/?rev=522&view=rev
Author:   yangzhang
Date:     2008-02-28 19:31:18 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
added assorted.bash

Added Paths:
-----------
    shell-tools/trunk/src/bash-commons/assorted.bash

Added: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	                        (rev 0)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-02-29 03:31:18 UTC (rev 522)
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# This is a common include file for all project configuration scripts for
+# Assorted Projects.
+
+. common.bash || exit 1
+
+root_site_dir="$( parent-dir named assorted )/assorted-site/trunk"
+clean=
+prof=shell-sf
+base_web_dir=assorted/htdocs
+webdir=$base_web_dir/public_html
+stagedir="$( mktemp -d )"
+
+cp -r "${webfiles[@]}" "$stagedir"
+
+for src in "${websrcs[@]}" ; do
+  if [[ src == README ]]
+  then out=index.html
+  else out="$( basename "${src%.*}.html" )"
+  fi
+  pandoc -s -S --tab-stop=2 \
+      -c http://assorted.sf.net/main.css \
+      -H "$(root_site_dir)/header.html" \
+      -A "$(root_site_dir)/footer.html" \
+      -o "$stagedir/$out" "$src"
+done
+
+tar czf - -C "$stagedir" . |
+ssh $prof "
+  set -o errexit -o nounset
+  if [[ $clean ]] ; then rm -r $webdir ; fi
+  mkdir -p $webdir
+  cd $webdir
+  tar xzf -
+"


Property changes on: shell-tools/trunk/src/bash-commons/assorted.bash
___________________________________________________________________
Name: svn:executable
   + *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [528] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 528
          http://assorted.svn.sourceforge.net/assorted/?rev=528&view=rev
Author:   yangzhang
Date:     2008-02-28 19:59:26 -0800 (Thu, 28 Feb 2008)

Log Message:
-----------
assorted.bash ready to rock

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-02-29 03:59:00 UTC (rev 527)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-02-29 03:59:26 UTC (rev 528)
@@ -6,31 +6,36 @@
 . common.bash || exit 1
 
 root_site_dir="$( parent-dir named assorted )/assorted-site/trunk"
-clean=
+: ${clean:=false}
 prof=shell-sf
 base_web_dir=assorted/htdocs
-webdir=$base_web_dir/public_html
+webdir=$base_web_dir/$project
 stagedir="$( mktemp -d )"
 
-cp -r "${webfiles[@]}" "$stagedir"
+if (( ${#webfiles} > 0 ))
+then cp -r "${webfiles[@]}" "$stagedir"
+fi
 
-for src in "${websrcs[@]}" ; do
-  if [[ src == README ]]
-  then out=index.html
-  else out="$( basename "${src%.*}.html" )"
-  fi
-  pandoc -s -S --tab-stop=2 \
-      -c http://assorted.sf.net/main.css \
-      -H "$(root_site_dir)/header.html" \
-      -A "$(root_site_dir)/footer.html" \
-      -o "$stagedir/$out" "$src"
-done
+if (( ${#websrcs} > 0 )) ; then
+  for src in "${websrcs[@]}" ; do
+    if [[ $src == README ]]
+    then out=index.html
+    else out="$( basename "${src%.*}.html" )"
+    fi
+    pandoc -s -S --tab-stop=2 \
+        -c http://assorted.sf.net/main.css \
+        -H "$root_site_dir/header.html" \
+        -A "$root_site_dir/footer.html" \
+        -o "$stagedir/$out" "$src"
+  done
+fi
 
 tar czf - -C "$stagedir" . |
 ssh $prof "
   set -o errexit -o nounset
-  if [[ $clean ]] ; then rm -r $webdir ; fi
+  if $clean ; then rm -r $webdir ; fi
   mkdir -p $webdir
   cd $webdir
-  tar xzf -
+  tar xzmf -
+  chmod -R +rX .
 "


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [550] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 550
          http://assorted.svn.sourceforge.net/assorted/?rev=550&view=rev
Author:   yangzhang
Date:     2008-02-29 08:50:13 -0800 (Fri, 29 Feb 2008)

Log Message:
-----------
enhancements to assorted.bash

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-02-29 16:50:02 UTC (rev 549)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-02-29 16:50:13 UTC (rev 550)
@@ -12,8 +12,15 @@
 webdir=$base_web_dir/$project
 stagedir="$( mktemp -d )"
 
-if (( ${#webfiles} > 0 ))
-then cp -r "${webfiles[@]}" "$stagedir"
+if (( ${#webfiles} > 0 )) ; then
+  for inp in "${webfiles[@]}" ; do
+    if [[ "${inp%:*}" == "$inp" ]] ; then
+      cp -r "$inp" "$stagedir/"
+    else
+      mkdir -p "$stagedir/${inp%:*}"
+      cp -r $( eval ls "${inp#*:}" ) "$stagedir/${inp%:*}"
+    fi
+  done
 fi
 
 if (( ${#websrcs} > 0 )) ; then


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [556] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 556
          http://assorted.svn.sourceforge.net/assorted/?rev=556&view=rev
Author:   yangzhang
Date:     2008-03-02 08:46:12 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
newer assorted.bash does packaging, releasing, readme-munging

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-03-02 16:45:53 UTC (rev 555)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-03-02 16:46:12 UTC (rev 556)
@@ -3,43 +3,144 @@
 # This is a common include file for all project configuration scripts for
 # Assorted Projects.
 
+# This takes an argument specifying the operation, which can be:
+#
+# - publish: generate the website and upload it
+# - stage: just stage; don't upload
+# - package: create a package (i.e. stage a release)
+# - release: package and upload release to google code
+
 . common.bash || exit 1
 
-root_site_dir="$( parent-dir named assorted )/assorted-site/trunk"
-: ${clean:=false}
+# Required variables
+
+: $fullname $version $license $websrcs $webfiles $rels
+
+projdir="$( dirname "$0" )"
+cd $projdir
+
+project="$( basename "$( realpath "$projdir/.." )" )"
+root_site_dir="$( parent-dir named assorted )/assorted-site/trunk" ||
+  die 'could not find project root dir'
+: ${clean:=false} ${nodl:=false}
 prof=shell-sf
 base_web_dir=assorted/htdocs
 webdir=$base_web_dir/$project
 stagedir="$( mktemp -d )"
+package=$project-$version
 
-if (( ${#webfiles} > 0 )) ; then
-  for inp in "${webfiles[@]}" ; do
-    if [[ "${inp%:*}" == "$inp" ]] ; then
-      cp -r "$inp" "$stagedir/"
-    else
-      mkdir -p "$stagedir/${inp%:*}"
-      cp -r $( eval ls "${inp#*:}" ) "$stagedir/${inp%:*}"
-    fi
-  done
-fi
+dllinks() {
+  if ! $nodl ; then
+    python -c "
+from sys import *
+def f():
+  for arg in argv[2:]:
+    kind, _ = arg.split(':')
+    if kind == 'src-tgz':
+      yield ( '[download src tgz $version]',
+              'http://assorted.googlecode.com/files/$package.tar.gz' )
+if argv[1] == 'links':
+  print ' | '.join( tup[0] for tup in f() )
+else:
+  print '\\n'.join( tup[0] + ': ' + tup[1] for tup in f() )
+" "$@" "${rels[@]}"
+  fi
+}
 
-if (( ${#websrcs} > 0 )) ; then
-  for src in "${websrcs[@]}" ; do
-    if [[ $src == README ]]
-    then out=index.html
-    else out="$( basename "${src%.*}.html" )"
-    fi
-    pandoc -s -S --tab-stop=2 \
-        -c http://assorted.sf.net/main.css \
-        -H "$root_site_dir/header.html" \
-        -A "$root_site_dir/footer.html" \
-        -o "$stagedir/$out" "$src"
-  done
-fi
+mkreadme() {
+  {
+    # Header.
 
-if [[ "${1:-}" == pretend ]] ; then
-  echo "$stagedir"
-else
+    cat << EOF
+% $fullname
+% Yang Zhang
+% gmail:yaaang
+
+EOF
+
+    # Download links.
+
+    local dllinks="`dllinks links`" dlurls="`dllinks urls`"
+
+    # Body.
+
+    sed "
+      1,1 {
+        s/\(\[.*\]\)/\1 | $dllinks | [more downloads] | [browse svn] | [SF project page]/
+        s/^$/$dllinks | [more downloads] | [browse svn] | [SF project page]/
+      }
+      2,2 {
+        a\\
+$dlurls\\
+[more downloads]: http://code.google.com/p/assorted/downloads/list\\
+[browse svn]: http://assorted.svn.sourceforge.net/viewvc/assorted/$project/trunk/\\
+[SF project page]: http://www.sourceforge.net/projects/assorted/
+      }
+    " README
+
+    # Footer.
+
+    case $license in
+      gpl3 ) echo "
+License
+-------
+
+The $fullname is released under the [GNU GPL3].
+
+[GNU GPL3]: http://www.gnu.org/licenses/gpl.html
+" ;;
+      * ) die "unknown license: $license" ;;
+    esac
+
+    echo "
+Contact
+-------
+
+Copyright 2008 [Yang Zhang].  
+All rights reserved.
+
+Back to [assorted.sf.net].
+
+[Yang Zhang]: http://www.mit.edu/~y_z/
+[assorted.sf.net]: http://assorted.sourceforge.net/
+"
+  }
+}
+
+stage() {
+  local gendir="$( mktemp -d )"
+  if (( ${#webfiles} > 0 )) ; then
+    for inp in "${webfiles[@]}" ; do
+      if [[ "${inp%:*}" == "$inp" ]] ; then
+        cp -r "$inp" "$stagedir/"
+      else
+        mkdir -p "$stagedir/${inp%:*}"
+        cp -r $( eval ls -d "${inp#*:}" ) "$stagedir/${inp%:*}"
+      fi
+    done
+  fi
+
+  local src out
+  if (( ${#websrcs} > 0 )) ; then
+    for src in "${websrcs[@]}" ; do
+      if [[ $src == README ]]
+      then src=$gendir/README out=index.html ; mkreadme > $src
+      else out="$( basename "${src%.*}.html" )"
+      fi
+      pandoc -s -S --tab-stop=2 \
+          -c http://assorted.sf.net/main.css \
+          -H "$root_site_dir/header.html" \
+          -A "$root_site_dir/footer.html" \
+          -o "$stagedir/$out" "$src"
+    done
+  fi
+
+  echo "gendir $gendir stagedir $stagedir"
+}
+
+publish() {
+  stage
+
   tar czf - -C "$stagedir" . |
   ssh $prof "
     set -o errexit -o nounset
@@ -49,4 +150,52 @@
     tar xzmf -
     chmod -R +rX .
   "
-fi
+}
+
+# TODO: insert license header into source files (intelligently, without
+# displacing modelines)
+package() {
+  for rel in "${rels[@]}" ; do
+    if [[ ${rel%:*} == $rel ]] ; then
+      die "invalid release spec: $rel"
+    else
+      local exportdir="$( mktemp -d )" dst=${rel%:*} src=${rel#*:}
+      case $dst in
+        src-tgz )
+          svn -q export . $exportdir/$package
+          rm -f $exportdir/$package/publish.bash
+          tar czf $stagedir/$package.tar.gz -C $exportdir $package ;;
+        #jar )
+        #  cd $exportdir/
+        #  simple-build $projdir/build
+        #  make -s
+        #  jar cf $package.jar -C $exportdir $package ;;
+        * ) die "unknown dst type: $dst" ;;
+      esac
+    fi
+  done
+
+  echo "exportdir $exportdir stagedir $stagedir"
+}
+
+release() {
+  package
+
+  for rel in "${rels[@]}" ; do
+    local dst=${rel%:*} src=${rel#*:} summary labels file
+    case $dst in
+      src-tgz )
+        summary="Source tarball for $fullname $version"
+        labels='Featured,Type-Source'
+        file=$stagedir/$package.tar.gz ;;
+      jar )
+        summary="JAR archive for $fullname $version"
+        labels=Featured
+        file=$stagedir/$package.jar ;;
+      * ) die "unknown dst type: $dst" ;;
+    esac
+    googlecode_upload -p assorted -s "$summary" -l "$labels" $file
+  done
+}
+
+"$@"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [560] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 560
          http://assorted.svn.sourceforge.net/assorted/?rev=560&view=rev
Author:   yangzhang
Date:     2008-03-02 10:10:51 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
tweaks

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-03-02 16:56:25 UTC (rev 559)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-03-02 18:10:51 UTC (rev 560)
@@ -85,7 +85,7 @@
 License
 -------
 
-The $fullname is released under the [GNU GPL3].
+$fullname is released under the [GNU GPL3].
 
 [GNU GPL3]: http://www.gnu.org/licenses/gpl.html
 " ;;
@@ -130,7 +130,7 @@
       pandoc -s -S --tab-stop=2 \
           -c http://assorted.sf.net/main.css \
           -H "$root_site_dir/header.html" \
-          -A "$root_site_dir/footer.html" \
+          -A "$root_site_dir/google-footer.html" \
           -o "$stagedir/$out" "$src"
     done
   fi


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [577] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 577
          http://assorted.svn.sourceforge.net/assorted/?rev=577&view=rev
Author:   yangzhang
Date:     2008-03-02 20:30:11 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
added a bunch of stuff to assorted.bash

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-03-03 04:29:50 UTC (rev 576)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-03-03 04:30:11 UTC (rev 577)
@@ -2,7 +2,7 @@
 
 # This is a common include file for all project configuration scripts for
 # Assorted Projects.
-
+#
 # This takes an argument specifying the operation, which can be:
 #
 # - publish: generate the website and upload it
@@ -14,15 +14,15 @@
 
 # Required variables
 
-: $fullname $version $license $websrcs $webfiles $rels
+: $fullname $version $license $websrcs $rels
 
-projdir="$( dirname "$0" )"
+projdir="$( realpath "$( dirname "$0" )" )"
 cd $projdir
 
 project="$( basename "$( realpath "$projdir/.." )" )"
 root_site_dir="$( parent-dir named assorted )/assorted-site/trunk" ||
   die 'could not find project root dir'
-: ${clean:=false} ${nodl:=false}
+: ${clean:=false} ${nodl:=false} ${webfiles:=}
 prof=shell-sf
 base_web_dir=assorted/htdocs
 webdir=$base_web_dir/$project
@@ -30,19 +30,34 @@
 package=$project-$version
 
 dllinks() {
-  if ! $nodl ; then
+  if (( "${#rels}" > 0 )) && ! $nodl ; then
     python -c "
 from sys import *
-def f():
+def kinds():
   for arg in argv[2:]:
     kind, _ = arg.split(':')
+    yield kind
+def f():
+  for kind in kinds():
     if kind == 'src-tgz':
-      yield ( '[download src tgz $version]',
+      yield ( '[download $version src tgz]',
               'http://assorted.googlecode.com/files/$package.tar.gz' )
+    elif kind in [ 'jar', 'scala-ant', 'java-ant' ]:
+      yield ( '[download $version jar]',
+              'http://assorted.googlecode.com/files/$package.jar' )
+    elif kind == 'pypi':
+      # TODO this should be more robust
+      yield ( '[download $version egg]',
+              'http://pypi.python.org/packages/2.5/p/$project/$( echo $project | sed s/-/_/g )-$version-py2.5.egg' )
+      yield ( '[download $version src tgz]',
+              'http://pypi.python.org/packages/source/p/$project/$package.tar.gz' )
+      yield ( '[PyPI page]',
+              'http://pypi.python.org/pypi/$project/' )
+tail = '|' if 'pypi' in kinds() else '| [more downloads] |'
 if argv[1] == 'links':
-  print ' | '.join( tup[0] for tup in f() )
+  print ' | '.join( link for (link,url) in f() ), tail
 else:
-  print '\\n'.join( tup[0] + ': ' + tup[1] for tup in f() )
+  print '\\\\\\n'.join( link + ': ' + url for (link,url) in f() )
 " "$@" "${rels[@]}"
   fi
 }
@@ -64,35 +79,84 @@
 
     # Body.
 
+    if head -1 README | grep -q '^\[' ; then
+      cat README
+    else
+      # Make space for the subsequent injection of links.
+      echo
+      echo
+      echo
+      cat README
+    fi |
     sed "
       1,1 {
-        s/\(\[.*\]\)/\1 | $dllinks | [more downloads] | [browse svn] | [SF project page]/
-        s/^$/$dllinks | [more downloads] | [browse svn] | [SF project page]/
+        s/\(\[.*\)/\1 | $dllinks [browse svn] | [home page]/
+        s/^$/$dllinks [browse svn] | [home page]/
       }
       2,2 {
         a\\
 $dlurls\\
 [more downloads]: http://code.google.com/p/assorted/downloads/list\\
 [browse svn]: http://assorted.svn.sourceforge.net/viewvc/assorted/$project/trunk/\\
-[SF project page]: http://www.sourceforge.net/projects/assorted/
+[home page]: http://assorted.sf.net/$project/\\
+
       }
-    " README
+    "
 
     # Footer.
 
+    local license_text license_links
     case $license in
-      gpl3 ) echo "
-License
--------
+      gpl3 )
+        license_text='the [GNU GPL3]'
+        license_links='[GNU GPL3]: http://www.gnu.org/licenses/gpl.html' ;;
+      psf )
+        license_text="the [PSF License], the same as Python's license"
+        license_links='[PSF License]: http://www.python.org/psf/license.html' ;;
+      scala )
+        license_text="a 3-clause BSD-style license, the same as Scala's license"
+        license_links="$( cat << "EOF"
+  Copyright (c) 2007 The Scala Commons. All rights reserved.
 
-$fullname is released under the [GNU GPL3].
+  Permission to use, copy, modify, and distribute this software in source
+  or binary form for any purpose with or without fee is hereby granted,
+  provided that the following conditions are met:
 
-[GNU GPL3]: http://www.gnu.org/licenses/gpl.html
-" ;;
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in
+       the documentation and/or other materials provided with the
+       distribution.
+
+    3. Neither the name of the Scala Commons nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS "AS IS" AND ANY EXPRESS
+  OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+  GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+  IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+EOF
+)" ;;
       * ) die "unknown license: $license" ;;
     esac
+    echo "
+License
+-------
 
-    echo "
+$fullname is released under $license_text.
+
+$license_links
+
 Contact
 -------
 
@@ -108,7 +172,8 @@
 }
 
 stage() {
-  local gendir="$( mktemp -d )"
+  run-if-def pre-stage
+
   if (( ${#webfiles} > 0 )) ; then
     for inp in "${webfiles[@]}" ; do
       if [[ "${inp%:*}" == "$inp" ]] ; then
@@ -120,7 +185,7 @@
     done
   fi
 
-  local src out
+  local gendir="$( mktemp -d )" src out
   if (( ${#websrcs} > 0 )) ; then
     for src in "${websrcs[@]}" ; do
       if [[ $src == README ]]
@@ -135,6 +200,8 @@
     done
   fi
 
+  run-if-def post-stage
+
   echo "gendir $gendir stagedir $stagedir"
 }
 
@@ -152,6 +219,13 @@
   "
 }
 
+exp() {
+  svn -q export . "$1"
+  if [[ "${websrcs[0]}" == README ]]
+  then mkreadme > "$1/README"
+  fi
+}
+
 # TODO: insert license header into source files (intelligently, without
 # displacing modelines)
 package() {
@@ -162,14 +236,24 @@
       local exportdir="$( mktemp -d )" dst=${rel%:*} src=${rel#*:}
       case $dst in
         src-tgz )
-          svn -q export . $exportdir/$package
+          exp $exportdir/$package
           rm -f $exportdir/$package/publish.bash
           tar czf $stagedir/$package.tar.gz -C $exportdir $package ;;
-        #jar )
-        #  cd $exportdir/
-        #  simple-build $projdir/build
-        #  make -s
-        #  jar cf $package.jar -C $exportdir $package ;;
+        scala-ant | java-ant )
+          ant -q \
+              -Dscala.home=/usr/local \
+              -Dbuild.dir=$exportdir/build \
+              -Ddist.dir=$stagedir \
+              -Dtmp.dir=$exportdir/tmp ;;
+        jar )
+          (
+            cd $exportdir/
+            simple-build $projdir/src/build
+            make -s
+            cp out/$project.jar $stagedir/$package.jar
+          ) ;;
+        pypi )
+          exp $stagedir/$package-py ;;
         * ) die "unknown dst type: $dst" ;;
       esac
     fi
@@ -188,10 +272,16 @@
         summary="Source tarball for $fullname $version"
         labels='Featured,Type-Source'
         file=$stagedir/$package.tar.gz ;;
-      jar )
-        summary="JAR archive for $fullname $version"
+      jar | java-ant | scala-ant )
+        summary="JAR for $fullname $version"
         labels=Featured
         file=$stagedir/$package.jar ;;
+      pypi )
+        (
+          cd $stagedir/$package-py
+          ./setup.py register sdist bdist_egg upload
+        )
+        continue ;;
       * ) die "unknown dst type: $dst" ;;
     esac
     googlecode_upload -p assorted -s "$summary" -l "$labels" $file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [726] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 726
          http://assorted.svn.sourceforge.net/assorted/?rev=726&view=rev
Author:   yangzhang
Date:     2008-05-08 01:35:45 -0700 (Thu, 08 May 2008)

Log Message:
-----------
fixed pypi urls

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-05-08 08:29:57 UTC (rev 725)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-05-08 08:35:45 UTC (rev 726)
@@ -48,9 +48,9 @@
     elif kind == 'pypi':
       # TODO this should be more robust
       yield ( '[download $version egg]',
-              'http://pypi.python.org/packages/2.5/p/$project/$( echo $project | sed s/-/_/g )-$version-py2.5.egg' )
+              'http://pypi.python.org/packages/2.5/${project:0:1}/$project/$( echo $project | sed s/-/_/g )-$version-py2.5.egg' )
       yield ( '[download $version src tgz]',
-              'http://pypi.python.org/packages/source/p/$project/$package.tar.gz' )
+              'http://pypi.python.org/packages/source/${project:0:1}/$project/$package.tar.gz' )
       yield ( '[PyPI page]',
               'http://pypi.python.org/pypi/$project/' )
 tail = '|' if 'pypi' in kinds() else '| [more downloads] |'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [743] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 743
          http://assorted.svn.sourceforge.net/assorted/?rev=743&view=rev
Author:   yangzhang
Date:     2008-05-08 12:28:15 -0700 (Thu, 08 May 2008)

Log Message:
-----------
added release reminders

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-05-08 19:25:04 UTC (rev 742)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-05-08 19:28:15 UTC (rev 743)
@@ -286,6 +286,8 @@
     esac
     googlecode_upload -p assorted -s "$summary" -l "$labels" $file
   done
+
+  echo "Don't forget to tag this release in svn and to announce it on SF news!"
 }
 
 "$@"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [806] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 806
          http://assorted.svn.sourceforge.net/assorted/?rev=806&view=rev
Author:   yangzhang
Date:     2008-05-13 15:43:13 -0700 (Tue, 13 May 2008)

Log Message:
-----------
added error about missing ~/.pypirc

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-05-13 22:42:27 UTC (rev 805)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-05-13 22:43:13 UTC (rev 806)
@@ -278,6 +278,15 @@
         file=$stagedir/$package.jar ;;
       pypi )
         (
+          [ -f ~/.pypirc ] ||
+            die "$( cat << "EOF"
+You should have a .pypirc file containing your credentials.  E.g.:
+
+[server-login]
+username:yang
+password:your-pypi-password
+EOF
+            )"
           cd $stagedir/$package-py
           ./setup.py register sdist bdist_egg upload
         )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [811] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 811
          http://assorted.svn.sourceforge.net/assorted/?rev=811&view=rev
Author:   yangzhang
Date:     2008-05-14 00:26:30 -0700 (Wed, 14 May 2008)

Log Message:
-----------
added check for .googlecode.auth

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-05-14 07:26:07 UTC (rev 810)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-05-14 07:26:30 UTC (rev 811)
@@ -278,9 +278,9 @@
         file=$stagedir/$package.jar ;;
       pypi )
         (
-          [ -f ~/.pypirc ] ||
+          check_private ~/.pypirc ||
             die "$( cat << "EOF"
-You should have a .pypirc file containing your credentials.  E.g.:
+You should have a ~/.pypirc file containing your credentials.  E.g.:
 
 [server-login]
 username:yang
@@ -293,6 +293,13 @@
         continue ;;
       * ) die "unknown dst type: $dst" ;;
     esac
+    check_private ~/.googlecode.auth || die "$( cat << "EOF"
+You should have a ~/.googlecode.auth file containing your credentials.  E.g.:
+
+yanghatespam
+your-googlecode-password
+EOF
+)"
     googlecode_upload -p assorted -s "$summary" -l "$labels" $file
   done
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Assorted-commits] SF.net SVN: assorted: [878] shell-tools/trunk/src/bash-commons/assorted. bash

[<yan...@us...>]

Revision: 878
          http://assorted.svn.sourceforge.net/assorted/?rev=878&view=rev
Author:   yangzhang
Date:     2008-07-07 14:37:48 -0700 (Mon, 07 Jul 2008)

Log Message:
-----------
updated assorted to point to new config hostname

Modified Paths:
--------------
    shell-tools/trunk/src/bash-commons/assorted.bash

Modified: shell-tools/trunk/src/bash-commons/assorted.bash
===================================================================
--- shell-tools/trunk/src/bash-commons/assorted.bash	2008-07-07 21:37:10 UTC (rev 877)
+++ shell-tools/trunk/src/bash-commons/assorted.bash	2008-07-07 21:37:48 UTC (rev 878)
@@ -23,7 +23,7 @@
 root_site_dir="$( parent-dir named assorted )/assorted-site/trunk" ||
   die 'could not find project root dir'
 : ${clean:=false} ${nodl:=false} ${webfiles:=}
-prof=shell-sf
+prof=sf
 base_web_dir=assorted/htdocs
 webdir=$base_web_dir/$project
 stagedir="$( mktemp -d )"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.