[Webfunds-commits] java init init_sox

Wed, 16 Aug 2000 14:35:40 -0400 (AST)

iang        00/08/16 14:35:40

  Modified:    .        init init_sox
  Log:
  minor mods

Revision  Changes    Path
1.28      +19 -6     java/init

Index: init
===================================================================
RCS file: /home/webfunds/cvsroot/java/init,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28

--- init	2000/08/11 20:16:11	1.27
+++ init	2000/08/16 18:35:40	1.28
@@ -1,10 +1,7 @@
 
-
-# sets SWING, JAVA_HOME, JAVA, JAVAC
-. ./init_java
-
 : ${WEBFUNDS_DIR:=${PWD%/*}}
 export WEBFUNDS_DIR
+
 export WEBFUNDS_LIB=$WEBFUNDS_DIR/lib
 export WEBFUNDS_SRC=$WEBFUNDS_DIR/java			# for src archive
 export BUILD=${WEBFUNDS_DIR}/build			# where to put classes
@@ -12,15 +9,31 @@
 # export PATH=$PWD:$PATH:/usr/local/java/bin
 export PATH=$PWD:$PATH
 
+# sets SWING, JAVA_HOME, JAVA, JAVAC
+# . ./init_java # now in init_sox
+
 
 #
 #   Initialise access to the SOX Tool Kit.
 #
 [ -z "${soxjar}" ] && soxjar=false    # work with the SOX jar or build dir ?
 export soxjar
+
+export SOX_DIR=${WEBFUNDS_DIR}        # will change
+export SOX_SRC=${SOX_DIR}/java        # will change
+
+init_sox="./init_sox"
+# sets SOX_DIR SOX_CLASSPATH SOX_DIRS SOX_JAR SOX_BUILD
+{
+    cd ${SOX_SRC} &&
+    . ${init_sox} &&
+    cd ${WEBFUNDS_SRC}     
+} ||
+    echo No ${init_sox}, cannot set up Java, SOX tool kit, cannot build
+
+
+
 
-# sets SOX_CLASSPATH SOX_DIRS SOX_JAR SOX_BUILD
-. ./init_sox
 export WF_DIRS="webfunds/client/utils webfunds/client/sun webfunds/client/contracts webfunds/client/contracts/wizard webfunds/client/plugins webfunds/client/sox webfunds/client"
 
 #



1.3       +28 -12    java/init_sox

Index: init_sox
===================================================================
RCS file: /home/webfunds/cvsroot/java/init_sox,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- init_sox	2000/08/11 20:16:11	1.2
+++ init_sox	2000/08/16 18:35:40	1.3
@@ -6,15 +6,32 @@
     . ./init_java
 fi
 
-if [ "${WEBFUNDS_DIR}" = '' ]
+# # huh? will change
+# if [ "${WEBFUNDS_DIR}" = '' ]
+# then
+#     echo "Warning: no WEBFUNDS_DIR"
+#     WEBFUNDS_DIR="${PWD%/*}"
+# fi
+
+: ${WEBFUNDS_LIB:=${WEBFUNDS_DIR}/lib}
+export WEBFUNDS_LIB
+
+if [ "${SOX_DIR}" = '' ]
 then
-    echo "Warning: no WEBFUNDS_DIR"
-    WEBFUNDS_DIR="../lib"
+    echo "Warning: no SOX_DIR"
+    SOX_DIR="${PWD%/*}"
 fi
 
-: ${WEBFUNDS_LIB:=${WEBFUNDS_DIR}/lib}
+:   ${SOX_LIB:=${SOX_DIR}/lib}
+:   ${SOX_SRC:=${SOX_DIR}/java}
+:   ${SOX_BUILD:=${SOX_DIR}/build_sox}
+
+:   ${SOX_JAR:=${SOX_LIB}/SOX.jar}
 
+export SOX_LIB SOX_SRC SOX_BUILD SOX_JAR
 
+
+
 #
 #  Make Cryptix accessible.
 #
@@ -31,16 +48,11 @@
 #  local single library:
 #    export CRYPTIX=$LIB/Cryptix.jar:$LIB:
 
-lib=${WEBFUNDS_LIB}
+lib=${SOX_LIB}
 export CRYPTIX=$lib/cryptix-jce-compat.jar:$lib/Cryptix.jar:$lib/cryptix-jce-api.jar:$lib/cryptix-jce-provider.jar:$lib/cryptix-jce-tests.jar
 export PGP_JAR=$lib/cryptix-openpgp.jar
 export CRYPTIX_CLASSPATH=$PGP_JAR:$CRYPTIX
 
-#
-#  the SOX_JAR is really only used by the distribution stuff
-#
-export SOX_JAR=${WEBFUNDS_LIB}/SOX.jar
-export SOX_BUILD=${BUILD:-${WEBFUNDS_DIR:-..}/build}_sox
 
 #
 #  The directories to be compiled for the SOX Tool Kit.
@@ -48,10 +60,14 @@
 #  SOX in this context refers to more than SOX the protocol,
 #  it is really the SOX toolkit.
 #
-#  webfunds/x509 java/security/cert are temporaries until
+#  temporaries:
+#      webfunds/x509
+#      webfunds/openpgp/cert
+#      webfunds/openpgp/provider
+#      java/security/cert
 #  the compat stuff goes properly into Cryptix JCE.
 #
-export SOX_DIRS="webfunds/x509 java/security/cert webfunds/openpgp/cert webfunds/utils webfunds/sox webfunds/store webfunds/ricardian"
+export SOX_DIRS="webfunds/x509 webfunds/openpgp/cert webfunds/openpgp/provider java/security/cert webfunds/utils webfunds/sox webfunds/store webfunds/ricardian"
 
 
 #






