OSSP CVS Repository

ossp - Difference in ossp-pkg/js/devtool.conf versions 1.1 and 1.2
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/js/devtool.conf 1.1 -> 1.2

--- devtool.conf 2006/07/22 11:04:43     1.1
+++ devtool.conf 2006/07/22 14:03:51     1.2
@@ -19,11 +19,11 @@
         "$@"
 
 %version
-    ./shtool version -l txt -n "OSSP js" -e VERSION
-    V=`./shtool version -l txt -d long VERSION`
+    . VERSION
+    V=`echo "${VERSION_JAVASCRIPT}:${VERSION_MOZILLA}:${VERSION_OSSP}" |\
+       sed -e 's;^\([0-9]\)\([0-9]\)[^:]*:FIREFOX_\([0-9]\)_\([0-9]\)[^:]*:\(.*\)$;\1.\2.\3.\4.\5;'`
     sed -e "s/Version .*/Version $V/g" <README >README.n
     mv README.n README
-    V=`./shtool version -l txt -d short VERSION`
 
 %dist
     echo "+++ removing old tarballs"
@@ -47,7 +47,9 @@
     echo "+++ fixing"
     ./shtool fixperm -v .
     echo "+++ rolling"
-    V=`./shtool version -l txt -d short VERSION`
+    . VERSION
+    V=`echo "${VERSION_JAVASCRIPT}:${VERSION_MOZILLA}:${VERSION_OSSP}" |\
+       sed -e 's;^\([0-9]\)\([0-9]\)[^:]*:FIREFOX_\([0-9]\)_\([0-9]\)[^:]*:\(.*\)$;\1.\2.\3.\4.\5;'`
     ./shtool tarball -o js-${V}.tar.gz -d js-${V} -u ossp -g ossp \
                      -e 'CVS,\.cvsignore,\.[ao]$,^\.,devtool*,*.tar.gz,^#.*,.*~$' -c 'gzip --best' .
     ls -l js-${V}.tar.gz
@@ -58,6 +60,8 @@
 
 %upload
     echo "+++ copying to ftp://ftp.ossp.org/pkg/lib/js/"
-    V=`./shtool version -l txt -d short VERSION`
+    . VERSION
+    V=`echo "${VERSION_JAVASCRIPT}:${VERSION_MOZILLA}:${VERSION_OSSP}" |\
+       sed -e 's;^\([0-9]\)\([0-9]\)[^:]*:FIREFOX_\([0-9]\)_\([0-9]\)[^:]*:\(.*\)$;\1.\2.\3.\4.\5;'`
     scp js-${V}.tar.gz ossp@master.ossp.org:/v/ossp/ftp/pkg/lib/js/
 

CVSTrac 2.0.1