[Webfunds-commits] html/download/zip run

Ian Grigg iang@cypherpunks.ai
Wed, 21 Jun 2000 07:49:13 -0400 (AST)


iang        00/06/21 07:49:13

  Modified:    download Makefile makezip zip_README.html
               download/zip run
  Log:
  checkpoint

Revision  Changes    Path
1.10      +27 -1     html/download/Makefile

Index: Makefile
===================================================================
RCS file: /home/webfunds/cvsroot/html/download/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Makefile	2000/04/13 02:58:30	1.9
+++ Makefile	2000/06/21 11:49:12	1.10
@@ -13,6 +13,32 @@
 	DigiGoldPseudoAp.a \
 	WebFunds-$(version).a \
 
-all:
+LIB = ../../lib
+SOXJAR = $(LIB)/SOX.jar
+FUNZJAR = $(LIB)/WebFunds.jar
+TRADJAR = $(LIB)/Trader.jar
+SRCZIP = $(LIB)/src.zip
+
+$(SOXJAR):
+	cd ../../java ; . ./init; export makejars=true; ./build_sox
+
+$(FUNZJAR): $(SOXJAR)
+	cd ../../java ; . ./init; export makejars=true; ./build
+
+$(SRCZIP): $(FUNZJAR) $(SOXJAR)
+	cd ../../java ; . ./init; export makejars=true; ./build_src
+
+all: $(FUNZJAR) $(TRADJAR) $(SRCZIP)
 	# makezip is the primary, not make
 	./makezip www export -d DigiGold_AUG
+
+TRADERDIR = $(HOME)/src/hazlitt/projects/trader
+CONTRACT = $(TRADERDIR)/market.asc $(TRADERDIR)/market.loc
+
+$(TRADJAR): $(FUNZJAR)
+	cd $(TRADERDIR) ; . ./.trader; makejars=true ./build
+	# ./makezip www -d DigiGold_AUG -a Trader.jar -p Trader
+
+trader: $(TRADJAR) $(SRCZIP)
+	./makezip www export -d DigiGold_AUG -f "tzip $(CONTRACT)" -j Trader.jar
+



1.8       +32 -18    html/download/makezip

Index: makezip
===================================================================
RCS file: /home/webfunds/cvsroot/html/download/makezip,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- makezip	2000/04/12 21:00:01	1.7
+++ makezip	2000/06/21 11:49:12	1.8
@@ -2,24 +2,38 @@
 
 set -e
 
+usage()
+{
+    opts="[-d default_contract] [-j more_jars] [-f more_files]"
+    echo "Usage: makezip $opts [www|export]"
+    exit 1
+}
+
 contracts=""
 export=false
 defs=false
+additionals=""
+product=WebFunds
+tmp=/tmp
+jars="WebFunds.jar SOX.jar Cryptix.jar src.zip"
+files="zip"
+
 while true
 do
     case "$1" in
        'export') export=true ; shift ;;
        'www')    www=true ; shift ;;
        '-d')     shift ; contracts=$contracts" "$1 ; defs=true ; shift ;;
+       '-p')     shift ; product=$1 ; shift ;;
+       '-j')     shift ; jars="${jars} $1" ; shift ;;
+       '-f')     shift ; files="${files} $1" ; shift ;;
        "")       break       ;;
-       *)        echo "Usage: makezip [-d default_contract] [www|export]" ; exit 1 ;;
+       *)        usage ;;
     esac
 done
 
 echo "found: $contracts"
 
-tmp=/tmp
-product=WebFunds
 
 build=${tmp}/${product}
 defaults=${build}/defaults
@@ -28,9 +42,9 @@
 [ -d ${build} ] && rm -rf ${build} ${build}.zip
 mkdir ${build}
 
-TOP=${CVS_HOME:-${SRC:?}/../}
+TOP=${WEBFUNDS_DIR:-${CVS_HOME:-${SRC:?}/../}}
 
-[ ! -d "$TOP" ] && echo "No top dir: CVS_HOME SRC" && exit 1
+[ ! -d "$TOP" ] && echo "No top dir: WEBFUNDS_DIR CVS_HOME SRC" && exit 1
 
 home=$PWD
 
@@ -45,40 +59,40 @@
       exit 1
   fi
       
-  #  case "${version}" in
-  #      [1-9].[0-9].[0-9]) echo Version is ${version} ;;
-  #      *) echo "no version? <${version}>" ; exit 1 ;;
-  #  esac
-
   zipname=${product}-${version}.zip
+  readme=${product}_README.html
+  [ -r ${readme} ] || readme=zip_README.html
 
-  if grep ${zipname} zip_README.html
+  if grep ${zipname} ${readme}
   then
      echo "Found  ${zipname}"
   else
-     echo "NO  ${zipname} !  Please fix the Readme to include the download!"
+     echo "NO  ${zipname} !  Please fix the ${readme} to include the download!"
      exit 1
   fi
 
-  cp zip_README.html ${build}/README.html
+  cp ${readme} ${build}/README.html
 
-  cp $(find zip '!' -type d -print | grep -v CVS) ${build}
+echo $files
+  cp $(find $(echo ${files}) '!' -type d -print | grep -v CVS) ${build}
 
 cd $TOP/html/images
   cp webfundslogo1.gif ${build}/logo.gif
 
 cd $TOP/lib
 
-  jars="WebFunds.jar SOX.jar Cryptix.jar src.zip"
   dirfiles="ijce-lib/IJCE.properties cryptix-lib/Cryptix.properties"
 
   cp -R $jars ${build}
 
-  for f in $dirfiles
-  do
+  if [ -d "${dirfiles}" ]     # not after Cryptix 3.1.2 / WebFunds 1.6.0
+  then
+    for f in $dirfiles
+    do
 	( cd ${build} ; mkdir -p ${f%/*} )
 	cp $f ${build}/$f
-  done
+    done
+  fi
 
 cd $TOP/contracts
   cp *.asc *.loc ${build}



1.21      +107 -75   html/download/zip_README.html

Index: zip_README.html
===================================================================
RCS file: /home/webfunds/cvsroot/html/download/zip_README.html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- zip_README.html	2000/06/20 09:57:04	1.20
+++ zip_README.html	2000/06/21 11:49:12	1.21
@@ -13,84 +13,39 @@
 
 <p>
 Current Version: 
-<a href="http://webfunds.org/download/WebFunds-1.5.4.zip">
+<a href="http://webfunds.org/download/WebFunds-1.6.0.zip">
 
-    <b>1.5.4</b></a>:
-            <ul><li>
-                Quick fix for the NPEx problem where the Java
-                PrintWriter object blows up.  Cause is unknown,
-                backed out a change that seems to trigger it.
-            </li></ul>
-
     <P>
-    <b>1.5.3</b></a>:
+    <b>1.6.0</b></a>:
+              Major series of changes designed to assist new wallets
+              in development.
             <ul><li>
-                Think I got it - the receipts were incorrectly updated,
-                but advise below concerning uncancellable payments still
-                holds in general!
+                new debugging module places all STDERR and STDOUT
+                output into files of those names (lowercase).
               </li><li>
-                Now checks for /dev/random for the good entropy.
-                Faster on Unix, still boring on Windows.
-            </li></ul>
-
-    <P>
-    <b>1.5.2</b></a>:
-            <ul><li>
-                Slow, painful fix to mail signing problem - the mail
-                code was completely rewritten to remove an "innovation"
-                that broke all mail signing.  You might have noticed that
-                mail was clogging up...
-              </li><li>
-                There is still a bug in the mail code - receipts can
-                be dropped but signed for.  This is a hanging offence,
-                if you see a Payment that you cannot cancel because it
-                is already used (pid), do not restart, but copy the
-                'out' file and send it to the support team.
-              </li><li>
-                DROPPED support for old /data/ version 1 data formats.
-                This is about a year old....  It will warn you of the
-                dropped support and terminate if present.
-            </li></ul>
-
-    <P>
-    <b>1.5.1</b></a>:
-            <ul><li>
-                Quick fix, can accept bearer deposit from unknown account.
+                Description written into payments now shown on history,
+                and on request for confirmation.
               </li><li>
-                Improved Payment readale comment.
+                Wallet interface now has WalletContext providing
+                special features needed by wallet, rather than clumsy Core.
               </li><li>
-                History browser now has more features.  Still has the
-                known bug of printing the unit of contract not account.
-                This can't be fixed until the browser is changes to a
-                plugin (which has access to the contracts).
+                AppendFileStore used for some things, which provides
+                for an append only db method on rotating files.  Not
+                in production use as yet for major things, but is used
+                for new things.
+              </li><li>
+                Start on payment state machine with StateReceipt
+                returned instead of Receipt from that store.  Not
+                effective as yet, as it is made up on the spot,
+                but object can be migrated into code, replacing
+                Receipt and PendingReceipt.
+              </li><li>
+                Lots of cleanup in sox stores side, but no change
+                to data as yet.  All client store stuff should now
+                be in webfunds.store.*.
             </li></ul>
 
-    <P>
-    <b>1.5.0</b></a>:  Major cleanup release.  Lots of detail changes
-            <ul><li>
-                Under New, a Backups option that copies the
-                entire directory as selected.  Fairly primitive,
-                the backup is only 99% runnable, but it has all
-                the important data.
-              </li><li>
-                Some changes to requests to align them with replies.
-              </li><li>
-                Default expiry set to 5 days, was 1 day.
-              </li><li>
-                Contracts - New ContractChooser helps avoid the
-                grams-of-gold selection blues.
-              </li><li>
-                There is a
-                new "defaults" features so that suppliers can
-                build a version that starts up with contracts already
-                sucked in to the contract store.
-                It takes contracts from "defaults/contracts" on first
-                startup for new user.
-              </li><li>
-                A lot of source code has been moved around.
-              </li><li>
-                Menu Help/Help now says something
-            </li></ul>
+    </P><P>
 
 <p>
 Go to
@@ -294,11 +249,88 @@
 
 
 <h3><a name="history">History</a></h3>
+<p>
+Activity (current track is 1.6):
 <p>
-Activity:
+<small>
 <ul><li>
-    (now on 1.5)
-  </li><p><small><li>
+    <b>1.5.4</b></a>:
+            <ul><li>
+                Quick fix for the NPEx problem where the Java
+                PrintWriter object blows up.  Cause is unknown,
+                backed out a change that seems to trigger it.
+            </li></ul>
+
+    <P>
+    <b>1.5.3</b></a>:
+            <ul><li>
+                Think I got it - the receipts were incorrectly updated,
+                but advise below concerning uncancellable payments still
+                holds in general!
+              </li><li>
+                Now checks for /dev/random for the good entropy.
+                Faster on Unix, still boring on Windows.
+            </li></ul>
+
+    <P>
+    <b>1.5.2</b></a>:
+            <ul><li>
+                Slow, painful fix to mail signing problem - the mail
+                code was completely rewritten to remove an "innovation"
+                that broke all mail signing.  You might have noticed that
+                mail was clogging up...
+              </li><li>
+                There is still a bug in the mail code - receipts can
+                be dropped but signed for.  This is a hanging offence,
+                if you see a Payment that you cannot cancel because it
+                is already used (pid), do not restart, but copy the
+                'out' file and send it to the support team.
+              </li><li>
+                DROPPED support for old /data/ version 1 data formats.
+                This is about a year old....  It will warn you of the
+                dropped support and terminate if present.
+            </li></ul>
+
+    <P>
+    <b>1.5.1</b></a>:
+            <ul><li>
+                Quick fix, can accept bearer deposit from unknown account.
+              </li><li>
+                Improved Payment readale comment.
+              </li><li>
+                History browser now has more features.  Still has the
+                known bug of printing the unit of contract not account.
+                This can't be fixed until the browser is changes to a
+                plugin (which has access to the contracts).
+            </li></ul>
+
+    <P>
+    <b>1.5.0</b></a>:  Major cleanup release.  Lots of detail changes
+            <ul><li>
+                Under New, a Backups option that copies the
+                entire directory as selected.  Fairly primitive,
+                the backup is only 99% runnable, but it has all
+                the important data.
+              </li><li>
+                Some changes to requests to align them with replies.
+              </li><li>
+                Default expiry set to 5 days, was 1 day.
+              </li><li>
+                Contracts - New ContractChooser helps avoid the
+                grams-of-gold selection blues.
+              </li><li>
+                There is a
+                new "defaults" features so that suppliers can
+                build a version that starts up with contracts already
+                sucked in to the contract store.
+                It takes contracts from "defaults/contracts" on first
+                startup for new user.
+              </li><li>
+                A lot of source code has been moved around.
+              </li><li>
+                Menu Help/Help now says something
+            </li></ul>
+  </li><p><p><small><li>
     <b>1.4.7</b></a>:  Minor release.
             <ul><li>
                 Moved <b>[new]</b> button into Plugins
@@ -317,7 +349,7 @@
                 directory user/data2/Wallets/SOX/SOXServer
                 (which can be done any time) and restart.
             </li></ul>
-              </small>
+                </small>
 
   </li><p><li>
     <b>1.4.6</b></a>:  Minor bug fix for 1.4.5
@@ -610,7 +642,7 @@
     <b>1.0.X</b>
     Pogrom launched on all pretenders.  
 </li></ul>
-</small>
+</small></small>
 
 <hr>
 <small>



1.9       +5 -8      html/download/zip/run

Index: run
===================================================================
RCS file: /home/webfunds/cvsroot/html/download/zip/run,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- run	2000/04/13 02:58:30	1.8
+++ run	2000/06/21 11:49:13	1.9
@@ -48,13 +48,10 @@
 
 
 # these shouldn't need to change
-export CLASSPATH=.:${SWING}:WebFunds.jar:SOX.jar:Cryptix.jar
+export CLASSPATH=.:${SWING}:WebFunds.jar:SOX.jar:Cryptix.jar:$MORE_JARS
 
-mv -f out out.old
-${java} webfunds.client.Core > out 2>&1 &
+# preserves a log so errors can be sent straight to WebFunds bug central.
+echo "Note, errors now kept in the file stderr"
+mv -f stderr stderr.old
+${java} webfunds.client.Core
 
-# preserve a log so errors can be sent straight to WebFunds bug central.
-echo "Tailing 'out'; ^C to kill; debugging recorded in out."
-echo "Mail the file 'out' if you see any bugs."
-echo
-sleep 1 ; tail -f out