===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/oxasir-win.sm1,v
retrieving revision 1.4
retrieving revision 1.12
diff -u -p -r1.4 -r1.12
--- OpenXM/src/kan96xx/Doc/oxasir-win.sm1	2001/12/28 03:34:24	1.4
+++ OpenXM/src/kan96xx/Doc/oxasir-win.sm1	2002/07/29 05:02:58	1.12
@@ -1,32 +1,71 @@
-% $OpenXM: OpenXM/src/kan96xx/Doc/oxasir-win.sm1,v 1.3 2001/12/28 03:33:21 takayama Exp $
+% $OpenXM: OpenXM/src/kan96xx/Doc/oxasir-win.sm1,v 1.11 2002/01/13 06:55:30 takayama Exp $
 % It is empty for now.
 %
 /oxasir.sm1.loaded 1 def
-(oxasir-win.sm1 (C) N.Takayama, 12/28, 2001) message
+(oxasir-win.sm1 (C) N.Takayama, 1/9, 2002) message
 
+[(getenv) (OPENXMHOMEWIN)] extension
+/OpenXM_HOME_WIN set
+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
+
+
 %% Set constants for windows.
+[(getenv) (OSTYPE)] extension tag 0 eq {
+  /oxasir.ostype (native-windows) def
+}{
+  [(getenv) (OSTYPE)] extension /oxasir.ostype set
+} ifelse
+
+oxasir.ostype (cygwin) eq {
 /oxasirpath.oxasir  
   [ [(getenv) (OpenXM_HOME)] extension
     (/bin/ox_asir) ] cat
-% (\OpenXM-win\bin\ox_asir)
 def
 /oxasirpath.asirlib
   [ [(getenv) (OpenXM_HOME)] extension
     (/lib/sm1/oxasir.asir) ] cat
-% (\OpenXM-win\lib\sm1\oxasir.asir)
 def
 /oxpath.ox
-%%  (\OpenXM-win\bin\ox.exe)
   (ox)
 def
+}{
+ /oxasirpath.oxasir  
+  [ OpenXM_HOME_WIN
+    (\bin\ox_asir) ] cat
+ def
+ /oxasirpath.asirlib
+  [ OpenXM_HOME_WIN
+    (/lib/sm1/oxasir.asir)
+  ] cat
+ def
+ /oxpath.ox
+  [ OpenXM_HOME_WIN
+    (\bin\ox.exe)
+  ] cat
+ def
+} ifelse
 %% Override asirconnectr
 /asirconnectr {
+ [(getenv) (OSTYPE)] extension tag 0 eq {
+     asirconnectr_win
+ }{
    [(getenv) (OSTYPE)] extension (cygwin) eq
    {
      asirconnectr_cygwin
    }{
      asirconnectr_win
    }ifelse
+ } ifelse
 } def
 
 /asirconnectr_cygwin {
@@ -37,7 +76,8 @@ def
  /data peer 1 get toString def
  /control peer 3 get toString def
  peer message
- [(start ) oxpath.ox ( -reverse -ox ) oxasirpath.oxasir
+ [ox.win.start   aload pop 
+  oxpath.ox ( -reverse -ox ) oxasirpath.oxasir
   ( -data ) data ( -control ) control  ( -pass ) pass 
   ( -wait 5 )
   oxpath.null
@@ -60,16 +100,13 @@ def
  /control peer 3 get toString def
  peer message
 
- /oxasirpath.asirlib
-   (\OpenXM-win\lib\sm1\oxasir.asir)
- def
 
  [(forkExec) [
-    (start)
-    (\OpenXM-win\bin\ox.exe)
+    ox.win.start   aload pop 
+    oxpath.ox
     (-reverse)
     (-ox)
-    (\OpenXM-win\bin\ox_asir)
+    oxasirpath.oxasir  
     (-data)
      data
      (-control)