Add logging builds (from special builds)

.ci_support/linux_64_nsis_variantlog_enabled.yaml

@@ -0,0 +1,18 @@
+cdt_name:
+- cos6
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '11'
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+nsis_variant:
+- log_enabled
+target_platform:
+- linux-64
+zlib:
+- '1.2'

.ci_support/linux_64_.yaml → .ci_support/linux_64_nsis_variantstandard.yaml

@@ -7,9 +7,11 @@ channel_targets:
 cxx_compiler:
 - gxx
 cxx_compiler_version:
-- '10'
+- '11'
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
+nsis_variant:
+- standard
 target_platform:
 - linux-64
 zlib:

.ci_support/win_64_nsis_variantlog_enabled.yaml

@@ -0,0 +1,8 @@
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+nsis_variant:
+- log_enabled
+target_platform:
+- win-64

.ci_support/win_64_.yaml → .ci_support/win_64_nsis_variantstandard.yaml

@@ -2,5 +2,7 @@ channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
+nsis_variant:
+- standard
 target_platform:
 - win-64

recipe/bld.bat

@@ -2,6 +2,14 @@ set "PREFIX_NSIS=%PREFIX%\NSIS"
 cd binary
 robocopy . "%PREFIX_NSIS%" /V /S /XD Docs Examples
 if errorlevel 8 exit 1
+cd ..
+
+if exist binary_with_logging (
+    cd binary_with_logging
+    robocopy . "%PREFIX_NSIS%" /V /S /XD Docs Examples
+    if errorlevel 8 exit 1
+    cd ..
+)
 
 :: Copy the [de]activate scripts to %PREFIX%\etc\conda\[de]activate.d.
 :: This will allow them to be run on environment activation.
@@ -10,7 +18,6 @@ FOR %%F IN (activate deactivate) DO (
     COPY %RECIPE_DIR%\%%F.bat %PREFIX%\etc\conda\%%F.d\%PKG_NAME%_%%F.bat||exit 1
 )
 
-cd ..
 cd plugins
 copy "elevate\bin.x86-32\elevate.exe" "%PREFIX_NSIS%\Plugins\x86-unicode\"
 if errorlevel 1 exit 1

recipe/build.sh

@@ -1,9 +1,9 @@
-export PREFIX_NSIS=$PREFIX/NSIS
+export PREFIX_NSIS="$PREFIX/NSIS"
 
 pushd binary
 cp -r . "$PREFIX_NSIS"
-rm -rf $PREFIX_NSIS/Docs
-rm -rf $PREFIX_NSIS/Examples
+rm -rf "$PREFIX_NSIS/Docs"
+rm -rf "$PREFIX_NSIS/Examples"
 popd
 
 pushd plugins
@@ -14,20 +14,28 @@ cp "UnicodePathTest/Plugin/UnicodePathTest.dll" "$PREFIX_NSIS/Plugins/x86-unicod
 cp "access-control/Plugins/i386-unicode/AccessControl.dll" "$PREFIX_NSIS/Plugins/x86-unicode/"
 popd
 
+extra_scons_options=""
+extra_scons_targets=""
+if [[ $nsis_variant == "log_enabled" ]]; then
+  extra_scons_options="NSIS_CONFIG_LOG=yes"
+  extra_scons_targets="install-stubs"
+fi
+
 cd src
 scons \
   VERSION="${PKG_VERSION}" \
   CC="${CC}" CXX="${CXX}" APPEND_CCFLAGS="${CXXFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}" \
   SKIPSTUBS=all SKIPPLUGINS=all SKIPUTILS=all SKIPMISC=all \
-  NSIS_CONFIG_CONST_DATA_PATH=yes PREFIX=$PREFIX_NSIS \
-  -Q PATH=$PATH install-compiler
+  NSIS_CONFIG_CONST_DATA_PATH=yes PREFIX="$PREFIX_NSIS" \
+  -Q PATH="$PATH" $extra_scons_options \
+  install-compiler $extra_scons_targets
 
-mkdir -p $PREFIX/bin
-ln -sf $PREFIX_NSIS/bin/makensis $PREFIX_NSIS/makensis.exe
-ln -sf $PREFIX_NSIS/bin/makensis $PREFIX/bin/makensis
+mkdir -p "$PREFIX/bin"
+ln -sf "$PREFIX_NSIS/bin/makensis" "$PREFIX_NSIS/makensis.exe"
+ln -sf "$PREFIX_NSIS/bin/makensis" "$PREFIX/bin/makensis"
 
-pushd $PREFIX_NSIS
-  mkdir share
+pushd "$PREFIX_NSIS"
+  mkdir -p share
   cd share
-  ln -sf $PREFIX_NSIS nsis
+  ln -sf "$PREFIX_NSIS" nsis
 popd

recipe/conda_build_config.yaml

@@ -0,0 +1,3 @@
+nsis_variant:
+  - log_enabled
+  - standard

recipe/meta.yaml

@@ -8,6 +8,11 @@ source:
   - url: http://sourceforge.net/projects/nsis/files/NSIS%20{{ version.split(".")[0] }}/{{ version }}/nsis-{{ version }}.zip
     sha256: 1bb9fc85ee5b220d3869325dbb9d191dfe6537070f641c30fbb275c97051fd0c
     folder: binary
+
+  - url: http://sourceforge.net/projects/nsis/files/NSIS%20{{ version.split(".")[0] }}/{{ version }}/nsis-{{ version }}-log.zip  # [win and nsis_variant == 'log_enabled']
+    sha1: 4fcb221a4dc4719580f201f6399b2035073aeaaa  # [win and nsis_variant == 'log_enabled']
+    folder: binary_with_logging  # [win and nsis_variant == 'log_enabled']
+
   - url: http://sourceforge.net/projects/nsis/files/NSIS%20{{ version.split(".")[0] }}/{{ version }}/nsis-{{ version }}-src.tar.bz2  # [unix]
     sha256: a85270ad5386182abecb2470e3d7e9bec9fe4efd95210b13551cb386830d1e87  # [unix]
     folder: src   # [unix]
@@ -36,8 +41,11 @@ source:
     folder: plugins/access-control
 
 build:
-  number: 0
+  number: 1
   skip: True   # [aarch64 or ppc64le or osx]
+  string: h{{ PKG_HASH }}_log_{{ PKG_BUILDNUM }}  # [nsis_variant == 'log_enabled']
+  track_features:
+    - nsis_log_enabled  # [nsis_variant == 'log_enabled']
 
 requirements:
   build:
@@ -71,3 +79,4 @@ extra:
     - mbargull
     - msarahan
     - patricksnape
+    - jaimergp