comparison make/jprt.properties @ 17891:b6a2ba7d3ea7 hs25.20-b11

Merge
author amurillo
date Thu, 17 Apr 2014 16:09:07 -0700
parents cb1b723cbca8
children 43aa571c1131
comparison
equal deleted inserted replaced
17862:70dc2c030c69 17891:b6a2ba7d3ea7
74 74
75 jprt.my.linux.ppcv2.jdk8u20=linux_ppcv2_2.6 75 jprt.my.linux.ppcv2.jdk8u20=linux_ppcv2_2.6
76 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6 76 jprt.my.linux.ppcv2.jdk7=linux_ppcv2_2.6
77 jprt.my.linux.ppcv2.jdk7u8=${jprt.my.linux.ppcv2.jdk7} 77 jprt.my.linux.ppcv2.jdk7u8=${jprt.my.linux.ppcv2.jdk7}
78 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}} 78 jprt.my.linux.ppcv2=${jprt.my.linux.ppcv2.${jprt.tools.default.release}}
79
80 jprt.my.linux.ppcsflt.jdk8u20=linux_ppcsflt_2.6
81 jprt.my.linux.ppcsflt.jdk7=linux_ppcsflt_2.6
82 jprt.my.linux.ppcsflt.jdk7u8=${jprt.my.linux.ppcsflt.jdk7}
83 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
84 79
85 jprt.my.linux.armvfpsflt.jdk8u20=linux_armvfpsflt_2.6 80 jprt.my.linux.armvfpsflt.jdk8u20=linux_armvfpsflt_2.6
86 jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}} 81 jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
87 82
88 jprt.my.linux.armvfphflt.jdk8u20=linux_armvfphflt_2.6 83 jprt.my.linux.armvfphflt.jdk8u20=linux_armvfphflt_2.6
133 128
134 jprt.build.targets.embedded= \ 129 jprt.build.targets.embedded= \
135 ${jprt.my.linux.i586}-{productEmb|fastdebugEmb}, \ 130 ${jprt.my.linux.i586}-{productEmb|fastdebugEmb}, \
136 ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \ 131 ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \
137 ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \ 132 ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \
138 ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \
139 ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \ 133 ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \
140 ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}, \ 134 ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}, \
141 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb} 135 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}
142 136
143 jprt.build.targets.all=${jprt.build.targets.standard}, \ 137 jprt.build.targets.all=${jprt.build.targets.standard}, \