Repository: thrift Updated Branches: refs/heads/master 3a8bbbd4a -> bdd0b73a8
THRIFT-4076 fix appveyor ant issue Client: Build This closes #1180 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/bdd0b73a Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/bdd0b73a Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/bdd0b73a Branch: refs/heads/master Commit: bdd0b73a89f518917d23b35129226b89631e39fa Parents: 3a8bbbd Author: James E. King, III <jk...@apache.org> Authored: Wed Feb 8 12:27:57 2017 -0500 Committer: James E. King, III <jk...@apache.org> Committed: Wed Feb 8 12:27:57 2017 -0500 ---------------------------------------------------------------------- appveyor.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/bdd0b73a/appveyor.yml ---------------------------------------------------------------------- diff --git a/appveyor.yml b/appveyor.yml index 82ce366..aeb9d59 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,18 +52,22 @@ install: - move WIN32-Code\event2\* include\event2\ - move *.h include\ - cd .. -- appveyor-retry cinst -y winflexbison -- appveyor DownloadFile http://www.us.apache.org/dist/ant/binaries/apache-ant-%ANT_VERSION%-bin.zip -- 7z x apache-ant-%ANT_VERSION%-bin.zip > nul +- appveyor-retry cinst -y ant +- appveyor-retry cinst -y winflexbison3 +## appveyor DownloadFile http://www.us.apache.org/dist/ant/binaries/apache-ant-%ANT_VERSION%-bin.zip +# 7z x apache-ant-%ANT_VERSION%-bin.zip > nul - cd %APPVEYOR_BUILD_FOLDER% # TODO: Enable Haskell build # - cinst HaskellPlatform -version 2014.2.0.0 build_script: -- set PATH=C:\ProgramData\chocolatey\bin;C:\apache-ant-%ANT_VERSION%\bin;%PATH% -- set JAVA_HOME=C:\Program Files\Java\jdk1.7.0 -- set PATH=%JAVA_HOME%\bin;%PATH% +- echo PATH=%PATH% +- set PATH=C:\ProgramData\chocolatey\bin;%PATH% +## installation of ant brings in the latest jdk and sets JAVA_HOME +- echo JAVA_HOME=%JAVA_HOME% +## set JAVA_HOME=C:\Program Files\Java\jdk1.7.0 +## set PATH=%JAVA_HOME%\bin;%PATH% # - set PATH=%PATH%;C:\Program Files (x86)\Haskell Platform\2014.2.0.0\bin # - set PATH=%PATH%;C:\Program Files (x86)\Haskell Platform\2014.2.0.0\lib\extralibs\bin - set PATH=C:\Python27-x64\scripts;C:\Python27-x64;%PATH%
