Remove unnecessary dependency (#210)

wavewave · web-flow · commit f32cb4e1149d · 2023-07-28T15:13:57.000-07:00
* 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
diff --git a/.envrc b/.envrc
diff --git a/docs/conf.py b/docs/conf.py
@@ -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
diff --git a/examples/map/test.hs b/examples/map/test.hs
@@ -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
diff --git a/examples/proxy/Gen.hs b/examples/proxy/Gen.hs
@@ -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 = [],
diff --git a/fficxx-multipkg-test/template-member/Gen.hs b/fficxx-multipkg-test/template-member/Gen.hs
@@ -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 = [],
diff --git a/fficxx-multipkg-test/template-toplevel/Gen.hs b/fficxx-multipkg-test/template-toplevel/Gen.hs
@@ -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 = [],
diff --git a/fficxx-runtime/ChangeLog.md b/fficxx-runtime/ChangeLog.md
@@ -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)
diff --git a/fficxx-runtime/fficxx-runtime.cabal b/fficxx-runtime/fficxx-runtime.cabal
@@ -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++.
@@ -24,7 +24,6 @@ Library
   Build-Depends:
                  base == 4.*,
                  bytestring,
-                 hashable,
                  template-haskell
   Exposed-Modules:
                    FFICXX.Runtime.Cast
diff --git a/fficxx-runtime/src/FFICXX/Runtime/CodeGen/Cxx.hs b/fficxx-runtime/src/FFICXX/Runtime/CodeGen/Cxx.hs
@@ -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
diff --git a/fficxx-test/fficxx-test.cabal b/fficxx-test/fficxx-test.cabal
@@ -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
diff --git a/fficxx/ChangeLog.md b/fficxx/ChangeLog.md
@@ -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)
diff --git a/fficxx/fficxx.cabal b/fficxx/fficxx.cabal
@@ -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
diff --git a/fficxx/src/FFICXX/Generate/Code/Cabal.hs b/fficxx/src/FFICXX/Generate/Code/Cabal.hs
@@ -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
diff --git a/flake.nix b/flake.nix
@@ -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" ];
diff --git a/stdcxx-gen/Gen.hs b/stdcxx-gen/Gen.hs
@@ -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 = [],
diff --git a/workspace/build.sh b/workspace/build.sh
@@ -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
diff --git a/workspace/build_short.sh b/workspace/build_short.sh
diff --git a/workspace/proxy b/workspace/proxy
