Menu
▾
▴
[Oorexx-svn] SF.net SVN: oorexx:[5172] incubator/mod_oorexx
|
From: <wda...@us...> - 2009-09-14 14:49:55
|
Revision: 5172
http://oorexx.svn.sourceforge.net/oorexx/?rev=5172&view=rev
Author: wdashley
Date: 2009-09-14 14:49:48 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
More updates to mod_oorexx. Getting close to releasing it.
Modified Paths:
--------------
incubator/mod_oorexx/docs/RSP.html
incubator/mod_oorexx/docs/Readme.html
incubator/mod_oorexx/docs/RexxHowTo.html
incubator/mod_oorexx/docs/index.html
incubator/mod_oorexx/make_mod_oorexx.rex
incubator/mod_oorexx/makefile.aix
incubator/mod_oorexx/makefile.linux
incubator/mod_oorexx/rspcomp/rspcomp.rex
Modified: incubator/mod_oorexx/docs/RSP.html
===================================================================
--- incubator/mod_oorexx/docs/RSP.html 2009-09-14 03:34:39 UTC (rev 5171)
+++ incubator/mod_oorexx/docs/RSP.html 2009-09-14 14:49:48 UTC (rev 5172)
@@ -135,7 +135,7 @@
<li>Mod_ooRexx calls the newly created ooRexx program.</li>
<li>Mod_ooRexx removes the temporary file.</li>
</ol>
-<p>The compile process happens very fast and the execution of the ooRexx
+<p>The compile process is very fast and the execution of the ooRexx
program created by the process is only limited to the actions it invokes.
Typically the created program also executes quickly provided it does not
access databases or other external environments.</p>
@@ -213,7 +213,7 @@
<h2><a name="Syntax">
RSP Syntax Rules</a></h2>
<p>The syntax rules for RSP files are very strict. This is due to the
-parser (rspcomp.rex) used to scan the RSP file and the syntax restrictions
+parser/compiler (rspcomp.rex) used to scan the RSP file and the syntax restrictions
imposed by the Rexx language.</p>
<p>Because Rexx is a line-oriented language (Rexx assumes a semicolon at
the end of each line unless the continuation character is present) the compiler
Modified: incubator/mod_oorexx/docs/Readme.html
===================================================================
--- incubator/mod_oorexx/docs/Readme.html 2009-09-14 03:34:39 UTC (rev 5171)
+++ incubator/mod_oorexx/docs/Readme.html 2009-09-14 14:49:48 UTC (rev 5172)
@@ -39,6 +39,10 @@
You must have Open Object Rexx 4.0.0 or later installed. Mod_ooRexx does NOT
work with any other Rexx interpreter.</p>
+<p style="color: red">If the version of Apache you are using is 64-bit then you must
+install the 64-bit version of ooRexx and Mod_ooRexx so that Apache can successfully
+link to the ooRexx and Mod_ooRexx libraries.</p>
+
<p>This software is subject to the terms of the Common Public License. You must
accept the terms of this license to use this software. Refer to
<a href="./CPLv1.0.htm">CPLv1.0.htm</a> for more information.</p>
@@ -235,7 +239,7 @@
<br /><br /><br /><br /><br />
<h2><a name="UnixInstall">
-Unix Package Installation</a></h2>
+Unix/Linux Package Installation</a></h2>
<p>
To install the package on Unix, unzip the contents to a temporary subdirectory. Move
the following files to these locations:</p>
@@ -312,19 +316,17 @@
<br /><br /><br /><br /><br />
<h2><a name="WinInfo">Windows Information</a></h2>
<p>This package has not been tested yet on Windows.</p>
-<p>All the source files, except makefile.nt and the ooRexx sample scripts,
-are in Unix format (lines are delimited only by a line feed).</p>
<br /><br /><br /><br /><br />
<h2><a name="UnixInfo">Unix Information</a></h2>
<p>For Linux, the package was compiled under Fedora 11 using the standard GCC
-compiler installed from Fedora 10. You will need to
+compiler. You will need to
compile your own module for your version of GCC, Linux/AIX, or Apache.</p>
<p>The package was tested using</p>
<ul>
-<li>Apache2 for Linux Version 2.2.11-8.</li>
+<li>Apache2 for Linux Version 2.2.11-8</li>
<li>Open Object Rexx for Linux version 4.0.0</li>
-<li>Fedora 11.</li>
+<li>Fedora 11</li>
</ul>
<p>For AIX, this package has not been tested yet.</p>
<p>All the source files, except the ooRexx sample scripts,
@@ -368,7 +370,6 @@
<li>You should not attempt to do I/O to stdin, stdout or stderr in ooRexx
scripts running under Mod_ooRexx since they are not attached to traditional
file system or console handles.</li>
-<li>OS/2 is not a supported Mod_ooRexx environment.</li>
<li>If you are using Rexx/SQL in combination with Mod_ooRexx be sure you are using
the latest version which is thread-safe. Otherwise you will have strange problems
and crashes. Also, on Windows, be sure to define all databases used by Mod_ooRexx
Modified: incubator/mod_oorexx/docs/RexxHowTo.html
===================================================================
--- incubator/mod_oorexx/docs/RexxHowTo.html 2009-09-14 03:34:39 UTC (rev 5171)
+++ incubator/mod_oorexx/docs/RexxHowTo.html 2009-09-14 14:49:48 UTC (rev 5172)
@@ -38,9 +38,7 @@
intact.</li>
<li>Run the following command from the main Mod_ooRexx subdirectory.
<pre>
-rexx make_mod_oorexx.rex orexx <--- For Linux, Windows or AIX
- or
-rexx make_mod_oorexx.rex regina <--- For Linux or Windows
+rexx make_mod_oorexx.rex <--- For Linux, Windows or AIX
</pre>
</li>
</ol>
Modified: incubator/mod_oorexx/docs/index.html
===================================================================
--- incubator/mod_oorexx/docs/index.html 2009-09-14 03:34:39 UTC (rev 5171)
+++ incubator/mod_oorexx/docs/index.html 2009-09-14 14:49:48 UTC (rev 5172)
@@ -29,7 +29,6 @@
Author: W. David Ashley
ooRexx Team
- IBM Lab Services - pSeries Linux Consultant
<a href="mailto:da...@us...">da...@us...</a>
Mod_ooRexx is a part of the <a href="http://www.oorexx.org/">Open Object Rexx</a>
Modified: incubator/mod_oorexx/make_mod_oorexx.rex
===================================================================
--- incubator/mod_oorexx/make_mod_oorexx.rex 2009-09-14 03:34:39 UTC (rev 5171)
+++ incubator/mod_oorexx/make_mod_oorexx.rex 2009-09-14 14:49:48 UTC (rev 5172)
@@ -41,16 +41,13 @@
/* find out the operating system */
+use arg cmdline
parse source source_str
parse var source_str os .
if substr(os, 1, 7) = 'Windows' then os = 'WINDOWS'
-if os = 'WIN32' then os = 'WINDOWS' /* for Regina */
-if os = 'UNIX' then os = 'LINUX' /* for Regina */
+if os = 'WIN32' | os = 'WIN64' then os = 'WINDOWS'
+if os = 'UNIX' then os = 'LINUX'
select
- when os = 'OS/2' then do
- say 'Error: OS/2 is not supported by Mod_ooRexx.'
- return 8
- end
when os = 'LINUX' then nop
when os = 'AIX' then nop
when os = 'WINDOWS' then nop
@@ -70,23 +67,16 @@
/* now call the appropriate functions for making Mod_ooRexx */
select
when os = 'LINUX' then do
- 'cp ./makefile.linux ./makefile'
- 'make'
+ 'make -f ./makefile.linux' cmdline
'cp mod_oorexx.so ./bin'
- 'make cleanall'
- 'rm ./makefile'
end
when os = 'AIX' then do
- 'cp ./makefile.aix ./makefile'
- 'make'
+ 'make -f ./makefile.aix' cmdline
'cp mod_oorexx.so ./bin'
- 'make cleanall'
- 'rm ./makefile'
end
when os = 'WINDOWS' then do
- 'nmake /F makefile.nt'
+ 'nmake /F makefile.nt' cmdline
'copy mod_oorexx.dll .\bin'
- 'nmake /F makefile.nt cleanall'
end
otherwise nop
end
Modified: incubator/mod_oorexx/makefile.aix
===================================================================
--- incubator/mod_oorexx/makefile.aix 2009-09-14 03:34:39 UTC (rev 5171)
+++ incubator/mod_oorexx/makefile.aix 2009-09-14 14:49:48 UTC (rev 5172)
@@ -97,5 +97,5 @@
handlers.o : handlers.cpp $(GLBDEP)
$(CC) $(GCFLAGS) $(INCLUDES) $< -o $@
-cleanall :
+clean :
rm *.o *.so
Modified: incubator/mod_oorexx/makefile.linux
===================================================================
--- incubator/mod_oorexx/makefile.linux 2009-09-14 03:34:39 UTC (rev 5171)
+++ incubator/mod_oorexx/makefile.linux 2009-09-14 14:49:48 UTC (rev 5172)
@@ -44,7 +44,7 @@
#-------------------------------------------------------------------------------
# If you are using a version of Apache that is provided by a Linux
-# Distributor like RedHat, Mandrake, etc you may need to include the following
+# distribution like RedHat, Mandrake, etc you may need to include the following
# compile options. If Mod_ooRexx crashes when processing a request then try
# recompiling Mod_ooRexx with these compile options.
#SPECPARM = -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
@@ -83,8 +83,6 @@
handlers.o : handlers.cpp $(GLBDEP)
$(CC) -c $(DEFINES) $(INCLUDES) $<
-cleanall :
- rm *.o
+clean :
+ rm *.o *.so
-maintainer-clean : cleanall
- rm *.so
Modified: incubator/mod_oorexx/rspcomp/rspcomp.rex
===================================================================
--- incubator/mod_oorexx/rspcomp/rspcomp.rex 2009-09-14 03:34:39 UTC (rev 5171)
+++ incubator/mod_oorexx/rspcomp/rspcomp.rex 2009-09-14 14:49:48 UTC (rev 5172)
@@ -102,15 +102,15 @@
call console_msg 'Error: No input RSP File specified.'
return 2
end
-rspstream = .stream(rspfilename)
-retc = rpsstream~open('read')
+rspstream = .stream~new(rspfilename)
+retc = rspstream~open('read')
if retc <> 'READY:' then do
call console_msg 'Error: cannot open file' rspfilename
return 3
end
/* open the rex file */
-rexstream = .stream(rexfilename)
+rexstream = .stream~new(rexfilename)
retc = rexstream~open('write replace')
if retc <> 'READY:' then do
call console_msg 'Error: cannot open file' rexfilename
@@ -121,7 +121,7 @@
rsplines = rspstream~arrayin()
rspstream~close()
-/* read in the rsp file and look for the the rsp tags */
+/* read the rsp file and look for the the rsp tags */
state = 0 /* initial state is to output HTML lines */
call Rexx_pgm_header
do rspline over rsplines
@@ -137,7 +137,7 @@
/* process a line from the rsp file */
/*----------------------------------------------------------------------------*/
-process_line: procedure expose state rexfilename
+process_line: procedure expose state rexstream
use strict arg line
uline = line~strip()~upper()
select
@@ -162,7 +162,7 @@
call splitline line
/* see if we are at the end of the HTML document */
if uline~pos('</HTML>') > 0 then do
- /* doing this separates the mainline code from any Rexx */
+ /* doing this seperates the mainline code from any Rexx */
/* subroutines/functions added at the end of the RSP file, */
/* that way we do not just fall into them (a Rexx error). */
call Rexx_pgm_footer
@@ -199,7 +199,7 @@
/* (so Rexx maximum program line length is not exceeded) */
/*----------------------------------------------------------------------------*/
-splitline: procedure expose rexfilename
+splitline: procedure expose rexstream
use strict arg line
do while line~length() > 90
x = line~substr(1, 80)
@@ -249,7 +249,7 @@
rexstream~lineout('Output Rexx Program File Information:')
rexstream~lineout(' Filename:' stream(rexfilename, 'c', 'query exists'))
--rexstream~lineout('')
+rexstream~lineout('')
rexstream~lineout('*/')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|