[Bsf4oorexx-svn] SF.net SVN: bsf4oorexx:[11] trunk/bsf4oorexx.dev

[<or...@us...>]

Revision: 11
          http://bsf4oorexx.svn.sourceforge.net/bsf4oorexx/?rev=11&view=rev
Author:   orexx
Date:     2011-04-21 20:02:27 +0000 (Thu, 21 Apr 2011)

Log Message:
-----------
Adapt to 64-bit Windows, if running 32-bit Rexx.

Modified Paths:
--------------
    trunk/bsf4oorexx.dev/bin/BSF.CLS
    trunk/bsf4oorexx.dev/install/setupBSF.rex

Modified: trunk/bsf4oorexx.dev/bin/BSF.CLS
===================================================================
--- trunk/bsf4oorexx.dev/bin/BSF.CLS	2011-04-17 10:05:36 UTC (rev 10)
+++ trunk/bsf4oorexx.dev/bin/BSF.CLS	2011-04-21 20:02:27 UTC (rev 11)
@@ -403,7 +403,7 @@
 
    call initialize.BSF.dir          -- set up .bsf4rexx and its synonym .b4r
 
-   .bsf4rexx~version="406.20110410" -- set version
+   .bsf4rexx~version="406.20110421" -- set version
    .bsf4rexx~opSys  =opsys          -- save operating system name as supplied by Rexx' PARSE SOURCE
    .bsf4rexx~opSys1 =opsys~left(1)~upper  -- save operating system name's initial letter in uppercase
    .bsf4rexx~opSys2 =opsys~left(2)~upper  -- save operating system name's first two letters in uppercase

Modified: trunk/bsf4oorexx.dev/install/setupBSF.rex
===================================================================
--- trunk/bsf4oorexx.dev/install/setupBSF.rex	2011-04-17 10:05:36 UTC (rev 10)
+++ trunk/bsf4oorexx.dev/install/setupBSF.rex	2011-04-21 20:02:27 UTC (rev 11)
@@ -5,9 +5,11 @@
             without any knowledge about Java installation issues)
    Author:  Rony G. Flatscher
    Date:    2006-01-07
-   Version: 1.22
+   Version: 1.23
    Changed:
 
+            2011-04-21, ---rgf, - Windows: adjust for 64-bit behaviour, if Rexx is 32-bit (needing 32-bit Java): 
+                                           generated batch files need to refer to %windir%\SysWOW64\java.exe
             2011-03-27, ---rgf, - Linux: now executing separate 'xdg_icons_menu_add-remove.sh'
             2011-03-26, ---rgf, - Linux: do not call xdg_menu_*.sh as menus are handled in the fileAssociation scripts
             2011-03-21, ---rgf, - Linux: link "libjvm.so" symbolically to "/opt/BSF4ooRexx", such
@@ -427,9 +429,27 @@
    cmd.eLibDir=cmd.eBinDir
    cmd.eQuote='"'                /* always quote file names for Windows    */
    cmd.eAllArguments='%*'
+
    if cmd.eJavaBinary="" then
-      cmd.eJavaBinary=qw(getFromPath("java.exe"))   /* get fully qualified path   */
+   do
+      /* check whether running 32-bit on a 64-bit Windows; if so adapt accordingly */
+      if value("processor_architeW6432",,"environment")<>"" then
+      do
+         windir=value("windir",,"environment")
+         wow64 =windir"\SysWOW64\java.exe"
+         win32 =windir"\system32\java.exe"
 
+         if sysfileexists(wow64) then
+             cmd.eJavaBinary=qw(wow64)
+         else if sysfileexists(win32) then 
+             cmd.eJavaBinary=qw(win32)
+      end
+
+      if cmd.eJavaBinary="" then
+         cmd.eJavaBinary=qw(getFromPath("java.exe"))   /* get fully qualified path   */
+   end
+
+
    if isRexxInstalledInHKCU() then  -- ooRexx in user hive (HKCU: current user)
    do
       cmd.eRegistryPath     ="HKCU\Environment\Path"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.