===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/ox-win.sm1,v
retrieving revision 1.9
retrieving revision 1.14
diff -u -p -r1.9 -r1.14
--- OpenXM/src/kan96xx/Doc/ox-win.sm1	2001/12/28 01:20:25	1.9
+++ OpenXM/src/kan96xx/Doc/ox-win.sm1	2002/01/13 06:55:30	1.14
@@ -1,12 +1,12 @@
-%%%%%%%%%%%  $OpenXM: OpenXM/src/kan96xx/Doc/ox-win.sm1,v 1.8 2001/08/22 03:23:25 takayama Exp $
+%%%%%%%%%%%  $OpenXM: OpenXM/src/kan96xx/Doc/ox-win.sm1,v 1.13 2002/01/09 11:32:01 takayama Exp $
 
 /ox-win.sm1.loaded 1 def
-/ox.sm1.loaded boundp {
+(ox.sm1.loaded) boundp {
 }{
   [(parse) (ox.sm1) pushfile] extension pop
 } ifelse
 
-$ox-win.sm1, ---OpenXM protocol module for Microsoft Windows 08/22, 2001  (C) N.Takayama.$ message-quiet
+$ox-win.sm1, ---OpenXM protocol module for Microsoft Windows 1/9, 2002  (C) N.Takayama.$ message-quiet
 
 %%%%%%%%%%%% Configuration: Specify your server path
 %%%%% ox, ox_sm1, oxlog are contained in kxx.tgz
@@ -21,25 +21,51 @@ OpenXM_HOME_WIN tag 0 eq {
   [(getenv) (OpenXM_HOME)] extension
   /OpenXM_HOME_WIN set
 } { } ifelse
+OpenXM_HOME_WIN tag 0 eq {
+  %% Hard encoding:
+  /OpenXM_HOME_WIN
+   (\OpenXM-win)
+%  (\cygwin\home\nobuki\OpenXM\misc\packages\Windows\OpenXM-win)    
+  def
+} { } ifelse
 
 %% This is used in asirconnectr_win
 /OX_LAUNCH (c:\home\asir\bin\ox_launch.exe) def
 %%%%%%%%%%%%%%% end configuration  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-/oxpath.ox (bin/ox.exe) def
-/oxpath.oxsm1 (bin/ox_sm1.exe) def
-/oxpath.oxlog (bin/oxlog.exe) def
-/oxpath.xterm (start ) def
-/oxpath.null  (  ) def
-/oxpath.null00  ( >& /dev/null ) def  %%cf. oxNoX
-/oxpath.null00-pure-sh ( 2>&1 >/dev/null) def %%TODO:It does not work in our case
+%% Set constants for windows.
+[(getenv) (OSTYPE)] extension tag 0 eq {
+  /ox.ostype (native-windows) def
+}{
+  [(getenv) (OSTYPE)] extension /ox.ostype set
+} ifelse
 
+ox.ostype (cygwin) eq {
+ /oxpath.ox (bin/ox.exe) def
+ /oxpath.oxsm1 (bin/ox_sm1.exe) def
+ /oxpath.oxlog (bin/oxlog.exe) def
+ /oxpath.xterm (start ) def
+ /oxpath.null  (  ) def
+ /oxpath.null00  ( >& /dev/null ) def  %%cf. oxNoX
+ /oxpath.null00-pure-sh ( 2>&1 >/dev/null) def %%TODO:It does not work in our case
+}{
+  /oxpath.ox
+  [ OpenXM_HOME_WIN
+    (\bin\ox.exe)
+  ] cat
+ def
+} ifelse
+
 /sm1connectr {
+ [(getenv) (OSTYPE)] extension tag 0 eq {
+     sm1connectr_win
+ }{
    [(getenv) (OSTYPE)] extension (cygwin) eq
    {
      sm1connectr_cygwin
    }{
      sm1connectr_win
    }ifelse
+ } ifelse
 } def
 
 %% For cygwin
@@ -74,8 +100,10 @@ OpenXM_HOME_WIN tag 0 eq {
  /control peer 3 get toString def
  peer message
  [(forkExec) [
-    (c:/windows/command/start)
-    [OpenXM_HOME_WIN  (\bin\ox)] cat
+    %%(c:/windows/command/start)
+    (start)
+    %%[OpenXM_HOME_WIN  (\bin\ox)] cat
+    oxpath.ox
     (-reverse)
     (-ox)
     [OpenXM_HOME_WIN (\bin\ox_sm1.exe)] cat
@@ -97,7 +125,7 @@ OpenXM_HOME_WIN tag 0 eq {
 } def
 
 %% Test
-/asirconnectr_win {
+/asirconnectr_win_test {
  [/in-sm1connectr /pass /peer /data /control ] pushVariables
  [
  /pass [ ] cat def  %% Do not use one time password.