Merge pull request #44 from hadim/java9

Java9
conda-forge · Nov 28, 2018 · 9f35d37 · 9f35d37
2 parents ec2d545 + 8c2bc4d
commit 9f35d37
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/recipe/bld.bat b/recipe/bld.bat
@@ -6,16 +6,19 @@ if errorlevel 1 exit 1
 XCOPY include\* %LIBRARY_INC% /s /i /y
 if errorlevel 1 exit 1
 
-XCOPY jre\* %LIBRARY_PREFIX%\jre /s /i /y
+XCOPY lib\* %LIBRARY_LIB% /s /i /y
 if errorlevel 1 exit 1
 
-XCOPY lib\* %LIBRARY_LIB% /s /i /y
+XCOPY DISCLAIMER %PREFIX% /s /i /y
 if errorlevel 1 exit 1
 
-XCOPY lib\* %LIBRARY_LIB% /s /i /y
+XCOPY conf\* %PREFIX% /s /i /y
+if errorlevel 1 exit 1
+
+XCOPY jmods\* %PREFIX% /s /i /y
 if errorlevel 1 exit 1
 
-MOVE src.zip %LIBRARY_PREFIX%\jre\src.zip
+XCOPY legal\* %PREFIX% /s /i /y
 if errorlevel 1 exit 1
 
 :: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.

diff --git a/recipe/build.sh b/recipe/build.sh
@@ -7,17 +7,13 @@ ls -la $PREFIX/bin
 
 mkdir -p $PREFIX/include
 mv include/* $PREFIX/include
-if [ -e ./jre/lib/jspawnhelper ]; then
-    chmod +x ./jre/lib/jspawnhelper
+if [ -e ./lib/jspawnhelper ]; then
+    chmod +x ./lib/jspawnhelper
 fi
 
 if [[ `uname` == "Linux" ]]
 then
-    mv lib/amd64/jli/*.so lib
-    mv lib/amd64/*.so lib
-    rm -r lib/amd64
-    # libnio.so does not find this within jre/lib/amd64 subdirectory
-    cp jre/lib/amd64/libnet.so lib
+    mv lib/jli/*.so lib/
 
     # Include dejavu fonts to allow java to work even on minimal cloud
     # images where these fonts are missing (thanks to @chapmanb)
@@ -26,17 +22,23 @@ then
     rm -rf ./fonts
 fi
 
-mkdir -p $PREFIX/jre
-mv jre/* $PREFIX/jre
-
 mkdir -p $PREFIX/lib
 mv lib/* $PREFIX/lib
 
+mv DISCLAIMER $PREFIX/DISCLAIMER
+
+mkdir -p $PREFIX/conf
+mv conf/* $PREFIX/conf
+
+mkdir -p $PREFIX/jmods
+mv jmods/* $PREFIX/jmods
+
+mkdir -p $PREFIX/legal
+mv legal/* $PREFIX/legal
+
 mkdir -p $PREFIX/man
 mv man/* $PREFIX/man
 
-mv src.zip $PREFIX/src.zip
-
 # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d.
 # This will allow them to be run on environment activation.
 for CHANGE in "activate" "deactivate"

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set name = "openjdk" %}
-{% set version = "8.0.192" %}
-{% set zulu_build = "8.33.0.1" %}
+{% set version = "9.0.7" %}
+{% set zulu_build = "9.0.7.1" %}
 {% set build_number = 1002 %}
 
 package:
@@ -9,13 +9,13 @@ package:
 
 source:
   - url: https://cdn.azul.com/zulu/bin/zulu{{ zulu_build }}-jdk{{ version }}-linux_x64.tar.gz  # [linux64]
-    sha256: 95a33bfc8de5b88b07d29116edd4485a59182921825e193f68fe494b03ab3523  # [linux64]
+    sha256: 45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8  # [linux64]
 
   - url: https://cdn.azul.com/zulu/bin/zulu{{ zulu_build }}-jdk{{ version }}-macosx_x64.zip  # [osx]
-    sha256: 2f49058ecb532cd6ef2773441f7a10aa23e484639881775b367c28f8f2d9566a  # [osx]
+    sha256: 4b1f8529ff3a8bebc974e2a22395cb27ad8750e386c8c4d1b0a1b16f89cfcf66  # [osx]
 
   - url: https://cdn.azul.com/zulu/bin/zulu{{ zulu_build }}-jdk{{ version }}-win_x64.zip  # [win64]
-    sha256: 047330e7d9a4442583efecc786503b2624903d7a10da5ab6e94beca6cc2ef622  # [win64]
+    sha256: 75f76c53c6a1f12b1a571b86bd9708ab75adf582d689dddc94fdd77dcc0f3f5c  # [win64]
 
   - url: https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_2_37/dejavu-fonts-ttf-2.37.zip  # [linux64]
     sha256: 7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a  # [linux64]