Mercurial > hg > truffle
comparison make/jprt.properties @ 9212:216dce75d5ac
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 08 Apr 2013 17:02:55 +0200 |
parents | 3be6a41ad358 |
children | f36e073d56a4 |
comparison
equal
deleted
inserted
replaced
9211:77c17c97f713 | 9212:216dce75d5ac |
---|---|
1 # | 1 # |
2 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
95 jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6 | 95 jprt.my.linux.ppcsflt.jdk8=linux_ppcsflt_2.6 |
96 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6 | 96 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6 |
97 jprt.my.linux.ppcsflt.jdk7u8=${jprt.my.linux.ppcsflt.jdk7} | 97 jprt.my.linux.ppcsflt.jdk7u8=${jprt.my.linux.ppcsflt.jdk7} |
98 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}} | 98 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}} |
99 | 99 |
100 jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6 | 100 jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6 |
101 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6 | 101 jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}} |
102 jprt.my.linux.armvfp.jdk7u8=${jprt.my.linux.armvfp.jdk7} | 102 |
103 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}} | 103 jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6 |
104 | 104 jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}} |
105 jprt.my.linux.armv6.jdk8=linux_armv6_2.6 | 105 |
106 jprt.my.linux.armv6.jdk7=linux_armv6_2.6 | 106 # The ARM GP vfp-sflt build is not currently supported |
107 jprt.my.linux.armv6.jdk7u8=${jprt.my.linux.armv6.jdk7} | 107 #jprt.my.linux.armvs.jdk8=linux_armvs_2.6 |
108 jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}} | 108 #jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}} |
109 | |
110 jprt.my.linux.armvh.jdk8=linux_armvh_2.6 | |
111 jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}} | |
109 | 112 |
110 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6 | 113 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6 |
111 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 | 114 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 |
112 jprt.my.linux.armsflt.jdk7u8=${jprt.my.linux.armsflt.jdk7} | 115 jprt.my.linux.armsflt.jdk7u8=${jprt.my.linux.armsflt.jdk7} |
113 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} | 116 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} |
137 ${jprt.my.linux.i586}-{product|fastdebug|debug}, \ | 140 ${jprt.my.linux.i586}-{product|fastdebug|debug}, \ |
138 ${jprt.my.linux.x64}-{product|fastdebug}, \ | 141 ${jprt.my.linux.x64}-{product|fastdebug}, \ |
139 ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \ | 142 ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \ |
140 ${jprt.my.windows.i586}-{product|fastdebug|debug}, \ | 143 ${jprt.my.windows.i586}-{product|fastdebug|debug}, \ |
141 ${jprt.my.windows.x64}-{product|fastdebug|debug}, \ | 144 ${jprt.my.windows.x64}-{product|fastdebug|debug}, \ |
142 ${jprt.my.linux.armv6}-{product|fastdebug} | 145 ${jprt.my.linux.armvh}-{product|fastdebug} |
143 | 146 |
144 jprt.build.targets.open= \ | 147 jprt.build.targets.open= \ |
145 ${jprt.my.solaris.i586}-{productOpen}, \ | 148 ${jprt.my.solaris.i586}-{productOpen}, \ |
146 ${jprt.my.solaris.x64}-{debugOpen}, \ | 149 ${jprt.my.solaris.x64}-{debugOpen}, \ |
147 ${jprt.my.linux.x64}-{productOpen} | 150 ${jprt.my.linux.x64}-{productOpen} |
149 jprt.build.targets.embedded= \ | 152 jprt.build.targets.embedded= \ |
150 ${jprt.my.linux.i586}-{productEmb|fastdebugEmb|debugEmb}, \ | 153 ${jprt.my.linux.i586}-{productEmb|fastdebugEmb|debugEmb}, \ |
151 ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \ | 154 ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \ |
152 ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \ | 155 ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \ |
153 ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \ | 156 ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \ |
154 ${jprt.my.linux.armvfp}-{productEmb|fastdebugEmb}, \ | 157 ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \ |
158 ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}, \ | |
155 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb} | 159 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb} |
156 | 160 |
157 jprt.build.targets.all=${jprt.build.targets.standard}, \ | 161 jprt.build.targets.all=${jprt.build.targets.standard}, \ |
158 ${jprt.build.targets.embedded}, ${jprt.build.targets.open} | 162 ${jprt.build.targets.embedded}, ${jprt.build.targets.open} |
159 | 163 |