Make due with "sub()" instead of "gsub()" in awk scripts so that builds will

work on Solaris which will runs an archiac version of AWK. (CVS 2658)

FossilOrigin-Name: 449a7895995013720f5d4c7b3b7f5bd6a5413717

diff --git a/manifest b/manifest
index 5b7a1b13a40928173d647c29f9bcc136e0e7e8fb..13ae6e2d62bc5b6007328f4724eba7f078b7063f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sbugs\sintroduced\sby\scheckin\s(2656)\sand\sdo\ssome\smodest\scode\senhancements.\s(CVS\s2657)
-D 2005-09-05T20:06:49
+C Make\sdue\swith\s"sub()"\sinstead\sof\s"gsub()"\sin\sawk\sscripts\sso\sthat\sbuilds\swill\nwork\son\sSolaris\swhich\swill\sruns\san\sarchiac\sversion\sof\sAWK.\s(CVS\s2658)
+D 2005-09-05T20:35:26
 F Makefile.in 12784cdce5ffc8dfb707300c34e4f1eb3b8a14f1
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -20,7 +20,7 @@ F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
 F main.mk 72176d7299c2fd6ca2850623195a6984f75380a6
 F mkdll.sh 5ec23622515d5bf8969404e80cfb5e220ddf0512
 F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
-F mkopcodeh.awk 7563ad235670e864ead95cf672be3fe081450ae0
+F mkopcodeh.awk c5ed62f101d408e64bcad0a8c036d85e99905480
 F mkso.sh 125868def279650a07d3f0f5e8476fecf99613fd
 F publish.sh ed0aba4ffdfadb36597d03ce8efdae96efc038cb
 F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3
@@ -306,7 +306,7 @@ F www/tclsqlite.tcl 3df553505b6efcad08f91e9b975deb2e6c9bb955
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 3ec58c673ae4cf0695ea0c287cc9bcbdcdb1a200
-R c648b12a5837f4af3bcb70379debe21a
+P 7b56763a8b514834198d2392639d6d726b17d901
+R 7961afffb23ff39f7c15da8e463ebdd7
 U drh
-Z 6fef8f1ff4c303f7c6fae65439249cbb
+Z 7abc34b8caed692775f1be9c4cb566b9

diff --git a/manifest.uuid b/manifest.uuid
index 042cf7e2d713dc290cfeba04c13ac336b53bfe7e..9b23f8a0961f2c542d59d18b4c2c8d610032ade0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7b56763a8b514834198d2392639d6d726b17d901
\ No newline at end of file
+449a7895995013720f5d4c7b3b7f5bd6a5413717
\ No newline at end of file

diff --git a/mkopcodeh.awk b/mkopcodeh.awk
index a258194ca831026bbcd02417c1c3dab994c6072a..6984e25521da775cbc3fbf17074732d2ab8f2a55 100644 (file)
--- a/mkopcodeh.awk
+++ b/mkopcodeh.awk
@@ -33,8 +33,8 @@
 # Scan for "case OP_aaaa:" lines in the vdbe.c file
 /^case OP_/ {
   name = $2
-  gsub(/:/,"",name)
-  gsub("\r","",name)
+  sub(/:/,"",name)
+  sub("\r","",name)
   op[name] = -1
   for(i=3; i<NF; i++){
     if($i=="same" && $(i+1)=="as"){