Commit 9a9d9552 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 6.0.1+dfsg

parent f0aa0a03

.appveyor.yml

0 → 100644
+35 −0
Original line number Diff line number Diff line 
environment:

  AV_PROJECTS: 'c:\projects'

  AV_BF_M2: 'c:\projects\m2'

  AV_BF_SOURCE: 'c:\projects\bioformats'



# Note that only Oracle JDK is provided.

  matrix:

    - java: 11

      build: maven

    - java: 1.8

      build: maven

    - java: 1.8

      build: ant

      ant_version: 1.10.1



cache:

  - '%AV_BF_M2% -> appveyor.yml'



os: 'Visual Studio 2015'

clone_folder: '%AV_BF_SOURCE%'

clone_depth: 5

platform: x64



init:

  - git config --global core.autocrlf input

  - if [%build%] == [ant] appveyor-retry cinst -y ant --version %ant_version%

  - refreshenv

  - 'if [%java%] == [1.8] set "JAVA_HOME=C:\Program Files\Java\jdk1.8.0"'

  - 'if [%java%] == [11] set "JAVA_HOME=C:\Program Files\Java\jdk11"'

  - PATH=%JAVA_HOME%\bin;%PATH%

  - 'if [%build%] == [maven] set "MAVEN_OPTS=-Dmaven.repo.local=%AV_BF_M2%"'

  - 'if [%build%] == [ant] set "ANT_OPTS=-Dmaven.repo.local=%AV_BF_M2%"'



build_script:

  - tools\test-build %build%

.classpath-template

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<classpath>

        <classpathentry kind="src" path="components/autogen/src"/>

        <classpathentry kind="src" path="components/formats-api/build/src"/>

        <classpathentry kind="src" path="components/formats-api/src"/>

        <classpathentry kind="src" path="components/formats-bsd/build/src"/>

.gitignore

+5 −0
Original line number Diff line number Diff line 
.classpath

.idea

.project

.settings

.DS_Store

.idea

artifacts

build

components/*/utils/*.class
@@ -14,3 +16,6 @@ testng.css 
tools/*.jar

*.log

*.xpr

*.class

*.iml

.*.swp

.travis.yml

+13 −4
Original line number Diff line number Diff line
@@ -9,14 +9,17 @@ sudo: false 
cache:

  directories:

  - $HOME/.m2

  - downloads



addons:

  apt_packages:

    - git



jdk:

  - openjdk11

  - oraclejdk11

  - openjdk8

  - oraclejdk8

  - openjdk7



env:

  - BUILD=maven
@@ -24,9 +27,15 @@ env: 


matrix:

  fast_finish: true



before_install:

  - if [[ $BUILD == 'ant' ]]; then pip install --user flake8 Sphinx; fi

  exclude:

  - jdk: oraclejdk11

    env: BUILD=ant

  - jdk: openjdk11

    env: BUILD=ant

  - jdk: oraclejdk8

    env: BUILD=ant

  - jdk: openjdk8

    env: BUILD=maven



script:

  - ./tools/test-build $BUILD

CONTRIBUTING.md

+2 −9
Original line number Diff line number Diff line
@@ -51,13 +51,6 @@ please ensure you read these. 


The documentation hosted at

https://docs.openmicroscopy.org/bio-formats/ is built from the

`/docs/sphinx/` directory. Contributions are welcome but please follow the

style guidance from the

[Bio-Formats Documentation Repository](https://github.com/ome/bio-formats-documentation).

Contributions are welcome but please follow the style guidance from the

[OME Documentation Repository README](https://github.com/openmicroscopy/ome-documentation/blob/develop/README.rst#conventions-used).
 


Documentation for new supported formats is auto-generated - see

[Adding format/reader documentation pages](https://docs.openmicroscopy.org/latest/bio-formats/developers/format-documentation.html). If you need any assistance please

contact the [mailing list](https://www.openmicroscopy.org/support)

before embarking on such a change, or submit your new reader code and let one

of the main OME team deal with the documentation for you.