Udpated to jdk11+19
- adapted RHBZ-1565658-system-nss-SunEC.patch; hopefully correct - broken system lcms - probably caused by http://hg.openjdk.java.net/jdk/jdk/rev/f0aeede1b855 === Output from failing command(s) repeated here === make/Init.gmk:342: Building on-failure /usr/bin/printf "* For target support_native_java.desktop_libjavajpeg_imageioJPEG.o:\n" + /usr/bin/printf '* For target support_native_java.desktop_libjavajpeg_imageioJPEG.o:\n' * For target support_native_java.desktop_libjavajpeg_imageioJPEG.o: make/Init.gmk:342: Building on-failure (/usr/bin/grep -v -e "^Note: including file:" < /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/build/make-support/failure-logs/support_native_java.desktop_libjavajpeg_imageioJPEG.o.log || true) | /usr/bin/head -n 12 + /usr/bin/grep -v -e '^Note: including file:' + /usr/bin/head -n 12 cc1: warning: command line option '-std=gnu++98' is valid for C++/ObjC++ but not for C /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c:49:10: fatal error: com_sun_imageio_plugins_jpeg_JPEGImageReader.h: No such file or directory #include "com_sun_imageio_plugins_jpeg_JPEGImageReader.h" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make/Init.gmk:342: Building on-failure if test `/usr/bin/wc -l < /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/build/make-support/failure-logs/support_native_java.desktop_libjavajpeg_imageioJPEG.o.log` -gt 12; then /usr/bin/echo " ... (rest of output omitted)" ; fi ++ /usr/bin/wc -l + test 5 -gt 12 make/Init.gmk:342: Building on-failure /usr/bin/printf "* For target support_native_java.desktop_liblcms_LCMS.o:\n" + /usr/bin/printf '* For target support_native_java.desktop_liblcms_LCMS.o:\n' * For target support_native_java.desktop_liblcms_LCMS.o: make/Init.gmk:342: Building on-failure (/usr/bin/grep -v -e "^Note: including file:" < /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/build/make-support/failure-logs/support_native_java.desktop_liblcms_LCMS.o.log || true) | /usr/bin/head -n 12 + /usr/bin/grep -v -e '^Note: including file:' + /usr/bin/head -n 12 cc1: warning: command line option '-std=gnu++98' is valid for C++/ObjC++ but not for C /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/src/java.desktop/share/native/liblcms/LCMS.c:29:10: fatal error: sun_java2d_cmm_lcms_LCMS.h: No such file or directory #include "sun_java2d_cmm_lcms_LCMS.h" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make/Init.gmk:342: Building on-failure if test `/usr/bin/wc -l < /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/build/make-support/failure-logs/support_native_java.desktop_liblcms_LCMS.o.log` -gt 12; then /usr/bin/echo " ... (rest of output omitted)" ; fi ++ /usr/bin/wc -l + test 5 -gt 12 make/Init.gmk:342: Building on-failure /usr/bin/printf "\n* All command lines available in /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/build/make-support/failure-logs.\n" + /usr/bin/printf '\n* All command lines available in /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/build/make-support/failure-logs.\n' * All command lines available in /home/jvanek/rpmbuild/BUILD/java-11-openjdk-11.0.ea.19-5.fc27.x86_64/openjdk/build/make-support/failure-logs. make/Init.gmk:342: Building on-failure /usr/bin/printf "=== End of repeated output ===\n" + /usr/bin/printf '=== End of repeated
This commit is contained in:
Jiri Vanek
parent
7542164d45
commit
0185deb0a5
|
|
@ -3,3 +3,4 @@
|
|||
/jdk-jdk10-jdk-10+46.tar.xz
|
||||
/jdk-updates-jdk10u-jdk-10.0.1+10.tar.xz
|
||||
/jdk-jdk-jdk-11+16.tar.xz
|
||||
/jdk-jdk-jdk-11+19.tar.xz
|
||||
|
|
|
|||
|
|
@ -1,186 +0,0 @@
|
|||
# HG changeset patch
|
||||
# User chrisphi
|
||||
# Date 1528295658 14400
|
||||
# Wed Jun 06 10:34:18 2018 -0400
|
||||
# Branch JDK-8203030
|
||||
# Node ID 191d4ac3ee244c4f21f2e87e44d34172ae8b37b4
|
||||
# Parent b06f330492cd627a332c4933a0f3ad5df0351d50
|
||||
8203030: Zero s390 31 bit size_t type conflicts in shared code
|
||||
Summary: Cast to size_t or change to size_t foe compatibility with other archs.
|
||||
Reviewed-by: Duke
|
||||
Contributed-by: chrisphi
|
||||
|
||||
diff --git a/src/hotspot/share/code/codeCache.cpp b/src/hotspot/share/code/codeCache.cpp
|
||||
--- a/src/hotspot/share/code/codeCache.cpp
|
||||
+++ b/src/hotspot/share/code/codeCache.cpp
|
||||
@@ -409,7 +409,7 @@
|
||||
add_heap(heap);
|
||||
|
||||
// Reserve Space
|
||||
- size_t size_initial = MIN2(InitialCodeCacheSize, rs.size());
|
||||
+ size_t size_initial = MIN2((size_t)InitialCodeCacheSize, rs.size());
|
||||
size_initial = align_up(size_initial, os::vm_page_size());
|
||||
if (!heap->reserve(rs, size_initial, CodeCacheSegmentSize)) {
|
||||
vm_exit_during_initialization(err_msg("Could not reserve enough space in %s (" SIZE_FORMAT "K)",
|
||||
diff --git a/src/hotspot/share/gc/cms/cms_globals.hpp b/src/hotspot/share/gc/cms/cms_globals.hpp
|
||||
--- a/src/hotspot/share/gc/cms/cms_globals.hpp
|
||||
+++ b/src/hotspot/share/gc/cms/cms_globals.hpp
|
||||
@@ -410,7 +410,7 @@
|
||||
"An `interval' counter that determines how frequently " \
|
||||
"we simulate overflow; a smaller number increases frequency") \
|
||||
\
|
||||
- product(uintx, ParGCDesiredObjsFromOverflowList, 20, \
|
||||
+ product(size_t, ParGCDesiredObjsFromOverflowList, 20, \
|
||||
"The desired number of objects to claim from the overflow list") \
|
||||
range(0, max_uintx) \
|
||||
\
|
||||
diff --git a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
||||
--- a/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
||||
+++ b/src/hotspot/share/gc/g1/g1ConcurrentMark.cpp
|
||||
@@ -2344,7 +2344,7 @@
|
||||
// of things to do) or totally (at the very end).
|
||||
size_t target_size;
|
||||
if (partially) {
|
||||
- target_size = MIN2((size_t)_task_queue->max_elems()/3, GCDrainStackTargetSize);
|
||||
+ target_size = MIN2((size_t)_task_queue->max_elems()/3, (size_t)GCDrainStackTargetSize);
|
||||
} else {
|
||||
target_size = 0;
|
||||
}
|
||||
diff --git a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
|
||||
--- a/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
|
||||
+++ b/src/hotspot/share/gc/g1/g1PageBasedVirtualSpace.hpp
|
||||
@@ -91,7 +91,7 @@
|
||||
void pretouch_internal(size_t start_page, size_t end_page);
|
||||
|
||||
// Returns the index of the page which contains the given address.
|
||||
- uintptr_t addr_to_page_index(char* addr) const;
|
||||
+ size_t addr_to_page_index(char* addr) const;
|
||||
// Returns the address of the given page index.
|
||||
char* page_start(size_t index) const;
|
||||
|
||||
diff --git a/src/hotspot/share/gc/g1/g1StringDedupTable.hpp b/src/hotspot/share/gc/g1/g1StringDedupTable.hpp
|
||||
--- a/src/hotspot/share/gc/g1/g1StringDedupTable.hpp
|
||||
+++ b/src/hotspot/share/gc/g1/g1StringDedupTable.hpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -122,7 +122,7 @@
|
||||
|
||||
G1StringDedupEntry** _buckets;
|
||||
size_t _size;
|
||||
- uintx _entries;
|
||||
+ size_t _entries;
|
||||
uintx _shrink_threshold;
|
||||
uintx _grow_threshold;
|
||||
bool _rehash_needed;
|
||||
diff --git a/src/hotspot/share/gc/parallel/parallel_globals.hpp b/src/hotspot/share/gc/parallel/parallel_globals.hpp
|
||||
--- a/src/hotspot/share/gc/parallel/parallel_globals.hpp
|
||||
+++ b/src/hotspot/share/gc/parallel/parallel_globals.hpp
|
||||
@@ -57,7 +57,7 @@
|
||||
"limiter (a number between 0-100)") \
|
||||
range(0, 100) \
|
||||
\
|
||||
- product(uintx, ParallelOldDeadWoodLimiterStdDev, 80, \
|
||||
+ product(size_t, ParallelOldDeadWoodLimiterStdDev, 80, \
|
||||
"The standard deviation used by the parallel compact dead wood " \
|
||||
"limiter (a number between 0-100)") \
|
||||
range(0, 100) \
|
||||
diff --git a/src/hotspot/share/gc/parallel/psParallelCompact.cpp b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
||||
--- a/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
||||
+++ b/src/hotspot/share/gc/parallel/psParallelCompact.cpp
|
||||
@@ -907,8 +907,8 @@
|
||||
void PSParallelCompact::initialize_dead_wood_limiter()
|
||||
{
|
||||
const size_t max = 100;
|
||||
- _dwl_mean = double(MIN2(ParallelOldDeadWoodLimiterMean, max)) / 100.0;
|
||||
- _dwl_std_dev = double(MIN2(ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
|
||||
+ _dwl_mean = double(MIN2((size_t)ParallelOldDeadWoodLimiterMean, max)) / 100.0;
|
||||
+ _dwl_std_dev = double(MIN2((size_t)ParallelOldDeadWoodLimiterStdDev, max)) / 100.0;
|
||||
_dwl_first_term = 1.0 / (sqrt(2.0 * M_PI) * _dwl_std_dev);
|
||||
DEBUG_ONLY(_dwl_initialized = true;)
|
||||
_dwl_adjustment = normal_distribution(1.0);
|
||||
diff --git a/src/hotspot/share/gc/shared/gc_globals.hpp b/src/hotspot/share/gc/shared/gc_globals.hpp
|
||||
--- a/src/hotspot/share/gc/shared/gc_globals.hpp
|
||||
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp
|
||||
@@ -311,7 +311,7 @@
|
||||
experimental(uintx, WorkStealingSpinToYieldRatio, 10, \
|
||||
"Ratio of hard spins to calls to yield") \
|
||||
\
|
||||
- develop(uintx, ObjArrayMarkingStride, 2048, \
|
||||
+ develop(size_t, ObjArrayMarkingStride, 2048, \
|
||||
"Number of object array elements to push onto the marking stack " \
|
||||
"before pushing a continuation entry") \
|
||||
\
|
||||
diff --git a/src/hotspot/share/gc/shared/plab.cpp b/src/hotspot/share/gc/shared/plab.cpp
|
||||
--- a/src/hotspot/share/gc/shared/plab.cpp
|
||||
+++ b/src/hotspot/share/gc/shared/plab.cpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
size_t PLAB::min_size() {
|
||||
// Make sure that we return something that is larger than AlignmentReserve
|
||||
- return align_object_size(MAX2(MinTLABSize / HeapWordSize, (uintx)oopDesc::header_size())) + AlignmentReserve;
|
||||
+ return align_object_size(MAX2(MinTLABSize / HeapWordSize, (size_t)oopDesc::header_size())) + AlignmentReserve;
|
||||
}
|
||||
|
||||
size_t PLAB::max_size() {
|
||||
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
|
||||
--- a/src/hotspot/share/prims/whitebox.cpp
|
||||
+++ b/src/hotspot/share/prims/whitebox.cpp
|
||||
@@ -1111,7 +1111,7 @@
|
||||
WB_END
|
||||
|
||||
WB_ENTRY(jobject, WB_GetSizeTVMFlag(JNIEnv* env, jobject o, jstring name))
|
||||
- uintx result;
|
||||
+ size_t result;
|
||||
if (GetVMFlag <size_t> (thread, env, name, &result, &JVMFlag::size_tAt)) {
|
||||
ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
|
||||
return longBox(thread, env, result);
|
||||
diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
|
||||
--- a/src/hotspot/share/runtime/arguments.cpp
|
||||
+++ b/src/hotspot/share/runtime/arguments.cpp
|
||||
@@ -1635,7 +1635,7 @@
|
||||
// Increase the code cache size - tiered compiles a lot more.
|
||||
if (FLAG_IS_DEFAULT(ReservedCodeCacheSize)) {
|
||||
FLAG_SET_ERGO(uintx, ReservedCodeCacheSize,
|
||||
- MIN2(CODE_CACHE_DEFAULT_LIMIT, ReservedCodeCacheSize * 5));
|
||||
+ MIN2(CODE_CACHE_DEFAULT_LIMIT, (size_t)ReservedCodeCacheSize * 5));
|
||||
}
|
||||
// Enable SegmentedCodeCache if TieredCompilation is enabled and ReservedCodeCacheSize >= 240M
|
||||
if (FLAG_IS_DEFAULT(SegmentedCodeCache) && ReservedCodeCacheSize >= 240*M) {
|
||||
diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
|
||||
--- a/src/hotspot/share/runtime/arguments.hpp
|
||||
+++ b/src/hotspot/share/runtime/arguments.hpp
|
||||
@@ -332,7 +332,7 @@
|
||||
// Value of the conservative maximum heap alignment needed
|
||||
static size_t _conservative_max_heap_alignment;
|
||||
|
||||
- static uintx _min_heap_size;
|
||||
+ static size_t _min_heap_size;
|
||||
|
||||
// -Xrun arguments
|
||||
static AgentLibraryList _libraryList;
|
||||
diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
|
||||
--- a/src/hotspot/share/runtime/globals.hpp
|
||||
+++ b/src/hotspot/share/runtime/globals.hpp
|
||||
@@ -85,8 +85,8 @@
|
||||
define_pd_global(size_t, NewSizeThreadIncrease, 4*K);
|
||||
define_pd_global(bool, InlineClassNatives, true);
|
||||
define_pd_global(bool, InlineUnsafeOps, true);
|
||||
-define_pd_global(uintx, InitialCodeCacheSize, 160*K);
|
||||
-define_pd_global(uintx, ReservedCodeCacheSize, 32*M);
|
||||
+define_pd_global(size_t, InitialCodeCacheSize, 160*K);
|
||||
+define_pd_global(size_t, ReservedCodeCacheSize, 32*M);
|
||||
define_pd_global(uintx, NonProfiledCodeHeapSize, 0);
|
||||
define_pd_global(uintx, ProfiledCodeHeapSize, 0);
|
||||
define_pd_global(uintx, NonNMethodCodeHeapSize, 32*M);
|
||||
|
|
@ -82,23 +82,18 @@ diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
|
|||
diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
|
||||
--- a/make/lib/Lib-jdk.crypto.ec.gmk
|
||||
+++ b/make/lib/Lib-jdk.crypto.ec.gmk
|
||||
@@ -29,9 +29,15 @@
|
||||
|
||||
ifeq ($(ENABLE_INTREE_EC), true)
|
||||
|
||||
- LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
|
||||
BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC))
|
||||
@@ -38,6 +38,11 @@
|
||||
BUILD_LIBSUNEC_CXXFLAGS_JDKLIB := $(CXXFLAGS_JDKLIB)
|
||||
endif
|
||||
|
||||
+ ifeq ($(USE_EXTERNAL_NSS), true)
|
||||
+ LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp
|
||||
+ BUILD_LIBSUNEC_FLAGS += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
|
||||
+ else
|
||||
+ LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
|
||||
+ BUILD_LIBSUNEC_CFLAGS_JDKLIB += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
|
||||
+ BUILD_LIBSUNEC_CXXFLAGS_JDKLIB += $(NSS_CFLAGS) -DSYSTEM_NSS -DNSS_ENABLE_ECC
|
||||
+ endif
|
||||
+
|
||||
#
|
||||
# On sol-sparc...all libraries are compiled with -xregs=no%appl
|
||||
# (set in CFLAGS_REQUIRED_sparc)
|
||||
$(eval $(call SetupJdkLibrary, BUILD_LIBSUNEC, \
|
||||
NAME := sunec, \
|
||||
TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
|
||||
@@ -58,6 +64,7 @@
|
||||
LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
|
||||
LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
|
||||
|
|
@ -157,9 +152,9 @@ diff --git a/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp b/src/jdk.crypt
|
|||
+#else
|
||||
#include "impl/ecc_impl.h"
|
||||
+#endif
|
||||
|
||||
#define ILLEGAL_STATE_EXCEPTION "java/lang/IllegalStateException"
|
||||
#define INVALID_ALGORITHM_PARAMETER_EXCEPTION \
|
||||
#include "sun_security_ec_ECDHKeyAgreement.h"
|
||||
#include "sun_security_ec_ECKeyPairGenerator.h"
|
||||
#include "sun_security_ec_ECDSASignature.h"
|
||||
@@ -33,6 +37,13 @@
|
||||
#define INVALID_PARAMETER_EXCEPTION \
|
||||
"java/security/InvalidParameterException"
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ pushd "${FILE_NAME_ROOT}"
|
|||
# get pr2126.patch (from http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8d2c9a898f50) from most correct tag
|
||||
# Do not push it or publish it (see http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2126)
|
||||
# there is currnetly no "upstram version of this patch, hardcoding custom version
|
||||
PR2126="../../pr2126-10.patch"
|
||||
PR2126="../../pr2126-11.patch"
|
||||
fi;
|
||||
echo "Applying ${PR2126}"
|
||||
patch -Np1 < $PR2126
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@
|
|||
%global origin_nice OpenJDK
|
||||
%global top_level_dir_name %{origin}
|
||||
%global minorver 0
|
||||
%global buildver 16
|
||||
%global buildver 19
|
||||
# priority must be 7 digits in total
|
||||
# setting to 1, so debug ones can have 0
|
||||
%global priority 00000%{minorver}1
|
||||
|
|
@ -881,10 +881,6 @@ Patch5: RHBZ-1565658-system-nss-SunEC.patch
|
|||
#
|
||||
#############################################
|
||||
|
||||
# Type fixing for s390 (Zero). In progress of
|
||||
# getting into upstream JDK 11.
|
||||
Patch100: JDK-8203030-s390-size_t.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: alsa-lib-devel
|
||||
|
|
@ -1148,8 +1144,6 @@ pushd %{top_level_dir_name}
|
|||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%patch100 -p1
|
||||
|
||||
popd # openjdk
|
||||
|
||||
%patch1000
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (systemtap-tapset-3.6.0pre02.tar.xz) = 848f42ef7ca751e723fd50e3a6da14c0965ad4da37ea3331568658e27497b7a7e4b9aad3dedd264ad0bb5566c37a92302b905f10258a4e2c89dc4ba609e55481
|
||||
SHA512 (jdk-jdk-jdk-11+16.tar.xz) = 3f8c9aac270c2096f0260114531dc4224ca77d448e22fc452704ce0e85bba2a067a83a2c2e0db5117632d34e454b57179144d3d508f1b9603dc3805f6c7ec86d
|
||||
SHA512 (jdk-jdk-jdk-11+19.tar.xz) = f99aef9e7a4896dfbcdb80f620ad44e69e07760b7fcf100be8cd12070797f8e7a568baec998f32bf8727595d6ed246fd2b53ad9ce39e984859d5174015cedf7a
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
# so if the version of sources change, this file changes and is pushed
|
||||
#
|
||||
# In any case you have to set PROJECT_NAME REPO_NAME and VERSION. eg:
|
||||
# PROJECT_NAME=jdk9
|
||||
# REPO_NAME=jdk9
|
||||
# PROJECT_NAME=jdk11
|
||||
# REPO_NAME=jdk
|
||||
# VERSION=inDevelopment (but keyword tip will still do its job)
|
||||
#
|
||||
# If you don't, default are used and so already uploaded tarball regenerated
|
||||
|
|
@ -25,13 +25,13 @@ fi
|
|||
set -e
|
||||
|
||||
if [ "x$PROJECT_NAME" = "x" ] ; then
|
||||
PROJECT_NAME="jdk-updates"
|
||||
PROJECT_NAME="jdk"
|
||||
fi
|
||||
if [ "x$REPO_NAME" = "x" ] ; then
|
||||
REPO_NAME="jdk10u"
|
||||
REPO_NAME="jdk"
|
||||
fi
|
||||
if [ "x$VERSION" = "x" ] ; then
|
||||
VERSION="jdk-10.0.1+10"
|
||||
VERSION="jdk-11+19"
|
||||
fi
|
||||
|
||||
if [ "x$COMPRESSION" = "x" ] ; then
|
||||
|
|
@ -61,7 +61,7 @@ else
|
|||
echo "${FILENAME} already exists, using"
|
||||
fi
|
||||
|
||||
echo "nothing more TBD for 10!!"
|
||||
echo "nothing more TBD for 11 for now!!"
|
||||
exit 0
|
||||
|
||||
echo "Touching spec: $SPEC"
|
||||
|
|
|
|||
Loading…
Reference in New Issue