Menu
▾
▴
[Bsf4oorexx-svn] SF.net SVN: bsf4oorexx:[193] trunk
|
From: <or...@us...> - 2014-04-10 09:44:54
|
Revision: 193
http://sourceforge.net/p/bsf4oorexx/code/193
Author: orexx
Date: 2014-04-10 09:44:51 +0000 (Thu, 10 Apr 2014)
Log Message:
-----------
20140410 Update ScriptProviderForooRexx files.
Modified Paths:
--------------
trunk/ScriptProviderForooRexx-source.jar
trunk/ScriptProviderForooRexx.jar
trunk/ScriptProviderForooRexx.oxt
trunk/bsf4oorexx.dev/ScriptProviderForooRexxPackage/description.xml
trunk/bsf4oorexx.dev/source_cc/32/BSF4ooRexx.dll
trunk/com/sun/star/script/framework/provider/oorexx/ScriptImpl.class
trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx$_ScriptProviderForooRexx.class
trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx.class
trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx.java
trunk/com/sun/star/script/framework/provider/oorexx/ScriptSourceModel.class
trunk/createDistributionForBSF4ooRexx4.cmd
Added Paths:
-----------
trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx$1.class
Modified: trunk/ScriptProviderForooRexx-source.jar
===================================================================
(Binary files differ)
Modified: trunk/ScriptProviderForooRexx.jar
===================================================================
(Binary files differ)
Modified: trunk/ScriptProviderForooRexx.oxt
===================================================================
(Binary files differ)
Modified: trunk/bsf4oorexx.dev/ScriptProviderForooRexxPackage/description.xml
===================================================================
--- trunk/bsf4oorexx.dev/ScriptProviderForooRexxPackage/description.xml 2014-04-06 14:14:59 UTC (rev 192)
+++ trunk/bsf4oorexx.dev/ScriptProviderForooRexxPackage/description.xml 2014-04-10 09:44:51 UTC (rev 193)
@@ -3,7 +3,7 @@
xmlns:d="http://openoffice.org/extensions/description/2006"
xmlns:xlink="http://www.w3.org/1999/xlink">
- <version value="450.20140404"/>
+ <version value="450.20140408"/>
<identifier value="org.oorexx.uno.ScriptProviderForooRexx.package"/>
Modified: trunk/bsf4oorexx.dev/source_cc/32/BSF4ooRexx.dll
===================================================================
(Binary files differ)
Modified: trunk/com/sun/star/script/framework/provider/oorexx/ScriptImpl.class
===================================================================
(Binary files differ)
Added: trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx$1.class
===================================================================
(Binary files differ)
Index: trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx$1.class
===================================================================
--- trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx$1.class 2014-04-06 14:14:59 UTC (rev 192)
+++ trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx$1.class 2014-04-10 09:44:51 UTC (rev 193)
Property changes on: trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx$1.class
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+application/x-java-applet
\ No newline at end of property
Modified: trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx$_ScriptProviderForooRexx.class
===================================================================
(Binary files differ)
Modified: trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx.class
===================================================================
(Binary files differ)
Modified: trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx.java
===================================================================
--- trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx.java 2014-04-06 14:14:59 UTC (rev 192)
+++ trunk/com/sun/star/script/framework/provider/oorexx/ScriptProviderForooRexx.java 2014-04-10 09:44:51 UTC (rev 193)
@@ -176,10 +176,10 @@
field, such that the compiler can remove dependent code if flag is set
to false), which uses popups and copies exception data to the clipboard
- 2014-04-02, ---rgf
- - add code in getBSFManager() to cater for a stupid error in MacOSX AOO 4.0.x and 4.1.
- (process environment not set, so PATH missing, such that ooRexx cannot be
- initialized at all)
+ 2014-04-08, ---rgf
+ - add code in getBSFManager() to cater for a stupid error in MacOSX AOO 4.0.x
+ (process environment not set correctly, so PATH missing, such that ooRexx cannot
+ be initialized at all)
*/
@@ -267,7 +267,7 @@
static final String OOREXX_XSCRIPTCONTEXT_KEY = "OOo.xScriptContext";
static final String OOREXX_VERSION_KEY = "OOo.ooRexxScriptProvider.version";
- static final String OOREXX_VERSION_VALUE = "109.20140330"; // 20070921
+ static final String OOREXX_VERSION_VALUE = "109.20140408"; // 20070921
static final String OOREXX_FILENAME = "OOo.fileName"; // 20070920
static final String OOREXX_SCRIPTMETADATA = "OOo.ScriptMetaData"; // 20070920
@@ -306,11 +306,10 @@
bsfManager=new BSFManager(); // create a new BSFManager for dispatching ooRexx scripts
// make sure that on AOO for MacOSX, PATH is set (maybe even PWD);
- // AOO 4.0.x and possibly AOO 4.1.x do not set environment correctly due to using outdated putenv() on MacOSX
- // supply default values, such that the ooRexx interpreter can start
+ // AOO 4.0.x does not set environment correctly due to using outdated putenv() on MacOSX
+ // supply default value for PATH, such that the ooRexx interpreter can start
if (System.getenv("PATH")==null) // PATH not set, we have a serious problem (ooRexx cannot initialize!)
{
-
if (System.getProperty("os.name").charAt(0)=='M') // on MacOSX
{
final int GETENV=1;
@@ -340,66 +339,36 @@
}
else // raise an error, hinting at the problem!
{
- bsfManager=null; // make sure we nullify
- throw new BSFException("\"PATH\" environment variable not set, ooRexx cannot be fully initialized, aborting!");
- }
+ if (bDebug==true) // 20140407, rgf
+ {
+ String str="";
+ Map<String, String> env = System.getenv();
+ for (String envName : env.keySet()) {
+ str=str+String.format(" %s=%s%n",
+ envName,
+ env.get(envName));
+ }
+ String s="ScriptProviderForooRexx.getBSFManager(...), ) PATH not set, about to throw BSFException()\nprocess environment:\n"+str;
+ s=s+"\n--- using JNI to fetch PATH and PWD:\n";
-/* ---> 2014-03-27, --rgf: throw exception, if PATH not set as ooRexx cannot initialize, but crashes!
- // probably MacOSX, but let us make that sure
- if (System.getProperty("os.name").charAt(0)=='M')
- {
- // does not work as no "setenv()"
- // System.setenv("PATH", "/usr/bin:/bin:/user/sbin:/sbin:/usr/local/bin");
+ final int GETENV=1;
+ org.rexxla.bsf.engines.rexx.RexxEngine re = (RexxEngine) bsfManager.loadScriptingEngine("rexx");
+ s=s+"\tPATH=["+re.procEnvironment(GETENV,"PATH",null)+"]\n"
+ +"\tPWD =["+re.procEnvironment(GETENV,"PWD",null)+"]";
- // supply default paths
- Hashtable<String,String> ht=new Hashtable<String,String>();
- ht.putAll(System.getenv());
-
- ht.put("PATH","/usr/bin:/bin:/user/sbin:/sbin:/usr/local/bin");
- ht.put("PWD", System.getProperty("user.dir"));
- setEnv((Map<String,String>) ht);
-
- // although works on Java, ooRexx does not get to see the newly added
- // environment variables :-(
-
-
- if (bDebug==true) // 2014-03-24, rgf
- {
- String s="ScriptProviderForooRexx.getBSFManager(...), MacOSX, PATH now: \""+System.getenv("PATH")+"\""+
- ", \"PWD\" now: \""+System.getenv("PWD")+"\"";
- ;
ScriptImpl.copy2clipboard(s);
ScriptImpl.showErrorMessage(s);
}
- }
- else
- {
bsfManager=null; // make sure we nullify
throw new BSFException("\"PATH\" environment variable not set, ooRexx cannot be fully initialized, aborting!");
}
-<--- */
-
-
-
}
- if (bDebug==true) // 2014-03-24, rgf
+ if (bDebug==true) // 20140407, rgf
{
- String s="ScriptProviderForooRexx.getBSFManager(...), after trying to create a new BSFManager: ["+bsfManager+"] !";
- ScriptImpl.copy2clipboard(s);
- ScriptImpl.showErrorMessage(s);
- }
-
- org.apache.bsf.BSFEngine eng=bsfManager.loadScriptingEngine("rexx");
- if (bDebug==true) // 2014-03-24, rgf
- {
- String s="ScriptProviderForooRexx.getBSFManager(...), after trying to load rexx engine: ["+eng+"] !";
- ScriptImpl.copy2clipboard(s);
- ScriptImpl.showErrorMessage(s);
-
String str="";
Map<String, String> env = System.getenv();
for (String envName : env.keySet()) {
@@ -408,10 +377,18 @@
env.get(envName));
}
- s="ScriptProviderForooRexx.getBSFManager(...), process environment:\n"+str;
+ String s="ScriptProviderForooRexx.getBSFManager(...), new BSFManager=["+bsfManager+"], before \".loadScriptingEngine(\"rexx\")\"\nprocess environment:\n"+str;
ScriptImpl.copy2clipboard(s);
ScriptImpl.showErrorMessage(s);
+ }
+ org.apache.bsf.BSFEngine eng=bsfManager.loadScriptingEngine("rexx");
+
+ if (bDebug==true) // 2014-03-24, rgf
+ {
+ String s="ScriptProviderForooRexx.getBSFManager(...), after trying to load rexx engine: ["+eng+"] !";
+ ScriptImpl.copy2clipboard(s);
+ ScriptImpl.showErrorMessage(s);
}
Modified: trunk/com/sun/star/script/framework/provider/oorexx/ScriptSourceModel.class
===================================================================
(Binary files differ)
Modified: trunk/createDistributionForBSF4ooRexx4.cmd
===================================================================
--- trunk/createDistributionForBSF4ooRexx4.cmd 2014-04-06 14:14:59 UTC (rev 192)
+++ trunk/createDistributionForBSF4ooRexx4.cmd 2014-04-10 09:44:51 UTC (rev 193)
@@ -24,8 +24,8 @@
-set runDate=20140404
-set doc_date=2014-04-04
+set runDate=20140410
+set doc_date=2014-04-10
@rem values to use for creating the BSF jarfile
@rem set bsfDate=20090910
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|