Mercurial > hg > truffle
changeset 6690:a14a452cf154
Automated merge with https://lafo.ssw.uni-linz.ac.at/hg/graalvm
| author | Laurent Daynes <Laurent.Daynes@oracle.com> |
|---|---|
| date | Fri, 09 Nov 2012 13:35:26 +0100 |
| parents | 363968be1018 (current diff) 7e77e6359cde (diff) |
| children | 9611d0ccb4ec |
| files | |
| diffstat | 3 files changed, 69 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/solaris/makefiles/mapfile-vers-GRAAL Fri Nov 09 13:35:26 2012 +0100 @@ -0,0 +1,30 @@ +# + +# +# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# +# + +# Define public interface. +SUNWprivate_1.1 { + global: +};
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/make/solaris/makefiles/mapfile-vers-graal Fri Nov 09 13:35:26 2012 +0100 @@ -0,0 +1,32 @@ +# + +# +# Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# +# + +# Define public interface. +SUNWprivate_1.1 { + global: + # GRAAL JVM + JVM_InitializeGraalRuntime; +};
--- a/mx/commands.py Thu Nov 08 18:19:31 2012 +0100 +++ b/mx/commands.py Fri Nov 09 13:35:26 2012 +0100 @@ -348,6 +348,9 @@ lines.append(line) assert defaultVM is not None, 'Could not find default VM in ' + jvmCfg + if mx.get_os() != 'windows': + os.chmod(_vmLibDirInJdk(jdk), 0755) + os.chmod(jvmCfg, 0755) shutil.copytree(join(_vmLibDirInJdk(jdk), defaultVM), join(_vmLibDirInJdk(jdk), defaultVM + '0')) with open(jvmCfg, 'w') as f: @@ -461,6 +464,8 @@ vmDir = join(_vmLibDirInJdk(jdk), vm) if not exists(vmDir): + if mx.get_os() != 'windows': + os.chmod(_vmLibDirInJdk(jdk), 0755) mx.log('Creating VM directory in JDK7: ' + vmDir) os.makedirs(vmDir) @@ -565,6 +570,8 @@ if not found: mx.log('Appending "' + prefix + ' KNOWN" to ' + jvmCfg) lines.append(vmKnown) + if mx.get_os() != 'windows': + os.chmod(jvmCfg, 0755) with open(jvmCfg, 'w') as f: for line in lines: f.write(line)