Mercurial > hg > truffle
comparison make/jprt.properties @ 17474:6fa574bfd32a
Merge
author | chegar |
---|---|
date | Thu, 03 Oct 2013 19:13:12 +0100 |
parents | c81dd5393a5e |
children | 384c92148c68 |
comparison
equal
deleted
inserted
replaced
17473:9b4ce069642e | 17474:6fa574bfd32a |
---|---|
118 jprt.my.macosx.x64.jdk8=macosx_x64_10.7 | 118 jprt.my.macosx.x64.jdk8=macosx_x64_10.7 |
119 jprt.my.macosx.x64.jdk7=macosx_x64_10.7 | 119 jprt.my.macosx.x64.jdk7=macosx_x64_10.7 |
120 jprt.my.macosx.x64.jdk7u8=${jprt.my.macosx.x64.jdk7} | 120 jprt.my.macosx.x64.jdk7u8=${jprt.my.macosx.x64.jdk7} |
121 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} | 121 jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} |
122 | 122 |
123 jprt.my.windows.i586.jdk8=windows_i586_5.1 | 123 jprt.my.windows.i586.jdk8=windows_i586_6.1 |
124 jprt.my.windows.i586.jdk7=windows_i586_5.1 | 124 jprt.my.windows.i586.jdk7=windows_i586_6.1 |
125 jprt.my.windows.i586.jdk7u8=${jprt.my.windows.i586.jdk7} | 125 jprt.my.windows.i586.jdk7u8=${jprt.my.windows.i586.jdk7} |
126 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} | 126 jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} |
127 | 127 |
128 jprt.my.windows.x64.jdk8=windows_x64_5.2 | 128 jprt.my.windows.x64.jdk8=windows_x64_6.1 |
129 jprt.my.windows.x64.jdk7=windows_x64_5.2 | 129 jprt.my.windows.x64.jdk7=windows_x64_6.1 |
130 jprt.my.windows.x64.jdk7u8=${jprt.my.windows.x64.jdk7} | 130 jprt.my.windows.x64.jdk7u8=${jprt.my.windows.x64.jdk7} |
131 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}} | 131 jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}} |
132 | 132 |
133 # Standard list of jprt build targets for this source tree | 133 # Standard list of jprt build targets for this source tree |
134 | 134 |