Showing the changes to java (3 of 3 files). Show all
Unified · Split
| @@ -1142,10 +1142,17 @@ public final class System { · 1141 unmodified lines | ||
| 1142 | 1142 | setErr0(new PrintStream(new BufferedOutputStream(fdErr, 128), true)); |
| 1143 | 1143 | // Load the zip library now in order to keep java.util.zip.ZipFile |
| 1144 | 1144 | // from trying to use itself to load this library later. |
| 1145 | − loadLibrary("zip"); | |
| 1145 | + // [Inferno] < | |
| 1146 | + // Not really needed now. We have no libraries, no jars, and currently | |
| 1147 | + // can run only converted dis code. | |
| 1148 | + //loadLibrary("zip"); | |
| 1149 | + // [Inferno] > | |
| 1146 | 1150 | |
| 1147 | 1151 | // Setup Java signal handlers for HUP, TERM, and INT (where available). |
| 1148 | − Terminator.setup(); | |
| 1152 | + // [Inferno] < | |
| 1153 | + // No terminators in Inferno | |
| 1154 | + //Terminator.setup(); | |
| 1155 | + // [Inferno] > | |
| 1149 | 1156 | |
| 1150 | 1157 | // Initialize any miscellenous operating system settings that need to be |
| 1151 | 1158 | // set for the class libraries. Currently this is no-op everywhere except |
| @@ -50,6 +50,13 @@ init( jni_p : JNI ) · 49 unmodified lines | ||
| 50 | 50 | #<< |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | +mapLibraryName_rString_rString( p0 : JString) : JString | |
| 54 | +{#>> | |
| 55 | + # TODO: what are libraries in Inferno? | |
| 56 | + # dis files? native modules? .m? | |
| 57 | + return p0; | |
| 58 | +}#<< | |
| 59 | + | |
| 53 | 60 | setIn0_rInputStream_V( p0 : JObject) |
| 54 | 61 | {#>> |
| 55 | 62 | Value : import JNI; |
| @@ -141,6 +148,9 @@ initProperties_rProperties_rProperties( p0 : JObject ) : JObject · 85 unmodified lines | ||
| 141 | 148 | # Default properties |
| 142 | 149 | # TODO: ask Inferno when possible instead of hardcoded values |
| 143 | 150 | properties := array [] of { |
| 151 | + ("java.vm.version", "20.51-b01-457"), #FIXME: write real version here | |
| 152 | + ("java.vm.name", "Inferno's JVM, Sux(?)"), | |
| 153 | + ("java.vm.info", "mixed mode"), | |
| 144 | 154 | ("java.vendor", "Inferno project"), |
| 145 | 155 | ("java.vendor.url", "http://www.vitanuova.com/inferno/"), |
| 146 | 156 | ("java.home", "/java"), |
| @@ -149,6 +159,7 @@ initProperties_rProperties_rProperties( p0 : JObject ) : JObject · 2 unmodified lines | ||
| 149 | 159 | ("os.name", "Inferno OS"), |
| 150 | 160 | ("os.arch", "x86"), |
| 151 | 161 | ("os.version", "4th edition"), |
| 162 | + ("file.encoding", "utf-8"), | |
| 152 | 163 | ("file.separator", "/"), |
| 153 | 164 | ("path.separator", ":"), |
| 154 | 165 | ("line.separator", "\n"), |
| @@ -13,6 +13,7 @@ System_L : module · 12 unmodified lines | ||
| 13 | 13 | setErr0_rPrintStream_V : fn( p0 : JObject); |
| 14 | 14 | currentTimeMillis_J : fn( ) : big; |
| 15 | 15 | arraycopy_rObject_I_rObject_I_I_V : fn( p0 : JObject,p1 : int,p2 : JObject,p3 : int,p4 : int); |
| 16 | + mapLibraryName_rString_rString : fn( p0 : JString) : JString; | |
| 16 | 17 | identityHashCode_rObject_I : fn( p0 : JObject) : int; |
| 17 | 18 | initProperties_rProperties_rProperties : fn( p0 : JObject ) : JObject; |
| 18 | 19 | GetUserName_rString : fn( ) : JString; |