diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -62,9 +62,11 @@     ☒  2017-03-16 v0.8.0.0 [Tidy up the API](https://github.com/iconnect/regex/milestone/10) -    ☒  2017-03-18 v0.9.0.0 [Finish tidying up the API, Add type-safe replacement templates and exploit TemplateHaskellQuotes](https://github.com/iconnect/regex/milestone/9) +    ☒  2017-03-24 v0.9.0.0 [Finish tidying up the API, Add type-safe replacement templates and exploit TemplateHaskellQuotes](https://github.com/iconnect/regex/milestone/9) -    ☒  2017-03-18 v0.10.0.0 [Tweak TypeSafe SearchReplace templates](https://github.com/iconnect/regex/milestone/11) +    ☒  2017-03-25 v0.10.0.0 [Tweak TypeSafe SearchReplace templates](https://github.com/iconnect/regex/milestone/11) + +    ☒  2017-03-26 v0.10.0.1 [Fix release](https://github.com/iconnect/regex/issues/88)     ☐  2017-03-31 v1.0.0.0 [First stable release](https://github.com/iconnect/regex/milestone/3) diff --git a/Text/RE/Internal/Examples.hs b/Text/RE/Internal/Examples.hs new file mode 100644 --- /dev/null +++ b/Text/RE/Internal/Examples.hs @@ -0,0 +1,16 @@ +module Text.RE.Internal.Examples + ( + -- * regex-examples dummy library + -- $announce + greetings + ) where + +greetings :: IO () +greetings = putStr $ unlines + [ "Hello! This is a dummy function in the dummy library of the" + , "regex-examples package." + ] + +-- $announce +-- +-- This is a dummy library to accompany the regex-examples programs. diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,5 +1,8 @@ -*-change-log-*- +0.10.0.1 Chris Dornan 2017-03-26 + * Fix sub-package cabal files (#88) + 0.10.0.0 Chris Dornan 2017-03-25 * Tweak Type-Safe SearchReplace templates (#86) * Add escape methods to IsRegex (#87) diff --git a/examples/re-gen-cabals.lhs b/examples/re-gen-cabals.lhs --- a/examples/re-gen-cabals.lhs +++ b/examples/re-gen-cabals.lhs @@ -113,7 +113,7 @@ , LineEdit [re|^%Wwarn$|] $ w_warn_gen ctx , LineEdit [re|^%filter-regex-with-pcre$|] $ w_filter_pcre ctx , LineEdit [re|^%- +${pkg}(@{%id-}) +${cond}(.*)$|] $ cond_gen ctx - , LineEdit [re|^%build-depends-${lb}(lib|prog) +${list}(@{%id-}( +@{%id-})+)$|] + , LineEdit [re|^%build-depends-${lb}(lib|prog) +${list}(@{%id-}( +@{%id-})*)$|] $ build_depends_gen ctx , LineEdit [re|^%test +${i}(@{%id-})$|] $ test_exe_gen True False ctx , LineEdit [re|^%exe +${i}(@{%id-})$|] $ test_exe_gen False True ctx @@ -295,6 +295,7 @@ sdist' "regex-examples" "lib/README-regex-examples.md" establish "mega-regex" "regex" vrn_t <- T.pack . presentVrn <$> readCurrentVersion + test_release vrn_t smy_t <- summary SH.shelly $ SH.verbosely $ do SH.run_ "git" ["add","--all"] @@ -343,6 +344,25 @@ case lns of [Line _ (Matches _ [mtch])] -> return $ TE.decodeUtf8 $ LBS.toStrict $ mtch !$$ [cp|smy|] _ -> error "failed to locate the summary text in the roadmap" + +test_release :: T.Text -> IO () +test_release vrn_t = do + setCurrentDirectory "releases/test" + SH.shelly $ SH.verbosely $ do + SH.rm_rf $ SH.fromText "test-regex" + SH.rm_rf $ SH.fromText "test-regex-with-pcre" + SH.rm_rf $ SH.fromText "test-regex-examples" + unpack "regex" + unpack "regex-with-pcre" + unpack "regex-examples" + SH.run_ "stack" ["install"] + setCurrentDirectory "../.." + where + unpack pn = do + SH.run_ "tar" ["xzf","../"<>pn_vrn<>".tar.gz"] + SH.mv (SH.fromText pn_vrn) (SH.fromText $ "test-"<>pn) + where + pn_vrn = pn<>"-"<>vrn_t \end{code} diff --git a/lib/cabal-masters/library-incl.cabal b/lib/cabal-masters/library-incl.cabal --- a/lib/cabal-masters/library-incl.cabal +++ b/lib/cabal-masters/library-incl.cabal @@ -1,7 +1,3 @@ - - - - Library Hs-Source-Dirs: . Exposed-Modules: diff --git a/lib/cabal-masters/regex-examples.cabal b/lib/cabal-masters/regex-examples.cabal --- a/lib/cabal-masters/regex-examples.cabal +++ b/lib/cabal-masters/regex-examples.cabal @@ -33,6 +33,14 @@ Tag: <<$version$>> %Wwarn + +Library + Hs-Source-Dirs: . + Exposed-Modules: + Text.RE.Internal.Examples + +%build-depends-lib base array + %include "lib/cabal-masters/constraints-incl.cabal" %include "lib/cabal-masters/executables-incl.cabal" diff --git a/lib/cabal-masters/regex.cabal b/lib/cabal-masters/regex.cabal --- a/lib/cabal-masters/regex.cabal +++ b/lib/cabal-masters/regex.cabal @@ -41,6 +41,7 @@ Other-Modules: Text.RE.Internal.QQ + Text.RE.Internal.SearchReplace Text.RE.Internal.SearchReplace.TDFA Text.RE.Internal.SearchReplace.TDFA.ByteString Text.RE.Internal.SearchReplace.TDFA.ByteString.Lazy diff --git a/lib/mega-regex.cabal b/lib/mega-regex.cabal --- a/lib/mega-regex.cabal +++ b/lib/mega-regex.cabal @@ -1,5 +1,5 @@ Name: regex -Version: 0.10.0.0 +Version: 0.10.0.1 Synopsis: Toolkit for regex-base Description: A Regular Expression Toolkit for regex-base with Compile-time checking of RE syntax, data types for @@ -62,11 +62,7 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 0.10.0.0 - - - - + Tag: 0.10.0.1 @@ -196,7 +192,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -226,7 +222,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -253,7 +249,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -279,7 +275,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -308,7 +304,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -334,7 +330,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -357,7 +353,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -387,7 +383,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -420,7 +416,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -448,7 +444,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -476,7 +472,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -514,7 +510,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -553,7 +549,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -597,7 +593,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -643,7 +639,7 @@ -Werror Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 diff --git a/lib/version.txt b/lib/version.txt --- a/lib/version.txt +++ b/lib/version.txt @@ -1,1 +1,1 @@ -0.10.0.0 +0.10.0.1 diff --git a/regex-examples.cabal b/regex-examples.cabal --- a/regex-examples.cabal +++ b/regex-examples.cabal @@ -1,5 +1,5 @@ Name: regex-examples -Version: 0.10.0.0 +Version: 0.10.0.1 Synopsis: Tutorial, tests and example programs for regex Description: Tutorial, tests and example programs for regex, a Regular Expression Toolkit for regex-base with @@ -63,10 +63,53 @@ Source-Repository this Type: git Location: https://github.com/iconnect/regex.git - Tag: 0.10.0.0 + Tag: 0.10.0.1 +Library + Hs-Source-Dirs: . + Exposed-Modules: + Text.RE.Internal.Examples + Default-Language: Haskell2010 + + Other-Extensions: + AllowAmbiguousTypes + CPP + DeriveDataTypeable + DeriveGeneric + ExistentialQuantification + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GeneralizedNewtypeDeriving + MultiParamTypeClasses + NoImplicitPrelude + OverloadedStrings + QuasiQuotes + RecordWildCards + ScopedTypeVariables + TemplateHaskell + TypeSynonymInstances + UndecidableInstances + + if !impl(ghc >= 8.0) + Other-Extensions: TemplateHaskell + else + Other-Extensions: TemplateHaskellQuotes + + GHC-Options: + -Wall + -fwarn-tabs + -Wwarn + + Build-depends: + array + , base + + + + Executable re-gen-cabals Hs-Source-Dirs: examples @@ -83,7 +126,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -113,7 +156,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -140,7 +183,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -166,7 +209,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -195,7 +238,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -221,7 +264,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -244,8 +287,8 @@ -Wwarn Build-depends: - regex == 0.10.0.0 - , regex-with-pcre == 0.10.0.0 + regex == 0.10.0.1 + , regex-with-pcre == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -275,8 +318,8 @@ -Wwarn Build-depends: - regex == 0.10.0.0 - , regex-with-pcre == 0.10.0.0 + regex == 0.10.0.1 + , regex-with-pcre == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -309,7 +352,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -337,7 +380,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , base >= 4 && < 5 , base-compat >= 0.6.0 , bytestring >= 0.10.2.0 @@ -365,8 +408,8 @@ -Wwarn Build-depends: - regex == 0.10.0.0 - , regex-with-pcre == 0.10.0.0 + regex == 0.10.0.1 + , regex-with-pcre == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -404,8 +447,8 @@ -Wwarn Build-depends: - regex == 0.10.0.0 - , regex-with-pcre == 0.10.0.0 + regex == 0.10.0.1 + , regex-with-pcre == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -444,7 +487,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -488,7 +531,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0 @@ -534,7 +577,7 @@ -Wwarn Build-depends: - regex == 0.10.0.0 + regex == 0.10.0.1 , array >= 0.4 , base >= 4 && < 5 , base-compat >= 0.6.0