Mercurial > hg > truffle
annotate make/hotspot_version @ 18964:c1f8125b4207
Various adjustments to simplify future merges
Do not keep values in static final fields that can be different in other execution contexts.
Make callRootMethod and callInlinedMethod accessible for subclasses of TruffleCacheImpl.
author | Paul Woegerer <paul.woegerer@oracle.com> |
---|---|
date | Tue, 27 Jan 2015 15:10:32 +0100 |
parents | eaf39a954227 |
children | 7848fc12602b |
rev | line source |
---|---|
0 | 1 # |
17631 | 2 # Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. |
0 | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | |
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 | |
7 # published by the Free Software Foundation. | |
8 # | |
9 # This code is distributed in the hope that it will be useful, but WITHOUT | |
10 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 # version 2 for more details (a copy is included in the LICENSE file that | |
13 # accompanied this code). | |
14 # | |
15 # You should have received a copy of the GNU General Public License version | |
16 # 2 along with this work; if not, write to the Free Software Foundation, | |
17 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 # | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1532
diff
changeset
|
19 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1532
diff
changeset
|
20 # or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1532
diff
changeset
|
21 # questions. |
0 | 22 # |
23 | |
24 # | |
25 # | |
26 | |
27 # | |
28 # Master Hotspot version file. These values may be overridden by a control | |
29 # workspace build. This file format must remain compatible with both | |
30 # GNU Makefile and Microsoft nmake formats. | |
31 # | |
32 | |
33 # Don't put quotes (fail windows build). | |
17631 | 34 HOTSPOT_VM_COPYRIGHT=Copyright 2014 |
0 | 35 |
6724 | 36 HS_MAJOR_VER=25 |
18057
dbcd3fcdba84
8044604: Increment minor version of HSx for 8u25 and initialize the build number
asaha
parents:
17582
diff
changeset
|
37 HS_MINOR_VER=25 |
18098
853a5158a1e2
8055717: Increment hsx 25.25 build to b02 for 8u25-b11
asaha
parents:
18086
diff
changeset
|
38 HS_BUILD_NUMBER=02 |
0 | 39 |
40 JDK_MAJOR_VER=1 | |
3811
8e5d4aa73a8c
7069176: Update the JDK version numbers in Hotspot for JDK 8
trims
parents:
3760
diff
changeset
|
41 JDK_MINOR_VER=8 |
0 | 42 JDK_MICRO_VER=0 |
43 | |
44 # Previous (bootdir) JDK version | |
3811
8e5d4aa73a8c
7069176: Update the JDK version numbers in Hotspot for JDK 8
trims
parents:
3760
diff
changeset
|
45 JDK_PREVIOUS_VERSION=1.7.0 |