diff --git a/.gitignore b/.gitignore index e924601..a27c3c5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,7 @@ .ghci .hub .ghci -stack.yaml +/stack.yaml README.markdown tmp diff --git a/README.md b/README.md index 0db1925..83ca842 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,9 @@ two packages: - [X] 2017-03-13 v0.6.0.1 [Fix .travis.yml release-stack script](https://github.com/iconnect/regex/issues/67) - [X] 2017-03-15 v0.7.0.0 [Better organization of API](https://github.com/iconnect/regex/milestone/8) - [X] 2017-03-16 v0.8.0.0 [Tidy up the API](https://github.com/iconnect/regex/milestone/10) -- [X] 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) -- [X] 2017-03-18 v0.10.0.0 [Tweak TypeSafe SearchReplace templates](https://github.com/iconnect/regex/milestone/11) +- [X] 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) +- [X] 2017-03-25 v0.10.0.0 [Tweak TypeSafe SearchReplace templates](https://github.com/iconnect/regex/milestone/11) +- [X] 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) - [ ] 2017-08-31 v2.0.0.0 [Fast text replacement with benchmarks](https://github.com/iconnect/regex/milestone/4) diff --git a/Text/RE/Internal/Examples.hs b/Text/RE/Internal/Examples.hs new file mode 100644 index 0000000..7eb379a --- /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 index b002502..5dd6d96 100644 --- 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/docs/badges/build-status.svg b/docs/badges/build-status.svg index 71daaf1..e9ce67a 100644 --- a/docs/badges/build-status.svg +++ b/docs/badges/build-status.svg @@ -1 +1 @@ -Build StatusBuild Statuspassingpassing \ No newline at end of file +Build StatusBuild Statusfailingfailing \ No newline at end of file diff --git a/docs/badges/hackage.svg b/docs/badges/hackage.svg index 1ff5347..a979431 100644 --- a/docs/badges/hackage.svg +++ b/docs/badges/hackage.svg @@ -15,7 +15,7 @@ hackage hackage - v0.10.0.0 - v0.10.0.0 + v0.10.0.1 + v0.10.0.1 diff --git a/docs/badges/unix-build.svg b/docs/badges/unix-build.svg index 48087d3..7aa1411 100644 --- a/docs/badges/unix-build.svg +++ b/docs/badges/unix-build.svg @@ -1 +1 @@ -Linux+macOSLinux+macOSpassingpassing \ No newline at end of file +Linux+macOSLinux+macOSfailingfailing \ No newline at end of file diff --git a/docs/changelog.html b/docs/changelog.html index ac6663c..c0c14c9 100644 --- a/docs/changelog.html +++ b/docs/changelog.html @@ -126,6 +126,9 @@ 

-*-change-log-*-
 
+0.10.0.1 Chris Dornan <chris.dornan@irisconnect.co.uk> 2017-03-26
+  * Fix sub-package cabal files (#88)
+
 0.10.0.0 Chris Dornan <chris.dornan@irisconnect.co.uk> 2017-03-25
   * Tweak Type-Safe SearchReplace templates (#86)
   * Add escape methods to IsRegex (#87)
diff --git a/docs/index.html b/docs/index.html
index fe4c2cc..79679f8 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -166,10 +166,13 @@ 

 2017-03-16 v0.8.0.0 Tidy up the API
 
 
  • 
-2017-03-18 v0.9.0.0 Finish tidying up the API, Add type-safe replacement templates and exploit TemplateHaskellQuotes
+2017-03-24 v0.9.0.0 Finish tidying up the API, Add type-safe replacement templates and exploit TemplateHaskellQuotes
 
    • 
 
  • 
-2017-03-18 v0.10.0.0 Tweak TypeSafe SearchReplace templates
+2017-03-25 v0.10.0.0 Tweak TypeSafe SearchReplace templates
+
    • 
+
  • 
+2017-03-26 v0.10.0.1 Fix release
 
    • 
 
  • 
 2017-03-31 v1.0.0.0 First stable release
diff --git a/docs/re-gen-cabals.html b/docs/re-gen-cabals.html
index 27068e3..67a3520 100644
--- a/docs/re-gen-cabals.html
+++ b/docs/re-gen-cabals.html
@@ -171,7 +171,7 @@ 
    Regex Cabal Gen
    
     , 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
@@ -350,6 +350,7 @@ 
    Regex Cabal Gen
    
   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"]
@@ -397,7 +398,26 @@ 
    Regex Cabal Gen
    
   lns <- linesMatched LinesMatched <$> grepLines rex "lib/md/roadmap-incl.md"
   case lns of
     [Line _ (Matches _ [mtch])] -> return $ TE.decodeUtf8 $ LBS.toStrict $ mtch !$$ [cp|smy|]
-    _ -> error "failed to locate the summary text in the roadmap"
    • + _ -> 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

    let vrn_res = concat [ show $ _vrn_a vrn, "\.", show $ _vrn_b vrn, "\.", show $ _vrn_c vrn, "\.", show $ _vrn_d vrn ]