From cb64b3cfcf82117af9012c20fe83cf5de8870941 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Thu, 23 Oct 2014 10:40:22 +0200 Subject: [PATCH] version up : JRE version 7 update 71 and version 8 update 25. also delete JRE version 6 that is no longer supported. --- component/java/buildout.cfg | 42 ++++++++++--------------------------- 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/component/java/buildout.cfg b/component/java/buildout.cfg index ad9ba3cc0..e5093d363 100644 --- a/component/java/buildout.cfg +++ b/component/java/buildout.cfg @@ -3,51 +3,31 @@ parts = java -[jdk-6u27-no-user-interaction-patch] -recipe = hexagonit.recipe.download -url = ${:_profile_base_location_}/${:filename} -download-only = true -filename = jdk-6u27-no-user-interaction.patch -md5sum = 4c4303240647a114d07f3c411b2e6b5b - [java] <= java-re [java-re] -<= java-re-1.6.0 - -[java-sdk] -<= java-sdk-1.6.0 +<= java-re-7 -[java-re-1.6.0] +[java-re-7] recipe = slapos.recipe.build slapos_promisee = directory:bin directory:lib directory:man directory:plugin - directory:javaws file:lib/rt.jar file:bin/java -# http://java.com/en/download/manual_v6.jsp -x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68284 7eda40e790de1a907d591b62949b6e72 -x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68286 839548714931443ba89719a995ece846 +# http://java.com/en/download/manual_java7.jsp +x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97798 90a6b9e2a32d06c18a3f16b485f0d1ea +x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97800 7605134662f6c87131eca5745895fe84 script = - import glob if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ') - download_file = self.download(self.options['url'], self.options.get('md5sum')) - extract_dir = tempfile.mkdtemp(self.name) - os.chdir(extract_dir) - (download_dir, filename) = os.path.split(download_file) - auto_extract_bin = os.path.join(extract_dir, filename) - shutil.move(download_file, auto_extract_bin) - os.chmod(auto_extract_bin, 0755) - subprocess.call([auto_extract_bin]) - self.cleanup_dir_list.append(extract_dir) + extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum'))) workdir = guessworkdir(extract_dir) - self.copyTree(glob.glob(os.path.join(workdir, "jre1.6.0_*"))[0], "%(location)s") + self.copyTree(workdir, "%(location)s") -[java-re-1.7.0] +[java-re-8] recipe = slapos.recipe.build slapos_promisee = directory:bin @@ -56,9 +36,9 @@ slapos_promisee = directory:plugin file:lib/rt.jar file:bin/java -# http://java.com/en/download/manual.jsp?locale=en -x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68234 ea99bedd9db33e9e2970f4b70abd1e4b -x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=68236 5aa9bd26cdf1fa6afd2b15826b4ba139 +# http://java.com/en/download/manual_java7.jsp +x86 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97358 22d970566c418499d331a2099d77c548 +x86-64 = http://javadl.sun.com/webapps/download/AutoDL?BundleId=97360 f4f7f7335eaf2e7b5ff455abece9d5ed script = if not self.options.get('url'): self.options['url'], self.options['md5sum'] = self.options[guessPlatform()].split(' ') extract_dir = self.extract(self.download(self.options['url'], self.options.get('md5sum'))) -- 2.30.9