[Webfunds-commits] html/download Makefile README.html makezip

Ian Grigg iang@cypherpunks.ai
Thu, 7 Dec 2000 16:13:27 -0400 (AST)


iang        00/12/07 16:13:26

  Modified:    download Makefile README.html makezip
  Log:
  fixes...

Revision  Changes    Path
1.16      +4 -4      html/download/Makefile

Index: Makefile
===================================================================
RCS file: /home/webfunds/cvsroot/html/download/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile	2000/11/15 08:59:56	1.15
+++ Makefile	2000/12/07 20:13:26	1.16
@@ -30,17 +30,17 @@
 $(SRCZIP): $(FUNZJAR)
 	cd ../../java ; . ./init; ./build_src
 
-digigold: $(FUNZJAR) $(SRCZIP)
+digigold: $(FUNZJAR)
 	# makezip is the primary, not make
 	./makezip www export -d 'DigiGold_??G_2000.asc'
 
-all: $(FUNZJAR) $(SRCZIP)
+all: $(FUNZJAR)
 	# makezip is the primary, not make
 	./makezip www export -d 'Glitter.asc' -d 'BeerVouchers.asc'
 
-test: $(FUNZJAR) $(SRCZIP)
+test: $(FUNZJAR)
 	# makezip is the primary, not make
-	./makezip www -d 'DigiGold_??G_2000.asc'
+	./makezip -bis www -d 'DigiGold_??G_2000.asc'
 
 $(JDZIP):
 	cd ../../java ; . ./init; ; ./jd



1.5       +57 -22    html/download/README.html

Index: README.html
===================================================================
RCS file: /home/webfunds/cvsroot/html/download/README.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- README.html	2000/11/15 08:59:56	1.4
+++ README.html	2000/12/07 20:13:26	1.5
@@ -18,7 +18,7 @@
     <a href="#going">Getting it Going</a>
     <br><small>
         .. <a href="#general">General</a>
-        .. <a href="#macos">MacOS</a>
+        .. <a href="#macos">Mac OS</a>
         .. <a href="#unix">Unix</a>
         .. <a href="#DOS">DOS</a>
         .. <a href="#jars">Jars List</a>
@@ -29,7 +29,7 @@
     <a href="#other">Other Components</a>
     <br><small>
         .. <a href="#other_java">Java</a>
-        .. <a href="#other_macos">MacOS</a>
+        .. <a href="#other_macos">Mac OS</a>
     </small>
   </li><li>
     <a href="#quick">Quick Intro</a>
@@ -52,11 +52,36 @@
 
 <p>
 Current Version: 
-<a href="http://www.webfunds.org/download/WebFunds-1.7.4.zip">
-    <b>1.7.4</b></a>:
+<a href="http://www.webfunds.org/download/WebFunds-1.7.5.zip">
+    <b>1.7.5</b></a>:
 
     <p></p>
             <p align=center><b><i>
+              Changes in 1.7.5 (minor bug fix release):
+            </i></b></p>
+
+            <ul><li>
+                "Stale Key" bug should be remedied, when spotted,
+                issuer code asks for update to key.  This bug struck
+                anytime the server was restarted and recalculated
+                the session key, and needed WebFunds to be restarted.
+              </li><li>
+                Abstract Payments now "more complete" in WebFunds...
+                Tokens still being worked on.  <code>Special Pay</code>
+                not as yet working, ignore please.
+                See
+                <a href="http://www.webfunds.org/guide/token.html">
+                Token Notes</a>
+                for more details.
+              </li><li>
+                Notes are now available on
+                <a href="http://www.webfunds.org/guide/custom.html">
+                customisation</a>
+                such as how to modify the distribution for standard
+                contracts.
+            </li></ul>
+    <p></p>
+            <p align=center><b><i>
               Changes in 1.7.4 (mostly a checkpoint release):
             </i></b></p>
 
@@ -178,7 +203,7 @@
 
 
 
-<h4><a name="MacOS">MacOS</a></h4>
+<h4><a name="macos">Mac OS</a></h4>
 
 <p></p>
 <table border=5>
@@ -191,27 +216,35 @@
     <td>
       <b>Unzip it</b>
 
-    <td><br>
-      Move swingall.jar from the /Swing 1.1.1/ directory to the /WebFunds/
-      directory.
-
+    <td>
+      <p>
+      There seems to be a problem with StuffIt Expander's unzip 
+      feature, so unzip the package with something else, like
+      <a href="http://www.sitec.net/maczip/download/MacZip105c.hqx" 
+      target="_top">MacZip</a>,
+      instead.
+      </p><p>
+      There is no need to move swingall.jar from the /Swing 1.1.1/
+      directory to the /WebFunds/ directory.
+      </p>
   </tr><tr bgcolor="#00FFFF">
 
     <td>
       <a name="prepare"></a>
-      <b>Prepare</b> (once only)
+      <b>Prepare</b> (once only, if you Save Settings... As Application)
 
     <td><br>
+      <p>
       Run JBindery from the /MRJ SDK 2.1/JBindery/ directory.
 
-      <p>
+      </p><p>
       Select Command in left column and type in the first line:
       <tt>webfunds.client.Core</tt>
 
-      <p>
+      </p><p>
       Select ClassPath in left column and click on the add .zip file button.
 
-      <p>
+      </p><p>
       Open the Jars in the order listed in the above
       <a href="#general">Jars List</a>.
       Note that as you are running JDK 1.1, you will
@@ -221,25 +254,27 @@
       <code>swingall.jar</code>
       (last).
 
-      <p>
+      </p><p>
       Highlight each of the .jar files, <i>except</i>
-      <code>swingall.jar</code>,
-      in turn and use the
-      up-arrow -- below the Edit and Delete buttons on the right side
-      of the application window -- to move them above $CLASSPATH.
+      <code>swingall.jar</code>, in turn and use the 
+      up-arrow -- below the Edit and Delete buttons on 
+      the right side of the application window -- to 
+      move them above $CLASSPATH.
 
-      <p>
+      </p><p>
       Leave swingall.jar below $CLASSPATH.
-
 
+      </p>
   </tr><tr bgcolor="#FF00FF">
 
     <td><br>
       <b>Run</b>
 
     <td><br>
-      Hit Run.
-
+      <p>
+      Hit Save Settings..., make sure that Save as Application
+      is checked, and then hit Run.
+      </p>
 
 </tr></table>
 



1.13      +47 -6     html/download/makezip

Index: makezip
===================================================================
RCS file: /home/webfunds/cvsroot/html/download/makezip,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- makezip	2000/10/02 14:16:05	1.12
+++ makezip	2000/12/07 20:13:26	1.13
@@ -4,11 +4,26 @@
 
 usage()
 {
-    opts="[-d default_contract] [-j more_jars] [-f more_files]"
-    echo "Usage: makezip $opts [www|export]"
+    echo "Usage: makezip [opts...] [www|export]"
     exit 1
 }
 
+Help()
+{
+    echo "
+Options:
+
+    www        send this to the local site for checking
+    export     send this to the public site as a complete distribution
+
+    -bis       make this version with 'bis' in the filename
+    -d con     add con as a default contract for startup
+    -f fil     add fil into top dir
+    -j jar     add jar into distribution as a JAR
+"
+    usage
+}
+
 contracts=""
 export=false
 www=false
@@ -18,6 +33,7 @@
 tmp=/tmp
 jars="WebFunds.jar SOX.jar cryptix-*.jar"
 files="zip history.html"
+bis=false
 
 while true
 do
@@ -28,8 +44,10 @@
        '-p')     shift ; product=$1 ; shift ;;
        '-j')     shift ; jars="${jars} $1" ; shift ;;
        '-f')     shift ; files="${files} $1" ; shift ;;
+       '-bis')   bis=true ;;
+       '-help'|-?)  Help ;;
        "")       break       ;;
-       *)        usage ;;
+       *)        Help ;;
     esac
 done
 
@@ -98,6 +116,23 @@
 cd $TOP/contracts
   cp *.asc *.loc ${build}
 
+  if ${defs}
+  then
+    mkdir -p ${def_contracts}
+    # cd $TOP/contracts
+
+    for asc in ${contracts}
+    do
+        c=${asc%.asc}
+        echo "default contract: $c"
+        
+        if [ -f ${c}.asc ]
+        then
+            cp ${c}.asc ${c}.loc ${def_contracts}
+        fi
+    done
+  fi
+
 echo "In here go 3rd party Plugins and Wallets..."  > ${build}/plugins/README
 
 make_zip ()
@@ -111,6 +146,12 @@
   cp ${zn} $TOP/html/download
 }
 
+if ${bis}
+then
+    version=${version}-bis
+    zipname=${product}-${version}.zip
+fi
+
 make_zip ${zipname}
 
 send_out ()
@@ -132,8 +173,10 @@
 }
 
 send_out $version
+
 
-if ${defs}			# make a special with defaults
+
+if false
 then
     mkdir -p ${def_contracts}
     cd $TOP/contracts
@@ -156,8 +199,6 @@
     send_out $version
 fi
 
-
 # cvs commit ${zipname}.zip
-
 
 # rm -r ${build} ${build}.zip