diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -6,10 +6,11 @@ -- import Language.Haskell.Imports.Params (runParamsT) import System.Cmd (system) import System.Exit (ExitCode(ExitSuccess)) -import System.Directory (setCurrentDirectory) +import System.Directory (setCurrentDirectory, copyFile) import System.FilePath (()) -main = defaultMainWithHooks simpleUserHooks +main = copyFile "debian/changelog" "changelog" >> + defaultMainWithHooks simpleUserHooks { sDistHook = \ p l u f -> system "tar cfz testdata.tar.gz testdata" >> (sDistHook simpleUserHooks) p l u f -- , postBuild = \ _ _ _ lbi -> do code <- system (buildDir lbi "tests/tests") diff --git a/changelog b/changelog new file mode 100644 --- /dev/null +++ b/changelog @@ -0,0 +1,254 @@ +haskell-module-management (0.17.3) unstable; urgency=low + + * Make changelog visible in hackage2. + + -- David Fox Tue, 15 Oct 2013 07:43:41 -0700 + +haskell-module-management (0.17.2) unstable; urgency=low + + * Changes from Adam Vogt for cabal-1.18, nicer path completion. + + -- David Fox Fri, 13 Sep 2013 11:30:43 -0700 + +haskell-module-management (0.17.1) unstable; urgency=low + + * Restore the -O0 option to the build of hmm. + + -- David Fox Wed, 04 Sep 2013 06:38:41 -0700 + +haskell-module-management (0.17) unstable; urgency=low + + * Changes for haskell-src-exts-1.14.0 + + -- David Fox Tue, 03 Sep 2013 06:43:41 -0700 + +haskell-module-management (0.16.1) unstable; urgency=low + + * Add missing CLI files to extra-source-files list + + -- David Fox Fri, 16 Aug 2013 11:17:34 -0700 + +haskell-module-management (0.16) unstable; urgency=low + + * Use haskeline in the hmm program (Adam Vogt) + * use case insensitive completion when it is unambiguous (Adam Vogt) + * Clean up issues involving fixities (Adam Vogt) + * Preliminary support for cabal files (Adam Vogt) + * And more by Adam... + + -- David Fox Fri, 16 Aug 2013 08:48:58 -0700 + +haskell-module-management (0.15.1) unstable; urgency=low + + * Documentation updates. + + -- David Fox Wed, 24 Jul 2013 09:45:11 -0700 + +haskell-module-management (0.15) unstable; urgency=low + + * Implement parsing of files which need the XmlSyntax extension (e.g. files + that need the hsx2hs preprocessor.) + * Add extraImport m i, which insert an import of module i when + generating module m. + * Use lifted-base and monad-control instead of the deprecated library + MonadCatchIO-mtl. + + -- David Fox Fri, 19 Jul 2013 09:52:38 -0700 + +haskell-module-management (0.14) unstable; urgency=low + + * Use ModuleName type in some places where were were using String. + + -- David Fox Wed, 17 Jul 2013 11:10:49 -0700 + +haskell-module-management (0.13) unstable; urgency=low + + * Changed cleanImports and cleanResults functions to take a list of + paths and process multiple files at once. This changed reduced the + run time of test suite from 15 minutes to 30 seconds. + * Rename runMonadClean -> runCleanT + * Simplify splitModule function signatures + + -- David Fox Sun, 14 Jul 2013 10:41:51 -0700 + +haskell-module-management (0.12.1) unstable; urgency=low + + * Have pathKey and modulePath search the SourceDirs list for files. + * Fix handling of tabs - I thought haskell-src-exts worked in expanded + tab coordinates, it does not. + * Update re-exports split modules. + * Add an extraImports parameter to force a module to import certain + other modules despite what --dump-minimal-imports says. This is + sometimes needed to get access to required instances. + + -- David Fox Wed, 10 Jul 2013 15:07:28 -0700 + +haskell-module-management (0.12) unstable; urgency=low + + * splitModule and splitModuleDecls now take a FilePath instead of + a module name. + * Substantial improvements to mergeModules + + -- David Fox Thu, 04 Jul 2013 07:15:23 -0700 + +haskell-module-management (0.11.1) unstable; urgency=low + + * Export defaultSymbolToModule + * Allow moduleSplit to leave some symbols in the original module + + -- David Fox Tue, 02 Jul 2013 10:31:13 -0700 + +haskell-module-management (0.11) unstable; urgency=low + + * Rename splitModule -> splitModuleDecls + * Add new splitModule that takes a function describing the + symbol to module mapping. + + -- David Fox Tue, 02 Jul 2013 09:54:00 -0700 + +haskell-module-management (0.10.1) unstable; urgency=low + + * Changes to compile under ghc-7.4.1 + * Formatting fix - eliminate extra newline added to split modules + * Find a way to include the test data without listing hundreds of files + * Add testdata tarball and debian/changelog to distribution + * Performance fixes + + -- David Fox Sat, 29 Jun 2013 16:57:20 -0700 + +haskell-module-management (0.10) unstable; urgency=low + + * Extend documentation + * Fix bug which moved comments after last deco to before the first decl + * Add a rather nasty cli - Maybe shell commands are a better idea + * Fix fold so space and comments are not associated with the previous + decl, the now belong to the following decl. + + -- David Fox Sat, 29 Jun 2013 11:27:36 -0700 + +haskell-module-management (0.9.3.1) unstable; urgency=low + + * Fix the package home page URL. + + -- David Fox Thu, 27 Jun 2013 17:05:35 -0700 + +haskell-module-management (0.9.3) unstable; urgency=low + + * Clean up documentation for release. + + -- David Fox Thu, 27 Jun 2013 14:00:17 -0700 + +haskell-module-management (0.9.2) unstable; urgency=low + + * Add a simple CLI (from Cliff Beshers) + * splitModule: Put instance declarations into an Instances module + * splitModule: Put re-exports into a ReExported module + * splitModule: Put previously private declarations into an Internal subdir + * cleanImports: Fix the way imports of types that appear in standalone + derivations are modified so their members become visible. + + -- David Fox Fri, 21 Jun 2013 12:39:52 -0700 + +haskell-module-management (0.9.1) unstable; urgency=low + + * Fix verbosity handling + * Manage the set of existing modules when splits and cats occur + * Handle files with no final newline + * Speed up text handling + + -- David Fox Tue, 18 Jun 2013 07:13:29 -0700 + +haskell-module-management (0.9) unstable; urgency=low + + * Major revision + + -- David Fox Sun, 16 Jun 2013 10:29:13 -0700 + +haskell-module-management (0.8.4) unstable; urgency=low + + * Preserve imports required to re-export symbols in split modules. + + -- David Fox Wed, 12 Jun 2013 17:02:35 -0700 + +haskell-module-management (0.8.3) unstable; urgency=low + + * Make sure identifiers imported by "as" imports get updated when modules are catted + + -- David Fox Wed, 12 Jun 2013 15:31:38 -0700 + +haskell-module-management (0.8.2) unstable; urgency=low + + * Similar fix to the one in 0.8.1, but for the imports of a split + module. + + -- David Fox Wed, 12 Jun 2013 13:27:58 -0700 + +haskell-module-management (0.8.1) unstable; urgency=low + + * Fix handling of declarations with top level and member symbols. There + are still some remaining issues with this when declaring multiple top + level symbols in a single declaration. + + -- David Fox Wed, 12 Jun 2013 12:56:10 -0700 + +haskell-module-management (0.8) unstable; urgency=low + + * Clean up for release + + -- David Fox Sun, 09 Jun 2013 11:15:55 -0700 + +haskell-module-management (0.7.1) unstable; urgency=low + + * Preserve imports of constructors required for standalone deriving declarations + + -- David Fox Thu, 06 Jun 2013 11:23:59 -0700 + +haskell-module-management (0.7) unstable; urgency=low + + * Add an extensions_ field to Params, and a modifyExtensions + to update the list of extensions used to parse each file. + + -- David Fox Wed, 05 Jun 2013 16:11:29 -0700 + +haskell-module-management (0.6.2) unstable; urgency=low + + * Preserve "hiding" imports in cleanImports. + + -- David Fox Wed, 05 Jun 2013 13:03:15 -0700 + +haskell-module-management (0.6.1) unstable; urgency=low + + * Fix how cleanImports handles modules that are not where their module + name implies. + + -- David Fox Wed, 05 Jun 2013 09:20:36 -0700 + +haskell-module-management (0.6) unstable; urgency=low + + * Rename module heirarchy, add Exports.hs, generalize Cat. + + -- David Fox Sat, 01 Jun 2013 10:00:01 -0700 + +haskell-module-management (0.5) unstable; urgency=low + + * Add catModules. + + -- David Fox Sat, 25 May 2013 07:55:50 -0700 + +haskell-module-management (0.4) unstable; urgency=low + + * Now provides cleanImports, moveModule, splitModule, and foldModule. + + -- David Fox Thu, 23 May 2013 14:14:30 -0700 + +haskell-module-management (0.3) unstable; urgency=low + + * Sort and merge import declarations properly + + -- David Fox Tue, 14 May 2013 14:03:32 -0700 + +haskell-module-management (0.2) unstable; urgency=low + + * Debianization generated by cabal-debian + + -- David Fox Wed, 08 May 2013 10:00:45 -0700 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 --- a/debian/changelog +++ /dev/null @@ -1,248 +0,0 @@ -haskell-module-management (0.17.2) unstable; urgency=low - - * Changes from Adam Vogt for cabal-1.18, nicer path completion. - - -- David Fox Fri, 13 Sep 2013 11:30:43 -0700 - -haskell-module-management (0.17.1) unstable; urgency=low - - * Restore the -O0 option to the build of hmm. - - -- David Fox Wed, 04 Sep 2013 06:38:41 -0700 - -haskell-module-management (0.17) unstable; urgency=low - - * Changes for haskell-src-exts-1.14.0 - - -- David Fox Tue, 03 Sep 2013 06:43:41 -0700 - -haskell-module-management (0.16.1) unstable; urgency=low - - * Add missing CLI files to extra-source-files list - - -- David Fox Fri, 16 Aug 2013 11:17:34 -0700 - -haskell-module-management (0.16) unstable; urgency=low - - * Use haskeline in the hmm program (Adam Vogt) - * use case insensitive completion when it is unambiguous (Adam Vogt) - * Clean up issues involving fixities (Adam Vogt) - * Preliminary support for cabal files (Adam Vogt) - * And more by Adam... - - -- David Fox Fri, 16 Aug 2013 08:48:58 -0700 - -haskell-module-management (0.15.1) unstable; urgency=low - - * Documentation updates. - - -- David Fox Wed, 24 Jul 2013 09:45:11 -0700 - -haskell-module-management (0.15) unstable; urgency=low - - * Implement parsing of files which need the XmlSyntax extension (e.g. files - that need the hsx2hs preprocessor.) - * Add extraImport m i, which insert an import of module i when - generating module m. - * Use lifted-base and monad-control instead of the deprecated library - MonadCatchIO-mtl. - - -- David Fox Fri, 19 Jul 2013 09:52:38 -0700 - -haskell-module-management (0.14) unstable; urgency=low - - * Use ModuleName type in some places where were were using String. - - -- David Fox Wed, 17 Jul 2013 11:10:49 -0700 - -haskell-module-management (0.13) unstable; urgency=low - - * Changed cleanImports and cleanResults functions to take a list of - paths and process multiple files at once. This changed reduced the - run time of test suite from 15 minutes to 30 seconds. - * Rename runMonadClean -> runCleanT - * Simplify splitModule function signatures - - -- David Fox Sun, 14 Jul 2013 10:41:51 -0700 - -haskell-module-management (0.12.1) unstable; urgency=low - - * Have pathKey and modulePath search the SourceDirs list for files. - * Fix handling of tabs - I thought haskell-src-exts worked in expanded - tab coordinates, it does not. - * Update re-exports split modules. - * Add an extraImports parameter to force a module to import certain - other modules despite what --dump-minimal-imports says. This is - sometimes needed to get access to required instances. - - -- David Fox Wed, 10 Jul 2013 15:07:28 -0700 - -haskell-module-management (0.12) unstable; urgency=low - - * splitModule and splitModuleDecls now take a FilePath instead of - a module name. - * Substantial improvements to mergeModules - - -- David Fox Thu, 04 Jul 2013 07:15:23 -0700 - -haskell-module-management (0.11.1) unstable; urgency=low - - * Export defaultSymbolToModule - * Allow moduleSplit to leave some symbols in the original module - - -- David Fox Tue, 02 Jul 2013 10:31:13 -0700 - -haskell-module-management (0.11) unstable; urgency=low - - * Rename splitModule -> splitModuleDecls - * Add new splitModule that takes a function describing the - symbol to module mapping. - - -- David Fox Tue, 02 Jul 2013 09:54:00 -0700 - -haskell-module-management (0.10.1) unstable; urgency=low - - * Changes to compile under ghc-7.4.1 - * Formatting fix - eliminate extra newline added to split modules - * Find a way to include the test data without listing hundreds of files - * Add testdata tarball and debian/changelog to distribution - * Performance fixes - - -- David Fox Sat, 29 Jun 2013 16:57:20 -0700 - -haskell-module-management (0.10) unstable; urgency=low - - * Extend documentation - * Fix bug which moved comments after last deco to before the first decl - * Add a rather nasty cli - Maybe shell commands are a better idea - * Fix fold so space and comments are not associated with the previous - decl, the now belong to the following decl. - - -- David Fox Sat, 29 Jun 2013 11:27:36 -0700 - -haskell-module-management (0.9.3.1) unstable; urgency=low - - * Fix the package home page URL. - - -- David Fox Thu, 27 Jun 2013 17:05:35 -0700 - -haskell-module-management (0.9.3) unstable; urgency=low - - * Clean up documentation for release. - - -- David Fox Thu, 27 Jun 2013 14:00:17 -0700 - -haskell-module-management (0.9.2) unstable; urgency=low - - * Add a simple CLI (from Cliff Beshers) - * splitModule: Put instance declarations into an Instances module - * splitModule: Put re-exports into a ReExported module - * splitModule: Put previously private declarations into an Internal subdir - * cleanImports: Fix the way imports of types that appear in standalone - derivations are modified so their members become visible. - - -- David Fox Fri, 21 Jun 2013 12:39:52 -0700 - -haskell-module-management (0.9.1) unstable; urgency=low - - * Fix verbosity handling - * Manage the set of existing modules when splits and cats occur - * Handle files with no final newline - * Speed up text handling - - -- David Fox Tue, 18 Jun 2013 07:13:29 -0700 - -haskell-module-management (0.9) unstable; urgency=low - - * Major revision - - -- David Fox Sun, 16 Jun 2013 10:29:13 -0700 - -haskell-module-management (0.8.4) unstable; urgency=low - - * Preserve imports required to re-export symbols in split modules. - - -- David Fox Wed, 12 Jun 2013 17:02:35 -0700 - -haskell-module-management (0.8.3) unstable; urgency=low - - * Make sure identifiers imported by "as" imports get updated when modules are catted - - -- David Fox Wed, 12 Jun 2013 15:31:38 -0700 - -haskell-module-management (0.8.2) unstable; urgency=low - - * Similar fix to the one in 0.8.1, but for the imports of a split - module. - - -- David Fox Wed, 12 Jun 2013 13:27:58 -0700 - -haskell-module-management (0.8.1) unstable; urgency=low - - * Fix handling of declarations with top level and member symbols. There - are still some remaining issues with this when declaring multiple top - level symbols in a single declaration. - - -- David Fox Wed, 12 Jun 2013 12:56:10 -0700 - -haskell-module-management (0.8) unstable; urgency=low - - * Clean up for release - - -- David Fox Sun, 09 Jun 2013 11:15:55 -0700 - -haskell-module-management (0.7.1) unstable; urgency=low - - * Preserve imports of constructors required for standalone deriving declarations - - -- David Fox Thu, 06 Jun 2013 11:23:59 -0700 - -haskell-module-management (0.7) unstable; urgency=low - - * Add an extensions_ field to Params, and a modifyExtensions - to update the list of extensions used to parse each file. - - -- David Fox Wed, 05 Jun 2013 16:11:29 -0700 - -haskell-module-management (0.6.2) unstable; urgency=low - - * Preserve "hiding" imports in cleanImports. - - -- David Fox Wed, 05 Jun 2013 13:03:15 -0700 - -haskell-module-management (0.6.1) unstable; urgency=low - - * Fix how cleanImports handles modules that are not where their module - name implies. - - -- David Fox Wed, 05 Jun 2013 09:20:36 -0700 - -haskell-module-management (0.6) unstable; urgency=low - - * Rename module heirarchy, add Exports.hs, generalize Cat. - - -- David Fox Sat, 01 Jun 2013 10:00:01 -0700 - -haskell-module-management (0.5) unstable; urgency=low - - * Add catModules. - - -- David Fox Sat, 25 May 2013 07:55:50 -0700 - -haskell-module-management (0.4) unstable; urgency=low - - * Now provides cleanImports, moveModule, splitModule, and foldModule. - - -- David Fox Thu, 23 May 2013 14:14:30 -0700 - -haskell-module-management (0.3) unstable; urgency=low - - * Sort and merge import declarations properly - - -- David Fox Tue, 14 May 2013 14:03:32 -0700 - -haskell-module-management (0.2) unstable; urgency=low - - * Debianization generated by cabal-debian - - -- David Fox Wed, 08 May 2013 10:00:45 -0700 diff --git a/module-management.cabal b/module-management.cabal --- a/module-management.cabal +++ b/module-management.cabal @@ -1,5 +1,5 @@ Name: module-management -Version: 0.17.2 +Version: 0.17.3 Synopsis: Clean up module imports, split and merge modules Description: Clean up module imports, split and merge modules. Homepage: http://src.seereason.com/module-management @@ -10,7 +10,7 @@ Stability: experimental Build-type: Simple Cabal-version: >=1.8 -Extra-Source-Files: testdata.tar.gz, debian/changelog, scripts/CleanModules.hs, scripts/CLI/Cabal.hs, scripts/CLI/Cabal/Instances.hs, scripts/CLI/HaskelineTransAdapter.hs +Extra-Source-Files: testdata.tar.gz, changelog, scripts/CleanModules.hs, scripts/CLI/Cabal.hs, scripts/CLI/Cabal/Instances.hs, scripts/CLI/HaskelineTransAdapter.hs Flag build-tests Description: build the test executable diff --git a/testdata.tar.gz b/testdata.tar.gz Binary files a/testdata.tar.gz and b/testdata.tar.gz differ