Skip to content

Commit 26e7ef7

Browse files
author
Andy Herrick
committed
8252870: Finalize (remove "incubator" from) jpackage
Reviewed-by: kcr, erikj, almatvee, asemenyuk, prr, ihse
1 parent 804bd72 commit 26e7ef7

File tree

251 files changed

+396
-405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

251 files changed

+396
-405
lines changed

‎make/CompileJavaModules.gmk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,11 +385,11 @@ endif
385385

386386
################################################################################
387387

388-
jdk.incubator.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \
388+
jdk.jpackage_COPY += .gif .png .txt .spec .script .prerm .preinst \
389389
.postrm .postinst .list .sh .desktop .copyright .control .plist .template \
390390
.icns .scpt .wxs .wxl .wxi .ico .bmp .tiff
391391

392-
jdk.incubator.jpackage_CLEAN += .properties
392+
jdk.jpackage_CLEAN += .properties
393393

394394
################################################################################
395395

‎make/common/Modules.gmk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ endif
125125

126126
JRE_TOOL_MODULES += \
127127
jdk.jdwp.agent \
128-
jdk.incubator.jpackage \
128+
jdk.jpackage \
129129
#
130130

131131
################################################################################
@@ -145,7 +145,7 @@ DOCS_MODULES += \
145145
jdk.editpad \
146146
jdk.hotspot.agent \
147147
jdk.httpserver \
148-
jdk.incubator.jpackage \
148+
jdk.jpackage \
149149
jdk.incubator.vector \
150150
jdk.jartool \
151151
jdk.javadoc \
@@ -228,7 +228,7 @@ endif
228228
# jpackage is only on windows, macosx, and linux
229229

230230
ifeq ($(call isTargetOs, windows macosx linux), false)
231-
MODULES_FILTER += jdk.incubator.jpackage
231+
MODULES_FILTER += jdk.jpackage
232232
endif
233233

234234
################################################################################

‎make/modules/jdk.incubator.jpackage/Gensrc.gmk‎ renamed to ‎make/modules/jdk.jpackage/Gensrc.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ include GensrcCommonJdk.gmk
3131
ifeq ($(call isTargetOs, macosx), true)
3232
ENTITLEMENTS_SRC_FILE := $(TOPDIR)/make/data/macosxsigning/java.plist
3333
ENTITLEMENTS_TARGET_FILE := \
34-
$(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/jdk/incubator/jpackage/internal/resources/entitlements.plist
34+
$(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/jdk/jpackage/internal/resources/entitlements.plist
3535

3636
$(ENTITLEMENTS_TARGET_FILE): $(ENTITLEMENTS_SRC_FILE)
3737
$(call install-file)

‎make/modules/jdk.incubator.jpackage/Launcher.gmk‎ renamed to ‎make/modules/jdk.jpackage/Launcher.gmk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
include LauncherCommon.gmk
2727

2828
$(eval $(call SetupBuildLauncher, jpackage, \
29-
MAIN_CLASS := jdk.incubator.jpackage.main.Main, \
29+
MAIN_CLASS := jdk.jpackage.main.Main, \
3030
))

‎make/modules/jdk.incubator.jpackage/Lib.gmk‎ renamed to ‎make/modules/jdk.jpackage/Lib.gmk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ include LibCommon.gmk
2929

3030

3131
JPACKAGE_APPLAUNCHER_SRC := \
32-
$(call FindSrcDirsForComponent, jdk.incubator.jpackage, applauncher) \
33-
$(call FindSrcDirsForComponent, jdk.incubator.jpackage, common)
32+
$(call FindSrcDirsForComponent, jdk.jpackage, applauncher) \
33+
$(call FindSrcDirsForComponent, jdk.jpackage, common)
3434

3535

3636
ifeq ($(call isTargetOs, windows), true)
@@ -42,7 +42,7 @@ else
4242
endif
4343

4444

45-
JPACKAGE_OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/incubator/jpackage/internal/resources
45+
JPACKAGE_OUTPUT_DIR := $(JDK_OUTPUTDIR)/modules/$(MODULE)/jdk/jpackage/internal/resources
4646
JPACKAGE_CXXFLAGS_windows := -EHsc -DUNICODE -D_UNICODE
4747

4848
# Output app launcher executable in resources dir, and symbols in the object dir
@@ -73,7 +73,7 @@ ifeq ($(call isTargetOs, windows), true)
7373
$(eval $(call SetupJdkLibrary, BUILD_LIB_JPACKAGE, \
7474
NAME := jpackage, \
7575
OPTIMIZATION := LOW, \
76-
EXTRA_SRC := jdk.incubator.jpackage:common, \
76+
EXTRA_SRC := jdk.jpackage:common, \
7777
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JPACKAGE_CXXFLAGS_windows), \
7878
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
7979
$(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -99,8 +99,8 @@ ifeq ($(call isTargetOs, windows), true)
9999
TARGETS += $(BUILD_LIB_WIXHELPER)
100100

101101
JPACKAGE_MSIWRAPPER_SRC := \
102-
$(call FindSrcDirsForComponent, jdk.incubator.jpackage, msiwrapper) \
103-
$(call FindSrcDirsForComponent, jdk.incubator.jpackage, common)
102+
$(call FindSrcDirsForComponent, jdk.jpackage, msiwrapper) \
103+
$(call FindSrcDirsForComponent, jdk.jpackage, common)
104104

105105
# Build exe installer wrapper for msi installer
106106
$(eval $(call SetupJdkExecutable, BUILD_JPACKAGE_MSIWRAPPER, \

‎make/scripts/compare.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ compare_bin_file() {
696696
# pdb files.
697697
PDB_DIRS="$(ls -d \
698698
{$OTHER,$THIS}/support/modules_{cmds,libs}/{*,*/*} \
699-
{$OTHER,$THIS}/support/native/jdk.incubator.jpackage/* \
699+
{$OTHER,$THIS}/support/native/jdk.jpackage/* \
700700
)"
701701
export _NT_SYMBOL_PATH="$(echo $PDB_DIRS | tr ' ' ';')"
702702
fi

‎src/java.base/share/classes/module-info.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
jdk.jartool,
210210
jdk.jfr,
211211
jdk.jlink,
212-
jdk.incubator.jpackage;
212+
jdk.jpackage;
213213
exports jdk.internal.perf to
214214
java.management,
215215
jdk.management.agent,

‎src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/DesktopIntegration.java‎ renamed to ‎src/jdk.jpackage/linux/classes/jdk/jpackage/internal/DesktopIntegration.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* or visit www.oracle.com if you need additional information or have any
2323
* questions.
2424
*/
25-
package jdk.incubator.jpackage.internal;
25+
package jdk.jpackage.internal;
2626

2727
import java.awt.image.BufferedImage;
2828
import java.io.BufferedReader;
@@ -46,16 +46,16 @@
4646
import javax.imageio.ImageIO;
4747
import javax.xml.stream.XMLStreamException;
4848
import javax.xml.stream.XMLStreamWriter;
49-
import jdk.incubator.jpackage.internal.Arguments.CLIOptions;
50-
import static jdk.incubator.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON;
51-
import static jdk.incubator.jpackage.internal.LinuxAppImageBuilder.ICON_PNG;
52-
import static jdk.incubator.jpackage.internal.OverridableResource.createResource;
53-
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
54-
import static jdk.incubator.jpackage.internal.StandardBundlerParam.APP_NAME;
55-
import static jdk.incubator.jpackage.internal.StandardBundlerParam.DESCRIPTION;
56-
import static jdk.incubator.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
57-
import static jdk.incubator.jpackage.internal.StandardBundlerParam.ICON;
58-
import static jdk.incubator.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
49+
import jdk.jpackage.internal.Arguments.CLIOptions;
50+
import static jdk.jpackage.internal.LinuxAppImageBuilder.DEFAULT_ICON;
51+
import static jdk.jpackage.internal.LinuxAppImageBuilder.ICON_PNG;
52+
import static jdk.jpackage.internal.OverridableResource.createResource;
53+
import static jdk.jpackage.internal.StandardBundlerParam.ADD_LAUNCHERS;
54+
import static jdk.jpackage.internal.StandardBundlerParam.APP_NAME;
55+
import static jdk.jpackage.internal.StandardBundlerParam.DESCRIPTION;
56+
import static jdk.jpackage.internal.StandardBundlerParam.FILE_ASSOCIATIONS;
57+
import static jdk.jpackage.internal.StandardBundlerParam.ICON;
58+
import static jdk.jpackage.internal.StandardBundlerParam.PREDEFINED_APP_IMAGE;
5959

6060
/**
6161
* Helper to create files for desktop integration.

‎src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LibProvidersLookup.java‎ renamed to ‎src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LibProvidersLookup.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* or visit www.oracle.com if you need additional information or have any
2323
* questions.
2424
*/
25-
package jdk.incubator.jpackage.internal;
25+
package jdk.jpackage.internal;
2626

2727
import java.io.IOException;
2828
import java.nio.file.Files;
@@ -153,17 +153,17 @@ public interface PackageLookup {
153153
//
154154
// Typical ldd output:
155155
//
156-
// ldd: warning: you do not have execution permission for `/tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt_headless.so'
156+
// ldd: warning: you do not have execution permission for `/tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt_headless.so'
157157
// linux-vdso.so.1 => (0x00007ffce6bfd000)
158-
// libawt.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt.so (0x00007f4e00c75000)
158+
// libawt.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libawt.so (0x00007f4e00c75000)
159159
// libjvm.so => not found
160-
// libjava.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libjava.so (0x00007f4e00c41000)
160+
// libjava.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libjava.so (0x00007f4e00c41000)
161161
// libm.so.6 => /lib64/libm.so.6 (0x00007f4e00834000)
162162
// libdl.so.2 => /lib64/libdl.so.2 (0x00007f4e00630000)
163163
// libc.so.6 => /lib64/libc.so.6 (0x00007f4e00262000)
164164
// libjvm.so => not found
165165
// libjvm.so => not found
166-
// libverify.so => /tmp/jdk.incubator.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libverify.so (0x00007f4e00c2e000)
166+
// libverify.so => /tmp/jdk.jpackage17911687595930080396/images/opt/simplepackagetest/lib/runtime/lib/libverify.so (0x00007f4e00c2e000)
167167
// /lib64/ld-linux-x86-64.so.2 (0x00007f4e00b36000)
168168
// libjvm.so => not found
169169
//

‎src/jdk.incubator.jpackage/linux/classes/jdk/incubator/jpackage/internal/LinuxAppBundler.java‎ renamed to ‎src/jdk.jpackage/linux/classes/jdk/jpackage/internal/LinuxAppBundler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* questions.
2424
*/
2525

26-
package jdk.incubator.jpackage.internal;
26+
package jdk.jpackage.internal;
2727

2828
public class LinuxAppBundler extends AppImageBundler {
2929
public LinuxAppBundler() {

0 commit comments

Comments
 (0)