Changes for Hackage release 0.2.0.0 (#158)

Summary:
A few final fixes needed for a Hackage release

Pull Request resolved: #158

Reviewed By: pepeiborra

Differential Revision: D78165684

Pulled By: iamirzhan

fbshipit-source-id: 545daa56b2052f0ceb4c425ec7d3d90b559ed050

Author: simonmar

.github/workflows/ci-getdeps.yml

@@ -117,7 +117,12 @@ jobs:
       - if: matrix.buildtype == 'getdeps'
         name: Set Cabal flags
         run: |
-          echo CABAL_CONFIG_FLAGS="$CABAL_CONFIG_FLAGS -f-bundled-folly -f-fbthrift" >>"$GITHUB_ENV"
+          echo CABAL_CONFIG_FLAGS="$CABAL_CONFIG_FLAGS -f-bundled-folly" >>"$GITHUB_ENV"
+
+      - if: matrix.buildtype == 'cabal'
+        name: Set Cabal flags
+        run: |
+          echo CABAL_CONFIG_FLAGS="$CABAL_CONFIG_FLAGS -f-fbthrift" >>"$GITHUB_ENV"
 
       - if: matrix.buildtype == 'cabal'
         name: Install dependencies needed by the Cabal build

Makefile

@@ -167,7 +167,7 @@ setup-folly::
 			sed 's/;/ \\\n            /g' >cppfiles && \
 		grep '^FILES_H:' out | \
 			sed 's/FILES_H://' | \
-			sed "s|$$(dirname $$(pwd))/|folly/|g" | \
+			sed "s|$$(dirname $$(pwd))/||g" | \
 			sed 's/;/ \\\n            /g' >hfiles && \
 		cd ../.. && sed "s|__CPP_FILES__|$$(cat <folly/_build/cppfiles)|;s|__H_FILES__|$$(cat <folly/_build/hfiles)|" <folly-clib.cabal.in >folly-clib.cabal \
 	)
@@ -180,8 +180,13 @@ setup-folly::
 # since there are no upstream releases. Careful to generate something
 # that respects Cabal's constraints on version numbers: no leading
 # zeroes and fields must be <10 digits.
-.PHONY: setup-folly-version
+.PHONY: setup-folly-version setup-folly-0
 ver:=$(shell cd folly-clib/folly && date -u "--date=@$$(git log -1 --format=%ct)" +%Y%m%d.%-k%M)
 setup-folly-version::
 	sed -i "s/^version:\(\s*\).*$$/version:\1$(ver)/" folly-clib/folly-clib.cabal 
-	sed -i "s/^\(\s*\)build-depends:\(\s*\)folly-clib.*$$/\1build-depends: folly-clib==$(ver)/" common/util/fb-util.cabal
+	sed -i "s/^\(\s*\)build-depends:\(\s*\)folly-clib\s*$$/\1build-depends: folly-clib==$(ver)/" common/util/fb-util.cabal
+
+# Make version 0.0 of folly-clib, the empty package
+setup-folly-0::
+	sed "s|__CPP_FILES__||;s|__H_FILES__||" <folly-clib/folly-clib.cabal.in | grep -v '^\s*install-includes' | grep -v '\.h$$' >folly-clib/folly-clib.cabal
+	sed -i "s/^version:\(\s*\).*$$/version:\10.0/" folly-clib/folly-clib.cabal 

README.md

@@ -37,6 +37,7 @@ The repository contains the following packages:
   function prototypes into symbol names, useful for using C++ code via
   the Haskell FFI.
 * [fb-util](common/util), a collection of utilities
+* [folly-clib](folly-clib), the folly C++ library wrapped in a Cabal package
 * [thrift-compiler](compiler), the Haskell Thrift compiler
 * [thrift-lib](lib), libraries for Thrift clients
 * [thrift-tests](tests), a test suite
@@ -56,9 +57,9 @@ packages above are on Hackage except for `thrift-cpp-channel` and
 $ cabal install thrift-compiler thrift-lib thrift-http
 ```
 
-aren't on
-Hackage because they depend on fbthrift and can only be built from the
-repository; see the next section.
+`thrift-cpp-channel` and `thrift-server` aren't on Hackage because
+they depend on fbthrift and can only be built from the repository; see
+the next section.
 
 # Building and testing from the repository
 

common/util/fb-util.cabal

@@ -243,6 +243,16 @@ library
     else
         pkgconfig-depends: double-conversion
 
+    -- clients of fb-util can specify
+    --    build-depends: folly-clib > 0.0
+    -- to ensure that fb-util is built with +folly
+    if flag(folly)
+        -- the version here is spliced automatically by
+        -- 'make setup-folly-version':
+        build-depends: folly-clib
+    else
+        build-depends: folly-clib==0.0
+
     if flag(folly)
         exposed-modules:
             Foreign.CPP.Addressable
@@ -281,8 +291,6 @@ library
             cpp/HsStruct.cpp
             cpp/IOBuf.cpp
 
-        build-depends: folly-clib
-
 common test-common
   extra-libraries: stdc++
   ghc-options: -threaded

folly-clib/CHANGELOG.md

@@ -3,3 +3,8 @@
 ## 0.1.0.0 -- YYYY-mm-dd
 
 * First version. Released on an unsuspecting world.
+
+## 0.0
+
+* Empty package. Used as a dummy dependency by fb-util to force
+  the Cabal solver to set +/-folly

folly-clib/folly-clib.cabal.in

@@ -46,8 +46,9 @@ flag clang
   default: False
 
 -- If False, we just depend on folly from pkg-config. This is to support the
--- original build setup using getdeps.py, used in CI.
+-- original build setup using getdeps.py, used in hsthrift's CI.
 flag bundled-folly
+  manual: True
   default: True
 
 library
@@ -69,7 +70,7 @@ library
             __H_FILES__
 
         install-includes:
-            folly/_build/folly/folly-config.h
+            folly/folly-config.h
             fast_float/ascii_number.h
             fast_float/float_common.h
             fast_float/constexpr_feature_detect.h