Merge pull request #29 from brandoncc/move-configurations-to-files

Move configurations to files

README.md

@@ -80,140 +80,7 @@ VIPS_VERSION=x.y.z ./build.sh
 
 After building a tar file, it will be copied to the `build` directory. Then you should commit this changes to git.
 
-## Build configuration (heroku-18)
+## Build configurations
 
-```
-~ $ vips --vips-version
-libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
-
-~ $ vips --vips-config
-enable debug: no
-enable deprecated library components: yes
-enable modules: no
-use fftw3 for FFT: yes
-accelerate loops with orc: yes
-ICC profile support with lcms: yes (lcms2)
-zlib: yes
-text rendering with pangocairo: no
-font file support with fontconfig:
-RAD load/save: yes
-Analyze7 load/save: yes
-PPM load/save: yes
-GIF load:  yes
-GIF save with cgif: no
-EXIF metadata support with libexif: yes
-JPEG load/save with libjpeg: yes (pkg-config)
-JXL load/save with libjxl: no (dynamic module: no)
-JPEG2000 load/save with libopenjp2: no
-PNG load with libspng: no
-PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
-quantisation to 8 bit: no
-TIFF load/save with libtiff: yes (pkg-config libtiff-4)
-image pyramid save: yes
-HEIC/AVIF load/save with libheif: yes (dynamic module: no)
-WebP load/save with libwebp: yes
-PDF load with PDFium:  no
-PDF load with poppler-glib: yes (dynamic module: no)
-SVG load with librsvg-2.0: yes
-EXR load with OpenEXR: yes
-OpenSlide load: no (dynamic module: no)
-Matlab load with matio: no
-NIfTI load/save with niftiio: no
-FITS load/save with cfitsio: no
-Magick package: MagickCore (dynamic module: no)
-Magick API version: magick6
-load with libMagickCore: yes
-save with libMagickCore: yes
-```
-
-## Build configuration (heroku-20)
+If you would like to see the output of `vips --vips-version` or `vips --vips-config`, both can be found for each stack in the [build/configurations](build/configurations) directory. These configuration logs are generated automatically during the build process, so they should always be up-to-date.
 
-```
-~ $ vips --vips-version
-libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
-
-~ $ vips --vips-config
-enable debug: no
-enable deprecated library components: yes
-enable modules: no
-use fftw3 for FFT: yes
-accelerate loops with orc: yes
-ICC profile support with lcms: yes (lcms2)
-zlib: yes
-text rendering with pangocairo: no
-font file support with fontconfig:
-RAD load/save: yes
-Analyze7 load/save: yes
-PPM load/save: yes
-GIF load:  yes
-GIF save with cgif: no
-EXIF metadata support with libexif: yes
-JPEG load/save with libjpeg: yes (pkg-config)
-JXL load/save with libjxl: no (dynamic module: no)
-JPEG2000 load/save with libopenjp2: no
-PNG load with libspng: no
-PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
-quantisation to 8 bit: no
-TIFF load/save with libtiff: yes (pkg-config libtiff-4)
-image pyramid save: yes
-HEIC/AVIF load/save with libheif: yes (dynamic module: no)
-WebP load/save with libwebp: yes
-PDF load with PDFium:  no
-PDF load with poppler-glib: yes (dynamic module: no)
-SVG load with librsvg-2.0: yes
-EXR load with OpenEXR: yes
-OpenSlide load: no (dynamic module: no)
-Matlab load with matio: no
-NIfTI load/save with niftiio: no
-FITS load/save with cfitsio: no
-Magick package: MagickCore (dynamic module: no)
-Magick API version: magick6
-load with libMagickCore: yes
-save with libMagickCore: yes
-```
-
-## Build configuration (heroku-22)
-
-```
-~ $ vips --vips-version
-libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
-
-~ $ vips --vips-config
-enable debug: no
-enable deprecated library components: yes
-enable modules: no
-use fftw3 for FFT: yes
-accelerate loops with orc: yes
-ICC profile support with lcms: yes (lcms2)
-zlib: yes
-text rendering with pangocairo: no
-font file support with fontconfig:
-RAD load/save: yes
-Analyze7 load/save: yes
-PPM load/save: yes
-GIF load:  yes
-GIF save with cgif: no
-EXIF metadata support with libexif: yes
-JPEG load/save with libjpeg: yes (pkg-config)
-JXL load/save with libjxl: no (dynamic module: no)
-JPEG2000 load/save with libopenjp2: yes
-PNG load with libspng: no
-PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
-quantisation to 8 bit: no
-TIFF load/save with libtiff: yes (pkg-config libtiff-4)
-image pyramid save: yes
-HEIC/AVIF load/save with libheif: yes (dynamic module: no)
-WebP load/save with libwebp: yes
-PDF load with PDFium:  no
-PDF load with poppler-glib: yes (dynamic module: no)
-SVG load with librsvg-2.0: yes
-EXR load with OpenEXR: yes
-OpenSlide load: no (dynamic module: no)
-Matlab load with matio: no
-NIfTI load/save with niftiio: no
-FITS load/save with cfitsio: no
-Magick package: MagickCore (dynamic module: no)
-Magick API version: magick6
-load with libMagickCore: yes
-save with libMagickCore: yes
-```

build.sh

@@ -3,6 +3,13 @@
 # set -x
 set -e
 
+# Remove existing builds so that unsupported stacks are automatically removed
+rm -rf ./build/*.tar.gz
+
+# Remove configuration logs so that unsupported stacks are automatically removed
+mkdir -p ./build/configurations
+rm -rf ./build/configurations/*.log
+
 STACK_VERSIONS=(18 20 22)
 
 for stack_version in "${STACK_VERSIONS[@]}"; do
@@ -16,5 +23,5 @@ for stack_version in "${STACK_VERSIONS[@]}"; do
 
   mkdir -p build
 
-  docker run --rm -t -v $PWD/build:/build $image_name sh -c 'cp -f /usr/local/vips/build/*.tar.gz /build'
+  docker run --rm -t -v $PWD/build:/build $image_name sh -c 'cp -f /usr/local/vips/build/*.tar.gz /build && cp -f /usr/local/vips/build/*.config.log /build/configurations'
 done

build/configurations/heroku-18.config.log

@@ -0,0 +1,41 @@
+$ vips --vips-version
+libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
+
+$ vips --vips-config
+enable debug: no
+enable deprecated library components: yes
+enable modules: no
+use fftw3 for FFT: yes
+accelerate loops with orc: yes
+ICC profile support with lcms: yes (lcms2)
+zlib: yes
+text rendering with pangocairo: no
+font file support with fontconfig: 
+RAD load/save: yes
+Analyze7 load/save: yes
+PPM load/save: yes
+GIF load:  yes
+GIF save with cgif: no
+EXIF metadata support with libexif: yes
+JPEG load/save with libjpeg: yes (pkg-config)
+JXL load/save with libjxl: no (dynamic module: no)
+JPEG2000 load/save with libopenjp2: no
+PNG load with libspng: no
+PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
+quantisation to 8 bit: no
+TIFF load/save with libtiff: yes (pkg-config libtiff-4)
+image pyramid save: yes
+HEIC/AVIF load/save with libheif: yes (dynamic module: no)
+WebP load/save with libwebp: yes
+PDF load with PDFium:  no
+PDF load with poppler-glib: yes (dynamic module: no)
+SVG load with librsvg-2.0: yes
+EXR load with OpenEXR: yes
+OpenSlide load: no (dynamic module: no)
+Matlab load with matio: no
+NIfTI load/save with niftiio: no
+FITS load/save with cfitsio: no
+Magick package: MagickCore (dynamic module: no)
+Magick API version: magick6
+load with libMagickCore: yes
+save with libMagickCore: yes

build/configurations/heroku-20.config.log

@@ -0,0 +1,41 @@
+$ vips --vips-version
+libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
+
+$ vips --vips-config
+enable debug: no
+enable deprecated library components: yes
+enable modules: no
+use fftw3 for FFT: yes
+accelerate loops with orc: yes
+ICC profile support with lcms: yes (lcms2)
+zlib: yes
+text rendering with pangocairo: no
+font file support with fontconfig: 
+RAD load/save: yes
+Analyze7 load/save: yes
+PPM load/save: yes
+GIF load:  yes
+GIF save with cgif: no
+EXIF metadata support with libexif: yes
+JPEG load/save with libjpeg: yes (pkg-config)
+JXL load/save with libjxl: no (dynamic module: no)
+JPEG2000 load/save with libopenjp2: no
+PNG load with libspng: no
+PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
+quantisation to 8 bit: no
+TIFF load/save with libtiff: yes (pkg-config libtiff-4)
+image pyramid save: yes
+HEIC/AVIF load/save with libheif: yes (dynamic module: no)
+WebP load/save with libwebp: yes
+PDF load with PDFium:  no
+PDF load with poppler-glib: yes (dynamic module: no)
+SVG load with librsvg-2.0: yes
+EXR load with OpenEXR: yes
+OpenSlide load: no (dynamic module: no)
+Matlab load with matio: no
+NIfTI load/save with niftiio: no
+FITS load/save with cfitsio: no
+Magick package: MagickCore (dynamic module: no)
+Magick API version: magick6
+load with libMagickCore: yes
+save with libMagickCore: yes

build/configurations/heroku-22.config.log

@@ -0,0 +1,41 @@
+$ vips --vips-version
+libvips 8.12.2-Tue Jan 25 09:34:32 UTC 2022
+
+$ vips --vips-config
+enable debug: no
+enable deprecated library components: yes
+enable modules: no
+use fftw3 for FFT: yes
+accelerate loops with orc: yes
+ICC profile support with lcms: yes (lcms2)
+zlib: yes
+text rendering with pangocairo: no
+font file support with fontconfig: 
+RAD load/save: yes
+Analyze7 load/save: yes
+PPM load/save: yes
+GIF load:  yes
+GIF save with cgif: no
+EXIF metadata support with libexif: yes
+JPEG load/save with libjpeg: yes (pkg-config)
+JXL load/save with libjxl: no (dynamic module: no)
+JPEG2000 load/save with libopenjp2: yes
+PNG load with libspng: no
+PNG load/save with libpng: yes (pkg-config libpng >= 1.2.9)
+quantisation to 8 bit: no
+TIFF load/save with libtiff: yes (pkg-config libtiff-4)
+image pyramid save: yes
+HEIC/AVIF load/save with libheif: yes (dynamic module: no)
+WebP load/save with libwebp: yes
+PDF load with PDFium:  no
+PDF load with poppler-glib: yes (dynamic module: no)
+SVG load with librsvg-2.0: yes
+EXR load with OpenEXR: yes
+OpenSlide load: no (dynamic module: no)
+Matlab load with matio: no
+NIfTI load/save with niftiio: no
+FITS load/save with cfitsio: no
+Magick package: MagickCore (dynamic module: no)
+Magick API version: magick6
+load with libMagickCore: yes
+save with libMagickCore: yes

container/Dockerfile

@@ -120,9 +120,17 @@ RUN cd $VIPS_PREFIX \
   && rm -rf share/man \
   && rm -rf share/thumbnailers
 
-# I don't know why, but I have to bring this in again. Maybe "FROM" resets it?
 ARG STACK_VERSION
 RUN cd $VIPS_PREFIX \
   && rm -rf build \
   && mkdir build \
   && tar czf "build/heroku-${STACK_VERSION}.tar.gz" bin include lib
+
+# Store configuration for easy viewing in the repo
+ARG STACK_VERSION
+RUN cd $VIPS_PREFIX \
+  && echo "$ vips --vips-version" > "build/heroku-${STACK_VERSION}.config.log" \
+  && ./bin/vips --vips-version >> "build/heroku-${STACK_VERSION}.config.log" \
+  && echo "" >> "build/heroku-${STACK_VERSION}.config.log" \
+  && echo "$ vips --vips-config" >> "build/heroku-${STACK_VERSION}.config.log" \
+  && ./bin/vips --vips-config >> "build/heroku-${STACK_VERSION}.config.log"