| blob | 9223055b08b7473d87ba0f9ca6552b1decb00c0a |
1 diff -Nru jdk22u-jdk-22-33.orig/make/autoconf/spec.gmk.in jdk22u-jdk-22-33/make/autoconf/spec.gmk.in
2 --- jdk22u-jdk-22-33.orig/make/autoconf/spec.gmk.template 2024-01-22 17:02:33.000000000 +0100
3 +++ jdk22u-jdk-22-33/make/autoconf/spec.gmk.template 2024-01-27 15:45:38.510790947 +0100
4 @@ -826,6 +826,57 @@
6 ####################################################
7 #
8 +# INSTALLATION
9 +#
10 +
11 +# Common prefix for all installed files. Defaults to /usr/local,
12 +# but /opt/myjdk is another common version.
13 +INSTALL_PREFIX = @prefix@
14 +
15 +# Directories containing architecture-dependent files should be relative to exec_prefix
16 +INSTALL_EXECPREFIX = @exec_prefix@
17 +
18 +# java,javac,javap etc are installed here.
19 +INSTALL_BINDIR = @bindir@
20 +
21 +# Read only architecture-independent data
22 +INSTALL_DATADIR = @datadir@
23 +
24 +# Root of above.
25 +INSTALL_DATAROOTDIR = @datarootdir@
26 +
27 +# Doc files, other than info and man.
28 +INSTALL_DOCDIR = @docdir@
29 +
30 +# Html documentation
31 +INSTALL_HTMLDIR = @htmldir@
32 +
33 +# Installing C header files, JNI headers for example.
34 +INSTALL_INCLUDEDIR = @includedir@
35 +
36 +# Installing library files....
37 +INSTALL_INCLUDEDIR = @libdir@
38 +
39 +# Executables that other programs run.
40 +INSTALL_LIBEXECDIR = @libexecdir@
41 +
42 +# Locale-dependent but architecture-independent data, such as message catalogs.
43 +INSTALL_LOCALEDIR = @localedir@
44 +
45 +# Modifiable single-machine data
46 +INSTALL_LOCALSTATEDIR = @localstatedir@
47 +
48 +# Man pages
49 +INSTALL_MANDIR = @mandir@
50 +
51 +# Modifiable architecture-independent data.
52 +INSTALL_SHAREDSTATEDIR = @sharedstatedir@
53 +
54 +# Read-only single-machine data
55 +INSTALL_SYSCONFDIR = @sysconfdir@
56 +
57 +####################################################
58 +#
59 # Libraries
60 #
62 diff -Nru jdk22u-jdk-22-33.orig/make/Global.gmk jdk22u-jdk-22-33/make/Global.gmk
63 --- jdk22u-jdk-22-33.orig/make/Global.gmk 2024-01-22 17:02:33.000000000 +0100
64 +++ jdk22u-jdk-22-33/make/Global.gmk 2024-01-27 15:45:38.509506235 +0100
65 @@ -1,5 +1,5 @@
66 #
67 -# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
68 +# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
69 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
70 #
71 # This code is free software; you can redistribute it and/or modify it
72 @@ -52,6 +52,7 @@
73 $(info $(_) make docs # Create all docs)
74 $(info $(_) make docs-jdk-api # Create just JDK javadocs)
75 $(info $(_) make bootcycle-images # Build images twice, second time with newly built JDK)
76 + $(info $(_) make install # Install the generated images locally)
77 $(info $(_) make check # Run basic testing (currently tier1))
78 $(info $(_) make test-<test> # Run test, e.g. test-tier1)
79 $(info $(_) make test TEST=<t> # Run test(s) given by TEST specification)
80 diff -Nru jdk22u-jdk-22-33.orig/make/Install.gmk jdk22u-jdk-22-33/make/Install.gmk
81 --- jdk22u-jdk-22-33.orig/make/Install.gmk 1970-01-01 01:00:00.000000000 +0100
82 +++ jdk22u-jdk-22-33/make/Install.gmk 2024-01-27 15:45:38.509708752 +0100
83 @@ -0,0 +1,43 @@
84 +#
85 +# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
86 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
87 +#
88 +# This code is free software; you can redistribute it and/or modify it
89 +# under the terms of the GNU General Public License version 2 only, as
90 +# published by the Free Software Foundation. Oracle designates this
91 +# particular file as subject to the "Classpath" exception as provided
92 +# by Oracle in the LICENSE file that accompanied this code.
93 +#
94 +# This code is distributed in the hope that it will be useful, but WITHOUT
95 +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
96 +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
97 +# version 2 for more details (a copy is included in the LICENSE file that
98 +# accompanied this code).
99 +#
100 +# You should have received a copy of the GNU General Public License version
101 +# 2 along with this work; if not, write to the Free Software Foundation,
102 +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
103 +#
104 +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
105 +# or visit www.oracle.com if you need additional information or have any
106 +# questions.
107 +#
108 +
109 +default: install
110 +
111 +include $(SPEC)
112 +
113 +BINARIES := $(notdir $(wildcard $(JDK_IMAGE_DIR)/bin/*))
114 +INSTALLDIR := openjdk-$(VERSION_SHORT)
115 +
116 +# Install the jdk image, in a very crude way. Not taking into
117 +# account, how to install properly on macosx or windows etc.
118 +install:
119 + echo Installing jdk image into $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
120 + echo and creating $(words $(BINARIES)) links from $(INSTALL_PREFIX)/bin into the jdk.
121 + $(MKDIR) -p $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
122 + $(RM) -r $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/*
123 + $(CP) -rp $(JDK_IMAGE_DIR)/* $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)
124 + $(MKDIR) -p $(INSTALL_PREFIX)/bin
125 + $(RM) $(addprefix $(INSTALL_PREFIX)/bin/, $(BINARIES))
126 + $(foreach b, $(BINARIES), $(LN) -s $(INSTALL_PREFIX)/jvm/$(INSTALLDIR)/bin/$b $(INSTALL_PREFIX)/bin/$b &&) true
127 diff -Nru jdk22u-jdk-22-33.orig/make/Main.gmk jdk22u-jdk-22-33/make/Main.gmk
128 --- jdk22u-jdk-22-33.orig/make/Main.gmk 2024-01-22 17:02:33.000000000 +0100
129 +++ jdk22u-jdk-22-33/make/Main.gmk 2024-01-27 15:45:38.510344411 +0100
130 @@ -867,6 +867,14 @@
131 endif
133 ################################################################################
134 +# Install targets
135 +
136 +$(eval $(call SetupTarget, install, \
137 + MAKEFILE := Install, \
138 + DEPS := product-images, \
139 +))
140 +
141 +################################################################################
142 #
143 # Dependency declarations between targets.
144 #