=================================================================== RCS file: /home/cvs/OpenXM/src/kan96xx/Doc/ox-win.sm1,v retrieving revision 1.7 retrieving revision 1.12 diff -u -p -r1.7 -r1.12 --- OpenXM/src/kan96xx/Doc/ox-win.sm1 2001/08/22 02:36:34 1.7 +++ OpenXM/src/kan96xx/Doc/ox-win.sm1 2001/12/28 08:18:23 1.12 @@ -1,6 +1,10 @@ -%%%%%%%%%%% $OpenXM: OpenXM/src/kan96xx/Doc/ox-win.sm1,v 1.6 2001/08/12 03:13:35 takayama Exp $ +%%%%%%%%%%% $OpenXM: OpenXM/src/kan96xx/Doc/ox-win.sm1,v 1.11 2001/12/28 08:09:38 takayama Exp $ -[(parse) (ox.sm1) pushfile] extension pop +/ox-win.sm1.loaded 1 def +(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 @@ -21,7 +25,6 @@ OpenXM_HOME_WIN tag 0 eq { %% 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 @@ -30,6 +33,42 @@ OpenXM_HOME_WIN tag 0 eq { /oxpath.null00 ( >& /dev/null ) def %%cf. oxNoX /oxpath.null00-pure-sh ( 2>&1 >/dev/null) def %%TODO:It does not work in our case +/sm1connectr { + [(getenv) (OSTYPE)] extension tag 0 eq { + sm1connectr_win + }{ + [(getenv) (OSTYPE)] extension (cygwin) eq + { + sm1connectr_cygwin + }{ + sm1connectr_win + }ifelse + } ifelse +} def + +%% For cygwin +/sm1connectr_cygwin { + [/in-sm1connectr /pass /peer /data /control ] pushVariables + [ + /pass [(oxGenPass)] extension def + /peer [(oxGetPort) (localhost)] extension def + /data peer 1 get toString def + /control peer 3 get toString def + peer message + [(start ox ) ( -reverse -ox ) (/home/nobuki/OpenXM/src/kxx/ox_sm1.exe) + ( -data ) data ( -control ) control ( -pass ) pass + ( -wait 2 ) + oxpath.null + ( )] cat system + [(oxCreateClient2) peer 0 pass] extension /ox.ccc set + %% 0 means connect from only localhost. + (The server is binded to the variable ox.ccc) message + ox.ccc.init + ] pop + popVariables +} def + +%% For Native windows system /sm1connectr_win { [/in-sm1connectr /pass /peer /data /control ] pushVariables [ @@ -40,10 +79,10 @@ OpenXM_HOME_WIN tag 0 eq { peer message [(forkExec) [ (c:/windows/command/start) - [OpenXM_HOME_WIN (/bin/ox)] cat + [OpenXM_HOME_WIN (\bin\ox)] cat (-reverse) (-ox) - [OpenXM_HOME_WIN (/bin/ox_sm1.exe)] cat + [OpenXM_HOME_WIN (\bin\ox_sm1.exe)] cat (-data) data (-control) @@ -61,7 +100,8 @@ OpenXM_HOME_WIN tag 0 eq { popVariables } def -/asirconnectr_win { +%% Test +/asirconnectr_win_test { [/in-sm1connectr /pass /peer /data /control ] pushVariables [ /pass [ ] cat def %% Do not use one time password. @@ -91,4 +131,4 @@ OpenXM_HOME_WIN tag 0 eq { popVariables } def -initializePathNamesForOx %% This should be +%% Skip it. initializePathNamesForOx