Merge pull request #6 from ocefpaf/1.0.4

update to 1.0.4

appveyor.yml → .appveyor.yml

@@ -4,23 +4,13 @@
 
 environment:
 
-  # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the
-  # /E:ON and /V:ON options are not enabled in the batch script intepreter
-  # See: http://stackoverflow.com/a/13751649/163740
-  CMD_IN_ENV: "cmd /E:ON /V:ON /C obvci_appveyor_python_build_env.cmd"
-
   BINSTAR_TOKEN:
     # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
     secure: ipv/06DzgA7pzz2CIAtbPxZSsphDtF+JFyoWRnXkn3O8j7oRe3rzqj3LOoq2DZp4
 
   matrix:
-    - TARGET_ARCH: x86
-      CONDA_PY: 27
-      CONDA_INSTALL_LOCN: C:\\Miniconda
-
-    - TARGET_ARCH: x64
-      CONDA_PY: 27
-      CONDA_INSTALL_LOCN: C:\\Miniconda-x64
+    - CONFIG: win_c_compilervs2015vc14
+      CONDA_INSTALL_LOCN: C:\Miniconda36-x64
 
 
 # We always use a 64-bit machine, but can build x86 distributions
@@ -31,7 +21,7 @@ platform:
 install:
     # If there is a newer build queued for the same PR, cancel this one.
     - cmd: |
-        powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
+        powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
         ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
         del ff_ci_pr_build.py
 
@@ -40,25 +30,24 @@ install:
 
     # Add path, activate `conda` and update conda.
     - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
-    - cmd: conda update --yes --quiet conda
+    - cmd: conda.exe update --yes --quiet conda
 
     - cmd: set PYTHONUNBUFFERED=1
 
     # Add our channels.
-    - cmd: conda config --set show_channel_urls true
-    - cmd: conda config --remove channels defaults
-    - cmd: conda config --add channels defaults
-    - cmd: conda config --add channels conda-forge
+    - cmd: conda.exe config --set show_channel_urls true
+    - cmd: conda.exe config --remove channels defaults
+    - cmd: conda.exe config --add channels defaults
+    - cmd: conda.exe config --add channels conda-forge
 
     # Configure the VM.
-    - cmd: conda install -n root --quiet --yes obvious-ci
-    - cmd: conda install -n root --quiet --yes conda-forge-build-setup
+    - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1
     - cmd: run_conda_forge_build_setup
 
 # Skip .NET project specific build phase.
 build: off
 
 test_script:
-    - "%CMD_IN_ENV% conda build recipe --quiet"
+    - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
 deploy_script:
-    - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main
+    - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml

.ci_support/README

@@ -0,0 +1 @@
+This file is automatically generated by conda-smithy.  To change any matrix elements, you should change conda-smithy's input conda_build_config.yaml and re-render the recipe, rather than editing these files directly.

.ci_support/win_c_compilervs2015vc14.yaml

@@ -0,0 +1,10 @@
+c_compiler:
+- vs2015
+pin_run_as_build:
+  vc:
+    max_pin: x
+vc:
+- '14'
+zip_keys:
+- - vc
+  - c_compiler

.circleci/config.yml

@@ -0,0 +1,23 @@
+version: 2
+
+jobs:
+  build:
+    working_directory: ~/test
+    machine: true
+    branches:
+      ignore:
+        - /.*/
+    steps:
+      - run:
+          # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish.
+          command: exit 0
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build:
+          filters:
+            branches:
+              ignore:
+                - /.*/

.gitattributes

@@ -1,5 +1,7 @@
 * text=auto
 
+*.patch binary
+*.diff binary
 meta.yaml text eol=lf
 build.sh text eol=lf
 bld.bat text eol=crlf

.github/CONTRIBUTING.md

@@ -0,0 +1,15 @@
+Thanks for your interest in helping out conda-forge.
+
+Whether you are brand new or a seasoned maintainer, we always appreciate
+feedback from the community about how we can improve conda-forge. If you
+are submitting a PR or issue, please fill out the respective template. Should
+any questions arise please feel free to ask the maintainer team of the
+respective feedstock or reach out to `@conda-forge/core` for more complex
+issues.
+
+In the case of any issues reported, please be sure to demonstrate the relevant
+issue (even if it is an absence of a feature). Providing this information will
+help busy maintainers understand what it is you hope to accomplish. Also this
+will help provide them clues as to what might be going wrong. These examples
+can also be reused as tests in the build to ensure further packages meet these
+criteria. This is requested to help you get timely and relevant feedback. :)

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,25 @@
+<!--
+Thanks for reporting your issue.
+Please fill out the sections below.
+-->
+Issue:
+
+<br/>
+Environment (<code>conda list</code>):
+<details>
+
+```
+$ conda list
+
+```
+</details>
+
+<br/>
+Details about  <code>conda</code> and system ( <code>conda info</code> ):
+<details>
+
+```
+$ conda info
+
+```
+</details>

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+<!--
+Thank you for pull request.
+Below are a few things we ask you kindly to self-check before getting a review. Remove checks that are not relevant.
+-->
+Checklist
+* [ ] Used a fork of the feedstock to propose changes
+* [ ] Bumped the build number (if the version is unchanged)
+* [ ] Reset the build number to `0` (if the version changed)
+* [ ] [Re-rendered]( https://conda-forge.org/docs/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy`
+* [ ] Ensured the license file is being packaged.
+
+<!--
+Please note any issues this fixes using [closing keywords]( https://help.github.com/articles/closing-issues-using-keywords/ ):
+-->
+
+<!--
+Please add any other relevant info below:
+-->

.gitignore

@@ -1,3 +1,3 @@
 *.pyc
 
-build_artefacts
+build_artifacts

LICENSE → LICENSE.txt

@@ -1,5 +1,5 @@
 BSD 3-clause license
-Copyright (c) 2015-2017, conda-forge
+Copyright (c) 2015-2018, conda-forge
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

@@ -1,27 +1,29 @@
 About c99-to-c89
 ================
 
-Home: https://github.com/libav/c99-to-c89/
+Home: https://github.com/libav/c99-to-c89
 
-Package license: Apache v2
+Package license: Apache 2.0
 
 Feedstock license: BSD 3-Clause
 
-Summary: Tool to convert C99 code to MSVC-compatible C89
+Summary: Tool to convert C99 code to MSVC-compatible C89, with many Anaconda Distribution fixes
 
 
 
 Current build status
 ====================
 
-Linux: ![](https://cdn.rawgit.com/conda-forge/conda-smithy/90845bba35bec53edac7a16638aa4d77217a3713/conda_smithy/static/disabled.svg)
-OSX: ![](https://cdn.rawgit.com/conda-forge/conda-smithy/90845bba35bec53edac7a16638aa4d77217a3713/conda_smithy/static/disabled.svg)
-Windows: [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/conda-forge/c99-to-c89-feedstock?svg=True)](https://ci.appveyor.com/project/conda-forge/c99-to-c89-feedstock/branch/master)
+[![Windows](https://img.shields.io/appveyor/ci/conda-forge/c99-to-c89-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/c99-to-c89-feedstock/branch/master)
+![Linux disabled](https://img.shields.io/badge/linux-disabled-lightgrey.svg)
+![OSX disabled](https://img.shields.io/badge/OSX-disabled-lightgrey.svg)
 
 Current release info
 ====================
-Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/c99-to-c89/badges/version.svg)](https://anaconda.org/conda-forge/c99-to-c89)
-Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/c99-to-c89/badges/downloads.svg)](https://anaconda.org/conda-forge/c99-to-c89)
+
+| Name | Downloads | Version | Platforms |
+| --- | --- | --- | --- |
+| [![Conda Recipe](https://img.shields.io/badge/recipe-c99--to--c89-green.svg)](https://anaconda.org/conda-forge/c99-to-c89) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/c99-to-c89.svg)](https://anaconda.org/conda-forge/c99-to-c89) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/c99-to-c89.svg)](https://anaconda.org/conda-forge/c99-to-c89) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/c99-to-c89.svg)](https://anaconda.org/conda-forge/c99-to-c89) |
 
 Installing c99-to-c89
 =====================
@@ -66,6 +68,7 @@ To manage the continuous integration and simplify feedstock maintenance
 Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of
 this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``.
 
+For more information please check the [conda-forge documentation](https://conda-forge.org/docs/).
 
 Terminology
 ===========
@@ -100,4 +103,4 @@ In order to produce a uniquely identifiable distribution:
    the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
  * If the version of a package **is** being increased, please remember to return
    the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
-   back to 0.
+   back to 0.

recipe/bld.bat

@@ -1,8 +1,14 @@
-copy c99wrap.exe %LIBRARY_BIN%\c99wrap.exe
-copy c99conv.exe %LIBRARY_BIN%\c99conv.exe
-copy makedef %LIBRARY_BIN%\makedef
-
-rem Have to run the test here as cl.exe is only
-rem available during building.
-c99wrap cl /EP /P %RECIPE_DIR%\unit.c
+copy "%RECIPE_DIR%\build.sh" .
+FOR /F "delims=" %%i IN ('cygpath.exe -u "%LIBRARY_PREFIX%"') DO set "LIBRARY_PREFIX=%%i"
+FOR /F "delims=" %%i IN ('cygpath.exe -u "%PREFIX%"') DO set "PREFIX=%%i"
+FOR /F "delims=" %%i IN ('cygpath.exe -u "%PYTHON%"') DO set "PYTHON=%%i"
+FOR /F "delims=" %%i IN ('cygpath.exe -u "%RECIPE_DIR%"') DO set "RECIPE_DIR=%%i"
+FOR /F "delims=" %%i IN ('cygpath.exe -u "%SP_DIR%"') DO set "SP_DIR=%%i"
+FOR /F "delims=" %%i IN ('cygpath.exe -u "%SRC_DIR%"') DO set "SRC_DIR=%%i"
+FOR /F "delims=" %%i IN ('cygpath.exe -u "%STDLIB_DIR%"') DO set "STDLIB_DIR=%%i"
+set MSYSTEM=MINGW%ARCH%
+set MSYS2_PATH_TYPE=inherit
+set CHERE_INVOKING=1
+bash -lc ./build.sh
 if errorlevel 1 exit 1
+exit 0

recipe/build.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -x
+
+# $(dirname $(dirname $(dirname $(which 7z))))/usr/lib/p7zip/7z x -aoa -o$PWD/clang LLVM*${ARCH}.exe || exit 1
+curl -O http://releases.llvm.org/3.9.1/LLVM-3.9.1-win64.exe
+# We need a libclang. No one builds them statically for Windows unfortunately (though the
+# libav binaries have been built this way). I rename the libclang.dll in these to avoid
+# conflicts with conda-forge's clangdev (which we cannot use at present due to compat).
+# LLVM 6 has changed too much and is no longer compatible. It is at the ABI level, but
+# not semantically (Assertion failed: n_tokens == 2, file convert.c, line 559).
+7z x -aoa -o$PWD/clang LLVM*.exe || exit 1
+
+CLANGDIR=${PWD}/clang
+# Rename libclang.dll to avoid conflicts. Sorry. No one builds static libclangs on Windows for some reason?
+cp ${CLANGDIR}/bin/libclang.dll ${CLANGDIR}/bin/c99-to-c89-libclang.dll
+# Create an import library for c99-to-c89-libclang.dll
+gendef ${CLANGDIR}/bin/c99-to-c89-libclang.dll - > c99-to-c89-libclang.dll.def
+sed -i 's|LIBRARY "libclang.dll"|LIBRARY "c99-to-c89-libclang.dll"|' c99-to-c89-libclang.dll.def
+if [[ ${ARCH} == 32 ]]; then
+  MS_MACH=X86
+else
+  MS_MACH=X64
+fi
+if [[ ${vc} == 9 ]]; then
+  SNPRINTF=-Dsnprintf=_snprintf
+fi
+lib /def:c99-to-c89-libclang.dll.def /out:$(cygpath -m ${CLANGDIR}/lib/c99-to-c89-libclang.lib) /machine:${MS_MACH}
+
+if ! CFLAGS="${CFLAGS} -I${BUILD_PREFIX}/Library/include ${SNPRINTF}" CLANGDIR=${PWD}/clang make -f Makefile.w32; then
+  echo "ERROR :: Build failed"
+  exit 1
+fi
+cp c99*.exe ${CLANGDIR}/bin/c99-to-c89-libclang.dll ${PREFIX}/Library/bin
+
+# This file should be passed to the CMake command-line as:
+# -DCMAKE_C_COMPILER="c99-to-c89-cmake-nmake-wrap.bat"
+# I have given it a very specific name as I do not know that it will work for any other CMake.
+# We set the some debug flags so that we see the contents of the @response files and so that
+# temporaries are retained.
+pushd ${PREFIX}/Library/bin
+  echo "@echo off"                                          > c99-to-c89-cmake-nmake-wrap.bat
+  echo "echo cd %CD%"                                      >> c99-to-c89-cmake-nmake-wrap.bat
+  echo "setlocal EnableExtensions EnableDelayedExpansion"  >> c99-to-c89-cmake-nmake-wrap.bat
+  echo "if \"%VERBOSE_CM%\"==\"1\" ("                      >> c99-to-c89-cmake-nmake-wrap.bat
+  echo "  set C99_TO_C89_WRAP_DEBUG_LEVEL=1"               >> c99-to-c89-cmake-nmake-wrap.bat
+  echo "  set C99_TO_C89_WRAP_SAVE_TEMPS=1"                >> c99-to-c89-cmake-nmake-wrap.bat
+  echo "  set C99_TO_C89_WRAP_NO_LINE_DIRECTIVES=1"        >> c99-to-c89-cmake-nmake-wrap.bat
+  echo "  set C99_TO_C89_CONV_DEBUG_LEVEL=1"               >> c99-to-c89-cmake-nmake-wrap.bat
+  echo ")"                                                 >> c99-to-c89-cmake-nmake-wrap.bat
+  echo "%~dp0c99wrap.exe -keep cl %*"                      >> c99-to-c89-cmake-nmake-wrap.bat
+popd