Java 10

.appveyor.yml

@@ -9,7 +9,10 @@ environment:
     secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1
 
   matrix:
-    - CONFIG: win_
+    - CONFIG: win_c_compilervs2008
+      CONDA_INSTALL_LOCN: C:\Miniconda36-x64
+
+    - CONFIG: win_c_compilervs2015
       CONDA_INSTALL_LOCN: C:\Miniconda36-x64
 
 

.ci_support/linux_.yaml

@@ -1,13 +1,8 @@
-build_number_decrement:
-- '0'
+c_compiler:
+- toolchain_c
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
-curl:
-- '7.59'
 docker_image:
 - condaforge/linux-anvil
-pin_run_as_build:
-  curl:
-    max_pin: x

.ci_support/osx_.yaml

@@ -1,19 +1,12 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.9'
-build_number_decrement:
-- '0'
+c_compiler:
+- toolchain_c
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
-curl:
-- '7.59'
-docker_image:
-- condaforge/linux-anvil
 macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
 - '10.9'
-pin_run_as_build:
-  curl:
-    max_pin: x

.ci_support/win_.yaml → .ci_support/win_c_compilervs2008.yaml

@@ -1,9 +1,6 @@
+c_compiler:
+- vs2008
 channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
-curl:
-- '7.59'
-pin_run_as_build:
-  curl:
-    max_pin: x

.ci_support/win_c_compilervs2015.yaml

@@ -0,0 +1,6 @@
+c_compiler:
+- vs2015
+channel_sources:
+- conda-forge,defaults
+channel_targets:
+- conda-forge main

recipe/bld.bat

@@ -9,6 +9,18 @@ if errorlevel 1 exit 1
 XCOPY lib\* %LIBRARY_LIB% /s /i /y
 if errorlevel 1 exit 1
 
+XCOPY DISCLAIMER %PREFIX% /s /i /y
+if errorlevel 1 exit 1
+
+XCOPY conf\* %PREFIX% /s /i /y
+if errorlevel 1 exit 1
+
+XCOPY jmods\* %PREFIX% /s /i /y
+if errorlevel 1 exit 1
+
+XCOPY legal\* %PREFIX% /s /i /y
+if errorlevel 1 exit 1
+
 :: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
 :: This will allow them to be run on environment activation.
 FOR %%F IN (activate deactivate) DO (

recipe/build.sh

@@ -1,9 +1,11 @@
 #!/bin/bash -euo
 
 chmod +x bin/*
+mkdir -p $PREFIX/bin
 mv bin/* $PREFIX/bin/
 ls -la $PREFIX/bin
 
+mkdir -p $PREFIX/include
 mv include/* $PREFIX/include
 if [ -e ./lib/jspawnhelper ]; then
     chmod +x ./lib/jspawnhelper
@@ -20,8 +22,23 @@ then
     rm -rf ./fonts
 fi
 
+mkdir $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
+
 # 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"

recipe/meta.yaml

@@ -1,8 +1,8 @@
 # Based on recipes from birdhouse and anaconda channel.
 
 {% set name = "openjdk" %}
-{% set version = "9.0.7" %}
-{% set zulu_build = "9.0.7.1" %}
+{% set version = "10.0.2" %}
+{% set zulu_build = "10.3+5" %}
 {% set build_number = 0 %}
 
 package:
@@ -11,13 +11,13 @@ package:
 
 source:
   - url: https://cdn.azul.com/zulu/bin/zulu{{ zulu_build }}-jdk{{ version }}-linux_x64.tar.gz  # [linux64]
-    sha256: 45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8  # [linux64]
+    sha256: 47ef4b708689f1923a2be9325b17c9df8545a33769a7f11b00dc70f0be4f12ca  # [linux64]
 
   - url: https://cdn.azul.com/zulu/bin/zulu{{ zulu_build }}-jdk{{ version }}-macosx_x64.zip  # [osx]
-    sha256: 4b1f8529ff3a8bebc974e2a22395cb27ad8750e386c8c4d1b0a1b16f89cfcf66  # [osx]
+    sha256: ffeada0b80d51f1d18a703926538c2f9e1cfe1f51f968a726b866387ac74fd16  # [osx]
 
   - url: https://cdn.azul.com/zulu/bin/zulu{{ zulu_build }}-jdk{{ version }}-win_x64.zip  # [win64]
-    sha256: 75f76c53c6a1f12b1a571b86bd9708ab75adf582d689dddc94fdd77dcc0f3f5c  # [win64]
+    sha256: 622cf9db19fd505442541baacb1c59a08e6868007387eccfeabeb8a0b21d8621  # [win64]
 
   - url: https://github.com/dejavu-fonts/dejavu-fonts/releases/download/version_2_37/dejavu-fonts-ttf-2.37.zip  # [linux64]
     sha256: 7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a  # [linux64]
@@ -27,30 +27,25 @@ build:
   number: {{ build_number }}
   skip: true  # [win32 or linux32]
   string: zulu{{ zulu_build }}_{{ build_number }}
-  track_features:
-    - openjdk
-
-requirements:
-  build:
-    - curl  # [unix]
 
 test:
+  requires:
+    - {{ compiler('c') }}  # [not win]
   files:
     - test-jni  # [not win]
     - test-jni.sh  # [not win]
     - test-nio
   commands:
     - java -version
     - ./test-jni.sh  # [not win]
-    - conda inspect linkages -p ${PREFIX} openjdk  # [linux]
-    - conda inspect objects -p ${PREFIX} openjdk  # [osx]
 
 about:
   home: https://www.azul.com/products/zulu/
-  license: GPLv2
+  license: GPL-2.0
+  license_family: GPL
+  license_file: '{{ environ["RECIPE_DIR"] }}/LICENSE'
   summary: The Zulu OpenJDK build.
-  description: |
-    Zulu OpenJDK is an open source build of the Java JDK.
+  description: Zulu OpenJDK is an open source build of the Java JDK.
 
 extra:
   recipe-maintainers:

recipe/test-jni.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
-set -e
+set -ex
 
 if [ ! -d $JAVA_LD_LIBRARY_PATH ]; then
 	echo "Did you remember to activate the conda environment?"
 	exit -1
 fi
 
 os=$(uname -s | tr '[:upper:]' '[:lower:]')
-gcc -I$JAVA_HOME/include \
-	-I$JAVA_HOME/include/$os \
-	-Wl,-rpath,$JAVA_LD_LIBRARY_PATH \
-	-L$JAVA_LD_LIBRARY_PATH \
-	-L$JAVA_LD_LIBRARY_PATH/server \
-	-o vmtest \
-	test-jni/vmtest.c \
-	-ljvm
+${CC} -I$JAVA_HOME/include \
+	  -I$JAVA_HOME/include/$os \
+	  -Wl,-rpath,$JAVA_LD_LIBRARY_PATH \
+	  -L$JAVA_LD_LIBRARY_PATH \
+	  -L$JAVA_LD_LIBRARY_PATH/server \
+	  -o vmtest \
+	  test-jni/vmtest.c \
+	  -ljvm
 
 ./vmtest