OSSP CVS Repository

ossp - Check-in [5454]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5454
Date: 2006-Jul-22 16:03:51 (local)
2006-Jul-22 14:03:51 (UTC)
User:rse
Branch:
Comment: improve versioning
Tickets:
Inspections:
Files:
ossp-pkg/js/README      1.1 -> 1.2     1 inserted, 1 deleted
ossp-pkg/js/VERSION      added-> 1.1
ossp-pkg/js/configure.ac      1.2 -> 1.3     3 inserted, 1 deleted
ossp-pkg/js/devtool.conf      1.1 -> 1.2     9 inserted, 5 deleted

ossp-pkg/js/README 1.1 -> 1.2

--- README       2006/07/22 13:48:03     1.1
+++ README       2006/07/22 14:03:51     1.2
@@ -6,7 +6,7 @@
                                   |__/      
 
   OSSP js - Mozilla JavaScript Engine
-  Version 1.6.1.5.0.5.0.9 (11-May-2006)
+  Version 1.6.1.5.0.9.0
 
   ABSTRACT
 


ossp-pkg/js/VERSION -> 1.1

*** /dev/null    Sun May  5 11:30:34 2024
--- -    Sun May  5 11:31:33 2024
***************
*** 0 ****
--- 1,8 ----
+ ##
+ ##  VERSION -- version information
+ ##
+ 
+ VERSION_JAVASCRIPT="160"
+ VERSION_MOZILLA="FIREFOX_1_5_0_5_RELEASE"
+ VERSION_OSSP="0.9.0"
+ 


ossp-pkg/js/configure.ac 1.2 -> 1.3

--- configure.ac 2006/07/22 13:48:03     1.2
+++ configure.ac 2006/07/22 14:03:51     1.3
@@ -29,7 +29,9 @@
 
 AC_PREREQ(2.60)
 AC_INIT
-V=`./shtool version -ltxt -dlong 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;'`
 $ac_confdir/shtool echo -e \
     "Configuring %BOSSP js%b (JavaScript Engine), version %B${V}%b"
 


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