Skip to content

Commit

Permalink
Remove unnecessary dependency (#210)
Browse files Browse the repository at this point in the history
* change the version to 0.7.0.1

* change all 0.7.0.0 to 0.7.0.1

* shell prompt

* remove unnecessary dep (fficxx and hashable) for the generated codes.

* update Changelog
  • Loading branch information
wavewave authored Jul 28, 2023
1 parent 333f045 commit f32cb4e
Show file tree
Hide file tree
Showing 18 changed files with 27 additions and 41 deletions.
4 changes: 0 additions & 4 deletions .envrc

This file was deleted.

4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import sphinx_rtd_theme

project = 'fficxx'
copyright = '2022, Ian-Woo Kim'
copyright = '2013 - 2023, Ian-Woo Kim'
author = 'Ian-Woo Kim'
release = '0.7.0.0'
release = '0.7.0.1'

# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
Expand Down
2 changes: 2 additions & 0 deletions examples/map/test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import Foreign.Ptr
import STD.CppString
import qualified STD.Map.TH as TH
import STD.Map.Template
import STD.MapIterator.Template
import STD.Pair.Template

TH.genMapInstanceFor
CPrim
Expand Down
2 changes: 1 addition & 1 deletion examples/proxy/Gen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ stdcxx_cabal :: Cabal
stdcxx_cabal =
Cabal
{ cabal_pkgname = CabalName "stdcxx",
cabal_version = "0.6",
cabal_version = "0.7.0.1",
cabal_cheaderprefix = "STD",
cabal_moduleprefix = "STD",
cabal_additional_c_incs = [],
Expand Down
2 changes: 1 addition & 1 deletion fficxx-multipkg-test/template-member/Gen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ stdcxx_cabal :: Cabal
stdcxx_cabal =
Cabal
{ cabal_pkgname = CabalName "stdcxx",
cabal_version = "0.6",
cabal_version = "0.7.0.1",
cabal_cheaderprefix = "STD",
cabal_moduleprefix = "STD",
cabal_additional_c_incs = [],
Expand Down
2 changes: 1 addition & 1 deletion fficxx-multipkg-test/template-toplevel/Gen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ stdcxx_cabal :: Cabal
stdcxx_cabal =
Cabal
{ cabal_pkgname = CabalName "stdcxx",
cabal_version = "0.6",
cabal_version = "0.7.0.1",
cabal_cheaderprefix = "STD",
cabal_moduleprefix = "STD",
cabal_additional_c_incs = [],
Expand Down
4 changes: 4 additions & 0 deletions fficxx-runtime/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog for fficxx-runtime

## 0.7.0.1

- Remove unnecessary dependency (#210)

## 0.7.0.0

- Show generated module dependency graph (#203)
Expand Down
3 changes: 1 addition & 2 deletions fficxx-runtime/fficxx-runtime.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cabal-Version: 3.0
Name: fficxx-runtime
Version: 0.7.0.0
Version: 0.7.0.1
Synopsis: Runtime for fficxx-generated library
Description: Runtime for fficxx-generated library.
fficxx is an automatic haskell Foreign Function Interface (FFI) generator to C++.
Expand All @@ -24,7 +24,6 @@ Library
Build-Depends:
base == 4.*,
bytestring,
hashable,
template-haskell
Exposed-Modules:
FFICXX.Runtime.Cast
Expand Down
3 changes: 1 addition & 2 deletions fficxx-runtime/src/FFICXX/Runtime/CodeGen/Cxx.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
module FFICXX.Runtime.CodeGen.Cxx where

import Data.Functor.Identity (Identity)
import Data.Hashable (Hashable)
import Data.Kind (Type)
import Data.List (intercalate)
import Data.String (IsString (..))

newtype HeaderName = HdrName {unHdrName :: String}
deriving (Hashable, Show, Eq, Ord)
deriving (Show, Eq, Ord)

instance IsString HeaderName where
fromString = HdrName
Expand Down
2 changes: 1 addition & 1 deletion fficxx-test/fficxx-test.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cabal-Version: 3.0
Name: fficxx-test
Version: 0.7.0.0
Version: 0.7.0.1
Synopsis: test for fficxx
Description: test for fficxx (with stdcxx)
License: BSD-2-Clause
Expand Down
4 changes: 4 additions & 0 deletions fficxx/ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog for fficxx

## 0.7.0.1

- Remove unnecessary dependency (#210)

## 0.7.0.0

- Show generated module dependency graph (#203)
Expand Down
2 changes: 1 addition & 1 deletion fficxx/fficxx.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cabal-Version: 3.0
Name: fficxx
Version: 0.7.0.0
Version: 0.7.0.1
Synopsis: Automatic C++ binding generation
Description: fficxx is an automatic haskell Foreign Function Interface (FFI) generator to C++.
License: BSD-2-Clause
Expand Down
3 changes: 1 addition & 2 deletions fficxx/src/FFICXX/Generate/Code/Cabal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ genOtherModules _cmods = [""]
genPkgDeps :: [CabalName] -> [String]
genPkgDeps cs =
[ "base > 4 && < 5",
"fficxx >= 0.7",
"fficxx-runtime >= 0.7",
"fficxx-runtime >= 0.7.0.1",
"template-haskell"
]
++ map unCabalName cs
Expand Down
3 changes: 3 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@
packages = ps: [ ps.fficxx ps.fficxx-runtime ];
buildInputs = [ pkgs.cabal-install pkgs.ormolu pkgs.nixfmt pyenv ];
withHoogle = false;
shellHook = ''
export PS1="\n[fficxx:\w]$ \0"
'';
};

supportedCompilers = [ "ghc902" "ghc924" "ghc942" ];
Expand Down
2 changes: 1 addition & 1 deletion stdcxx-gen/Gen.hs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ cabal :: Cabal
cabal =
Cabal
{ cabal_pkgname = CabalName "stdcxx",
cabal_version = "0.7.0.0",
cabal_version = "0.7.0.1",
cabal_cheaderprefix = "STD",
cabal_moduleprefix = "STD",
cabal_additional_c_incs = [],
Expand Down
11 changes: 3 additions & 8 deletions workspace/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@ runhaskell ./template-member/Gen.hs ./template-member/template
cabal new-build tmf-test
cabal new-exec -- runhaskell -- -fobject-code -O0 template-member/app.hs

# proxy
runhaskell ./proxy/Gen.hs ./proxy/template
cabal new-build proxy-test
cabal new-exec -- runhaskell -- -iproxy -fobject-code -O0 proxy/app.hs

# map
#rm map/test.o map/test
#cabal new-exec -- ghc map/test.hs
#./map/test
rm map/test.o map/test
cabal new-exec -- ghc map/test.hs
./map/test
14 changes: 0 additions & 14 deletions workspace/build_short.sh

This file was deleted.

1 change: 0 additions & 1 deletion workspace/proxy

This file was deleted.

0 comments on commit f32cb4e

Please sign in to comment.