Repository: thrift Updated Branches: refs/heads/master 3f07967a7 -> a718ad483
Renames Thrift.cabal to fix THRIFT-3963 Client: hs This closes #1265 Project: http://git-wip-us.apache.org/repos/asf/thrift/repo Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/a718ad48 Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/a718ad48 Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/a718ad48 Branch: refs/heads/master Commit: a718ad48378ebcf16fd64adebac7c6988136abbd Parents: 3f07967 Author: Gregor Reitzenstein <dean4de...@paranoidlabs.org> Authored: Wed May 10 10:02:54 2017 +0200 Committer: James E. King, III <jk...@apache.org> Committed: Thu Aug 10 23:21:30 2017 -0400 ---------------------------------------------------------------------- lib/hs/CMakeLists.txt | 2 +- lib/hs/Makefile.am | 2 +- lib/hs/Thrift.cabal | 80 ---------------------------------------------- lib/hs/thrift.cabal | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/thrift/blob/a718ad48/lib/hs/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/lib/hs/CMakeLists.txt b/lib/hs/CMakeLists.txt index 7653ed6..a20a319 100644 --- a/lib/hs/CMakeLists.txt +++ b/lib/hs/CMakeLists.txt @@ -33,7 +33,7 @@ set(haskell_sources src/Thrift/Transport/HttpClient.hs src/Thrift/Transport/IOBuffer.hs src/Thrift/Types.hs - Thrift.cabal + thrift.cabal ) if(BUILD_TESTING) http://git-wip-us.apache.org/repos/asf/thrift/blob/a718ad48/lib/hs/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/hs/Makefile.am b/lib/hs/Makefile.am index 90d5e14..3cd8b57 100644 --- a/lib/hs/Makefile.am +++ b/lib/hs/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST = \ README.md \ Setup.lhs \ TODO \ - Thrift.cabal \ + thrift.cabal \ src \ test http://git-wip-us.apache.org/repos/asf/thrift/blob/a718ad48/lib/hs/Thrift.cabal ---------------------------------------------------------------------- diff --git a/lib/hs/Thrift.cabal b/lib/hs/Thrift.cabal deleted file mode 100644 index f919127..0000000 --- a/lib/hs/Thrift.cabal +++ /dev/null @@ -1,80 +0,0 @@ --- --- Licensed to the Apache Software Foundation (ASF) under one --- or more contributor license agreements. See the NOTICE file --- distributed with this work for additional information --- regarding copyright ownership. The ASF licenses this file --- to you under the Apache License, Version 2.0 (the --- "License"); you may not use this file except in compliance --- with the License. You may obtain a copy of the License at --- --- http://www.apache.org/licenses/LICENSE-2.0 --- --- Unless required by applicable law or agreed to in writing, --- software distributed under the License is distributed on an --- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY --- KIND, either express or implied. See the License for the --- specific language governing permissions and limitations --- under the License. --- - -Name: thrift -Version: 1.0.0-dev -Cabal-Version: >= 1.8 -License: OtherLicense -Category: Foreign -Build-Type: Simple -Synopsis: Haskell bindings for the Apache Thrift RPC system -Homepage: http://thrift.apache.org -Bug-Reports: https://issues.apache.org/jira/browse/THRIFT -Maintainer: d...@thrift.apache.org -License-File: LICENSE - -Description: - Haskell bindings for the Apache Thrift RPC system. Requires the use of the thrift code generator. - -flag network-uri - description: Get Network.URI from the network-uri package - default: True - -Library - Hs-Source-Dirs: - src - Build-Depends: - base >= 4, base < 5, containers, ghc-prim, attoparsec, binary, bytestring >= 0.10, base64-bytestring, hashable, HTTP, text, hspec-core < 2.4.0, unordered-containers >= 0.2.6, vector >= 0.10.12.2, QuickCheck >= 2.8.2, split - if flag(network-uri) - build-depends: network-uri >= 2.6, network >= 2.6 - else - build-depends: network < 2.6 - Exposed-Modules: - Thrift, - Thrift.Arbitraries - Thrift.Protocol, - Thrift.Protocol.Binary, - Thrift.Protocol.Compact, - Thrift.Protocol.JSON, - Thrift.Server, - Thrift.Transport, - Thrift.Transport.Empty, - Thrift.Transport.Framed, - Thrift.Transport.Handle, - Thrift.Transport.HttpClient, - Thrift.Transport.IOBuffer, - Thrift.Transport.Memory, - Thrift.Types - Extensions: - DeriveDataTypeable, - ExistentialQuantification, - FlexibleInstances, - KindSignatures, - MagicHash, - RankNTypes, - RecordWildCards, - ScopedTypeVariables, - TypeSynonymInstances - -Test-Suite spec - Type: exitcode-stdio-1.0 - Hs-Source-Dirs: test - Ghc-Options: -Wall - main-is: Spec.hs - Build-Depends: base, thrift, hspec, QuickCheck >= 2.8.2, bytestring >= 0.10, unordered-containers >= 0.2.6 http://git-wip-us.apache.org/repos/asf/thrift/blob/a718ad48/lib/hs/thrift.cabal ---------------------------------------------------------------------- diff --git a/lib/hs/thrift.cabal b/lib/hs/thrift.cabal new file mode 100644 index 0000000..f919127 --- /dev/null +++ b/lib/hs/thrift.cabal @@ -0,0 +1,80 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. +-- + +Name: thrift +Version: 1.0.0-dev +Cabal-Version: >= 1.8 +License: OtherLicense +Category: Foreign +Build-Type: Simple +Synopsis: Haskell bindings for the Apache Thrift RPC system +Homepage: http://thrift.apache.org +Bug-Reports: https://issues.apache.org/jira/browse/THRIFT +Maintainer: d...@thrift.apache.org +License-File: LICENSE + +Description: + Haskell bindings for the Apache Thrift RPC system. Requires the use of the thrift code generator. + +flag network-uri + description: Get Network.URI from the network-uri package + default: True + +Library + Hs-Source-Dirs: + src + Build-Depends: + base >= 4, base < 5, containers, ghc-prim, attoparsec, binary, bytestring >= 0.10, base64-bytestring, hashable, HTTP, text, hspec-core < 2.4.0, unordered-containers >= 0.2.6, vector >= 0.10.12.2, QuickCheck >= 2.8.2, split + if flag(network-uri) + build-depends: network-uri >= 2.6, network >= 2.6 + else + build-depends: network < 2.6 + Exposed-Modules: + Thrift, + Thrift.Arbitraries + Thrift.Protocol, + Thrift.Protocol.Binary, + Thrift.Protocol.Compact, + Thrift.Protocol.JSON, + Thrift.Server, + Thrift.Transport, + Thrift.Transport.Empty, + Thrift.Transport.Framed, + Thrift.Transport.Handle, + Thrift.Transport.HttpClient, + Thrift.Transport.IOBuffer, + Thrift.Transport.Memory, + Thrift.Types + Extensions: + DeriveDataTypeable, + ExistentialQuantification, + FlexibleInstances, + KindSignatures, + MagicHash, + RankNTypes, + RecordWildCards, + ScopedTypeVariables, + TypeSynonymInstances + +Test-Suite spec + Type: exitcode-stdio-1.0 + Hs-Source-Dirs: test + Ghc-Options: -Wall + main-is: Spec.hs + Build-Depends: base, thrift, hspec, QuickCheck >= 2.8.2, bytestring >= 0.10, unordered-containers >= 0.2.6
