JavaVM.st
branchdevelopment
changeset 2945 98971af93e31
parent 2928 08a14f3553a2
child 2955 55692310d4e6
equal deleted inserted replaced
2944:d0b831020baa 2945:98971af93e31
  1765 
  1765 
  1766     "Created: / 30-10-2011 / 12:04:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  1766     "Created: / 30-10-2011 / 12:04:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  1767 !
  1767 !
  1768 
  1768 
  1769 initializeSystemPropertiesInto: props
  1769 initializeSystemPropertiesInto: props
  1770     | cpu  cpu2  os |
  1770     | cpu  cpu2  os dir |
  1771     "/ use JAVA compatible cpu-name
  1771     "/ use JAVA compatible cpu-name
  1772     cpu := OperatingSystem getCPUType.
  1772     cpu := OperatingSystem getCPUType.
  1773     cpu2 := cpu.
  1773     cpu2 := cpu.
  1774     cpu = 'i386' ifTrue: [ cpu := 'ix86' ].
  1774     cpu = 'i386' ifTrue: [ cpu := 'ix86' ].
  1775     (OperatingSystem getSystemInfo at: #machine) = 'x86_64' ifTrue: [
  1775     (OperatingSystem getSystemInfo at: #machine) = 'x86_64' ifTrue: [
  1908     "/props at:'jws.startcmd'         put:'jws.showwin.mainide'.
  1908     "/props at:'jws.startcmd'         put:'jws.showwin.mainide'.
  1909 "/    props at: 'sun.misc.URLClassPath.debug' put: 'true'.
  1909 "/    props at: 'sun.misc.URLClassPath.debug' put: 'true'.
  1910 
  1910 
  1911     "/ Java tests, sigh..."
  1911     "/ Java tests, sigh..."
  1912 
  1912 
  1913     props at: 'libjava.tests.dir' put: ((Smalltalk getPackageDirectoryForPackage: self package) / 'tests') pathName.
  1913     (dir := Smalltalk getPackageDirectoryForPackage: self package) notNil ifTrue:[
  1914 
  1914         props at: 'libjava.tests.dir' put: (dir / 'tests') pathName.
       
  1915     ].
  1915     ^ props
  1916     ^ props
  1916 
  1917 
  1917     "
  1918     "
  1918      self initializeSystemPropertiesInto:(Dictionary new)"
  1919      self initializeSystemPropertiesInto:(Dictionary new)"
  1919 
  1920 
  1920     "Created: / 03-01-1998 / 14:26:39 / cg"
  1921     "Created: / 03-01-1998 / 14:26:39 / cg"
  1921     "Modified: / 27-01-2000 / 02:20:18 / cg"
  1922     "Modified: / 27-01-2000 / 02:20:18 / cg"
  1922     "Modified (format): / 03-11-2011 / 12:40:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
  1923     "Modified (format): / 03-11-2011 / 12:40:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
  1923     "Modified: / 21-12-2011 / 23:05:11 / jv"
  1924     "Modified: / 21-12-2011 / 23:05:11 / jv"
  1924     "Modified: / 13-09-2012 / 20:33:56 / m"
  1925     "Modified: / 13-09-2012 / 20:33:56 / m"
  1925     "Modified: / 09-01-2013 / 17:11:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  1926     "Modified: / 20-11-2013 / 23:43:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  1926 !
  1927 !
  1927 
  1928 
  1928 initializeVM
  1929 initializeVM
  1929 
  1930 
  1930     OperatingSystem initResources.
  1931     OperatingSystem initResources.