Skip to content

Commit 1cabd5b

Browse files
Release: Do not strip .tar from Java archive names
Oracle finally came to its senses and started to release JRE tarbals that have .tar.gz extension instead of .gz. Therefore there is no need to strip .tar from filenames before copying original files. Signed-off-by: Anton Kolesov <[email protected]>
1 parent 498cc78 commit 1cabd5b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

release.mk

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -423,12 +423,10 @@ endif
423423
# Copy IDE plugin
424424
$(CP) $(IDE_PLUGIN_LOCATION)/$(IDE_PLUGINS_ZIP) $O
425425

426-
# Copy JRE. Original tarballs from Oracle do not have .tar in filenames.
427-
$(CP) $(THIRD_PARTY_SOFTWARE_LOCATION)/$(JRE_TGZ_LINUX:.tar.gz=.gz) \
428-
$O/$(JRE_TGZ_LINUX)
426+
# Copy JRE.
427+
$(CP) $(THIRD_PARTY_SOFTWARE_LOCATION)/$(JRE_TGZ_LINUX) $O/$(JRE_TGZ_LINUX)
429428
ifeq ($(ENABLE_WINDOWS_INSTALLER),y)
430-
$(CP) $(THIRD_PARTY_SOFTWARE_LOCATION)/$(JRE_TGZ_WIN:.tar.gz=.gz) \
431-
$O/$(JRE_TGZ_WIN)
429+
$(CP) $(THIRD_PARTY_SOFTWARE_LOCATION)/$(JRE_TGZ_WIN) $O/$(JRE_TGZ_WIN)
432430
endif
433431

434432
# Copy Eclipse

0 commit comments

Comments
 (0)