comparison make/jprt.properties @ 3857:40e5a3f2907e

Merge
author amurillo
date Fri, 29 Jun 2012 17:04:39 -0700
parents 829ee34e7cbd
children d5ec46c7da5c eff5d59db7e1
comparison
equal deleted inserted replaced
49:539e884add48 50:5ed9cec397ec
99 99
100 jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6 100 jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
101 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6 101 jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
102 jprt.my.linux.armvfp.jdk7u6=${jprt.my.linux.armvfp.jdk7} 102 jprt.my.linux.armvfp.jdk7u6=${jprt.my.linux.armvfp.jdk7}
103 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}} 103 jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
104
105 jprt.my.linux.armv6.jdk8=linux_armv6_2.6
106 jprt.my.linux.armv6.jdk7=linux_armv6_2.6
107 jprt.my.linux.armv6.jdk7u6=${jprt.my.linux.armv6.jdk7}
108 jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}}
104 109
105 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6 110 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
106 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6 111 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
107 jprt.my.linux.armsflt.jdk7u6=${jprt.my.linux.armsflt.jdk7} 112 jprt.my.linux.armsflt.jdk7u6=${jprt.my.linux.armsflt.jdk7}
108 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}} 113 jprt.my.linux.armsflt=${jprt.my.linux.armsflt.${jprt.tools.default.release}}
132 ${jprt.my.linux.i586}-{product|fastdebug|debug}, \ 137 ${jprt.my.linux.i586}-{product|fastdebug|debug}, \
133 ${jprt.my.linux.x64}-{product|fastdebug}, \ 138 ${jprt.my.linux.x64}-{product|fastdebug}, \
134 ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \ 139 ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \
135 ${jprt.my.windows.i586}-{product|fastdebug|debug}, \ 140 ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
136 ${jprt.my.windows.x64}-{product|fastdebug|debug}, \ 141 ${jprt.my.windows.x64}-{product|fastdebug|debug}, \
137 ${jprt.my.linux.armvfp}-{product|fastdebug} 142 ${jprt.my.linux.armv6}-{product|fastdebug}
138 143
139 jprt.build.targets.open= \ 144 jprt.build.targets.open= \
140 ${jprt.my.solaris.i586}-{productOpen}, \ 145 ${jprt.my.solaris.i586}-{productOpen}, \
141 ${jprt.my.solaris.x64}-{debugOpen}, \ 146 ${jprt.my.solaris.x64}-{debugOpen}, \
142 ${jprt.my.linux.x64}-{productOpen} 147 ${jprt.my.linux.x64}-{productOpen}