Mercurial > hg > truffle
comparison make/hotspot_version @ 7643:3ac7d10a6572
Merge with hsx25/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Thu, 31 Jan 2013 15:42:25 +0100 |
parents | 989155e2d07a 46e60405583b |
children | 5fc51c1ecdeb |
comparison
equal
deleted
inserted
replaced
7573:17b6a63fe7c2 | 7643:3ac7d10a6572 |
---|---|
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. |
29 # workspace build. This file format must remain compatible with both | 29 # workspace build. This file format must remain compatible with both |
30 # GNU Makefile and Microsoft nmake formats. | 30 # GNU Makefile and Microsoft nmake formats. |
31 # | 31 # |
32 | 32 |
33 # Don't put quotes (fail windows build). | 33 # Don't put quotes (fail windows build). |
34 HOTSPOT_VM_COPYRIGHT=Copyright 2012 | 34 HOTSPOT_VM_COPYRIGHT=Copyright 2013 |
35 | 35 |
36 HS_MAJOR_VER=25 | 36 HS_MAJOR_VER=25 |
37 HS_MINOR_VER=0 | 37 HS_MINOR_VER=0 |
38 HS_BUILD_NUMBER=15 | 38 HS_BUILD_NUMBER=17 |
39 | 39 |
40 JDK_MAJOR_VER=1 | 40 JDK_MAJOR_VER=1 |
41 JDK_MINOR_VER=8 | 41 JDK_MINOR_VER=8 |
42 JDK_MICRO_VER=0 | 42 JDK_MICRO_VER=0 |
43 | 43 |