From c336af2b0e9413d2f3cfb4f3c939fcee8939685d Mon Sep 17 00:00:00 2001 From: Don Stewart Date: Sat, 3 Sep 2005 06:38:06 +0000 Subject: [PATCH] mv code back into src/. Kindly pointed out by Lemmih --- configure | 2 +- configure.ac | 2 +- plugins.cabal | 3 ++- plugins.cabal.hsx | 4 ++-- {AltData => src/AltData}/Dynamic.hs | 0 {AltData => src/AltData}/Typeable.hs | 0 {Language => src/Language}/Hi/Binary.hs | 0 {Language => src/Language}/Hi/FastMutInt.hs | 0 {Language => src/Language}/Hi/FastString.hs | 0 {Language => src/Language}/Hi/Parser.hs | 2 +- {Language => src/Language}/Hi/PrimPacked.hs | 0 {Language => src/Language}/Hi/Syntax.hs | 0 {Language => src/Language}/Hi/hschooks.c | 0 {Language => src/Language}/Hi/hschooks.h | 0 {System => src/System}/Eval.hs | 0 {System => src/System}/Eval/Haskell.hs | 0 {System => src/System}/Eval/Utils.hs | 0 {System => src/System}/MkTemp.hs | 0 {System => src/System}/Plugins.hs | 0 {System => src/System}/Plugins/Consts.hs | 2 +- {System => src/System}/Plugins/Env.hs | 2 +- {System => src/System}/Plugins/Load.hs | 2 +- {System => src/System}/Plugins/LoadTypes.hs | 0 {System => src/System}/Plugins/Make.hs | 0 {System => src/System}/Plugins/Package.hs | 0 {System => src/System}/Plugins/PackageAPI.hs | 2 +- {System => src/System}/Plugins/ParsePkgConfCabal.hs | 0 {System => src/System}/Plugins/ParsePkgConfCabal.y_in | 0 {System => src/System}/Plugins/ParsePkgConfLite.hs | 0 {System => src/System}/Plugins/ParsePkgConfLite.y | 0 {System => src/System}/Plugins/Parser.hs | 2 +- {System => src/System}/Plugins/Process.hs | 0 {System => src/System}/Plugins/Utils.hs | 2 +- 33 files changed, 13 insertions(+), 12 deletions(-) rename {AltData => src/AltData}/Dynamic.hs (100%) rename {AltData => src/AltData}/Typeable.hs (100%) rename {Language => src/Language}/Hi/Binary.hs (100%) rename {Language => src/Language}/Hi/FastMutInt.hs (100%) rename {Language => src/Language}/Hi/FastString.hs (100%) rename {Language => src/Language}/Hi/Parser.hs (99%) rename {Language => src/Language}/Hi/PrimPacked.hs (100%) rename {Language => src/Language}/Hi/Syntax.hs (100%) rename {Language => src/Language}/Hi/hschooks.c (100%) rename {Language => src/Language}/Hi/hschooks.h (100%) rename {System => src/System}/Eval.hs (100%) rename {System => src/System}/Eval/Haskell.hs (100%) rename {System => src/System}/Eval/Utils.hs (100%) rename {System => src/System}/MkTemp.hs (100%) rename {System => src/System}/Plugins.hs (100%) rename {System => src/System}/Plugins/Consts.hs (98%) rename {System => src/System}/Plugins/Env.hs (99%) rename {System => src/System}/Plugins/Load.hs (99%) rename {System => src/System}/Plugins/LoadTypes.hs (100%) rename {System => src/System}/Plugins/Make.hs (100%) rename {System => src/System}/Plugins/Package.hs (100%) rename {System => src/System}/Plugins/PackageAPI.hs (98%) rename {System => src/System}/Plugins/ParsePkgConfCabal.hs (100%) rename {System => src/System}/Plugins/ParsePkgConfCabal.y_in (100%) rename {System => src/System}/Plugins/ParsePkgConfLite.hs (100%) rename {System => src/System}/Plugins/ParsePkgConfLite.y (100%) rename {System => src/System}/Plugins/Parser.hs (99%) rename {System => src/System}/Plugins/Process.hs (100%) rename {System => src/System}/Plugins/Utils.hs (99%) diff --git a/configure b/configure index 652b40f..f61d743 100644 --- a/configure +++ b/configure @@ -271,7 +271,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= -ac_unique_file="System/Plugins.hs" +ac_unique_file="src/System/Plugins.hs" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os PREFIX TOP GHC GLASGOW_HASKELL HASKELL_SRC TEX TEX2PAGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LIBOBJS LTLIBOBJS' ac_subst_files='' diff --git a/configure.ac b/configure.ac index 3708895..4c118f5 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ # only AC_DEFINES are visible in Haskell src # sanity test -AC_INIT(System/Plugins.hs) +AC_INIT(src/System/Plugins.hs) # Prepare to generate the config.h.in file AC_CONFIG_HEADERS([config.h]) diff --git a/plugins.cabal b/plugins.cabal index c7b62e1..00a999a 100644 --- a/plugins.cabal +++ b/plugins.cabal @@ -30,8 +30,9 @@ exposed-modules: System.Plugins.Process, System.Plugins.Utils c-sources: - Language/Hi/hschooks.c + src/Language/Hi/hschooks.c includes: Linker.h extensions: CPP, ForeignFunctionInterface Build-Depends: base, Cabal, haskell-src ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures +Hs-source-dirs: src diff --git a/plugins.cabal.hsx b/plugins.cabal.hsx index a843a0b..62b8825 100644 --- a/plugins.cabal.hsx +++ b/plugins.cabal.hsx @@ -30,9 +30,9 @@ exposed-modules: System.Plugins.Process, System.Plugins.Utils c-sources: - Language/Hi/hschooks.c + src/Language/Hi/hschooks.c includes: Linker.h extensions: CPP, ForeignFunctionInterface Build-Depends: base, Cabal, haskell-src-exts ghc-options: -Wall -O -fvia-C -funbox-strict-fields -fno-warn-missing-signatures - +Hs-source-dirs: src diff --git a/AltData/Dynamic.hs b/src/AltData/Dynamic.hs similarity index 100% rename from AltData/Dynamic.hs rename to src/AltData/Dynamic.hs diff --git a/AltData/Typeable.hs b/src/AltData/Typeable.hs similarity index 100% rename from AltData/Typeable.hs rename to src/AltData/Typeable.hs diff --git a/Language/Hi/Binary.hs b/src/Language/Hi/Binary.hs similarity index 100% rename from Language/Hi/Binary.hs rename to src/Language/Hi/Binary.hs diff --git a/Language/Hi/FastMutInt.hs b/src/Language/Hi/FastMutInt.hs similarity index 100% rename from Language/Hi/FastMutInt.hs rename to src/Language/Hi/FastMutInt.hs diff --git a/Language/Hi/FastString.hs b/src/Language/Hi/FastString.hs similarity index 100% rename from Language/Hi/FastString.hs rename to src/Language/Hi/FastString.hs diff --git a/Language/Hi/Parser.hs b/src/Language/Hi/Parser.hs similarity index 99% rename from Language/Hi/Parser.hs rename to src/Language/Hi/Parser.hs index f8d4538..db19b19 100644 --- a/Language/Hi/Parser.hs +++ b/src/Language/Hi/Parser.hs @@ -48,7 +48,7 @@ import Language.Hi.Syntax import Language.Hi.Binary import Language.Hi.FastString -#include "../../config.h" +#include "../../../config.h" -- --------------------------------------------------------------------------- -- how to get there from here diff --git a/Language/Hi/PrimPacked.hs b/src/Language/Hi/PrimPacked.hs similarity index 100% rename from Language/Hi/PrimPacked.hs rename to src/Language/Hi/PrimPacked.hs diff --git a/Language/Hi/Syntax.hs b/src/Language/Hi/Syntax.hs similarity index 100% rename from Language/Hi/Syntax.hs rename to src/Language/Hi/Syntax.hs diff --git a/Language/Hi/hschooks.c b/src/Language/Hi/hschooks.c similarity index 100% rename from Language/Hi/hschooks.c rename to src/Language/Hi/hschooks.c diff --git a/Language/Hi/hschooks.h b/src/Language/Hi/hschooks.h similarity index 100% rename from Language/Hi/hschooks.h rename to src/Language/Hi/hschooks.h diff --git a/System/Eval.hs b/src/System/Eval.hs similarity index 100% rename from System/Eval.hs rename to src/System/Eval.hs diff --git a/System/Eval/Haskell.hs b/src/System/Eval/Haskell.hs similarity index 100% rename from System/Eval/Haskell.hs rename to src/System/Eval/Haskell.hs diff --git a/System/Eval/Utils.hs b/src/System/Eval/Utils.hs similarity index 100% rename from System/Eval/Utils.hs rename to src/System/Eval/Utils.hs diff --git a/System/MkTemp.hs b/src/System/MkTemp.hs similarity index 100% rename from System/MkTemp.hs rename to src/System/MkTemp.hs diff --git a/System/Plugins.hs b/src/System/Plugins.hs similarity index 100% rename from System/Plugins.hs rename to src/System/Plugins.hs diff --git a/System/Plugins/Consts.hs b/src/System/Plugins/Consts.hs similarity index 98% rename from System/Plugins/Consts.hs rename to src/System/Plugins/Consts.hs index 7882f37..e75b0b0 100644 --- a/System/Plugins/Consts.hs +++ b/src/System/Plugins/Consts.hs @@ -19,7 +19,7 @@ module System.Plugins.Consts where -#include "../../config.h" +#include "../../../config.h" #if __GLASGOW_HASKELL__ >= 604 diff --git a/System/Plugins/Env.hs b/src/System/Plugins/Env.hs similarity index 99% rename from System/Plugins/Env.hs rename to src/System/Plugins/Env.hs index 43e04dc..b588143 100644 --- a/System/Plugins/Env.hs +++ b/src/System/Plugins/Env.hs @@ -45,7 +45,7 @@ module System.Plugins.Env ( ) where -#include "../../config.h" +#include "../../../config.h" import System.Plugins.LoadTypes (Module) import System.Plugins.PackageAPI {- everything -} diff --git a/System/Plugins/Load.hs b/src/System/Plugins/Load.hs similarity index 99% rename from System/Plugins/Load.hs rename to src/System/Plugins/Load.hs index 9250e39..4c60a2b 100644 --- a/System/Plugins/Load.hs +++ b/src/System/Plugins/Load.hs @@ -49,7 +49,7 @@ module System.Plugins.Load ( ) where -#include "../../config.h" +#include "../../../config.h" import System.Plugins.Make ( build ) import System.Plugins.Env diff --git a/System/Plugins/LoadTypes.hs b/src/System/Plugins/LoadTypes.hs similarity index 100% rename from System/Plugins/LoadTypes.hs rename to src/System/Plugins/LoadTypes.hs diff --git a/System/Plugins/Make.hs b/src/System/Plugins/Make.hs similarity index 100% rename from System/Plugins/Make.hs rename to src/System/Plugins/Make.hs diff --git a/System/Plugins/Package.hs b/src/System/Plugins/Package.hs similarity index 100% rename from System/Plugins/Package.hs rename to src/System/Plugins/Package.hs diff --git a/System/Plugins/PackageAPI.hs b/src/System/Plugins/PackageAPI.hs similarity index 98% rename from System/Plugins/PackageAPI.hs rename to src/System/Plugins/PackageAPI.hs index 1999ad8..7ac4201 100644 --- a/System/Plugins/PackageAPI.hs +++ b/src/System/Plugins/PackageAPI.hs @@ -36,7 +36,7 @@ module System.Plugins.PackageAPI ( , updLibraryDirs ) where -#include "../../config.h" +#include "../../../config.h" #if CABAL == 1 || __GLASGOW_HASKELL__ >= 604 import Distribution.InstalledPackageInfo diff --git a/System/Plugins/ParsePkgConfCabal.hs b/src/System/Plugins/ParsePkgConfCabal.hs similarity index 100% rename from System/Plugins/ParsePkgConfCabal.hs rename to src/System/Plugins/ParsePkgConfCabal.hs diff --git a/System/Plugins/ParsePkgConfCabal.y_in b/src/System/Plugins/ParsePkgConfCabal.y_in similarity index 100% rename from System/Plugins/ParsePkgConfCabal.y_in rename to src/System/Plugins/ParsePkgConfCabal.y_in diff --git a/System/Plugins/ParsePkgConfLite.hs b/src/System/Plugins/ParsePkgConfLite.hs similarity index 100% rename from System/Plugins/ParsePkgConfLite.hs rename to src/System/Plugins/ParsePkgConfLite.hs diff --git a/System/Plugins/ParsePkgConfLite.y b/src/System/Plugins/ParsePkgConfLite.y similarity index 100% rename from System/Plugins/ParsePkgConfLite.y rename to src/System/Plugins/ParsePkgConfLite.y diff --git a/System/Plugins/Parser.hs b/src/System/Plugins/Parser.hs similarity index 99% rename from System/Plugins/Parser.hs rename to src/System/Plugins/Parser.hs index 4f9a2f9..352d589 100644 --- a/System/Plugins/Parser.hs +++ b/src/System/Plugins/Parser.hs @@ -24,7 +24,7 @@ module System.Plugins.Parser ( replaceModName ) where -#include "../../config.h" +#include "../../../config.h" import Data.List import Data.Char diff --git a/System/Plugins/Process.hs b/src/System/Plugins/Process.hs similarity index 100% rename from System/Plugins/Process.hs rename to src/System/Plugins/Process.hs diff --git a/System/Plugins/Utils.hs b/src/System/Plugins/Utils.hs similarity index 99% rename from System/Plugins/Utils.hs rename to src/System/Plugins/Utils.hs index d1a5673..ed9e19b 100644 --- a/System/Plugins/Utils.hs +++ b/src/System/Plugins/Utils.hs @@ -56,7 +56,7 @@ module System.Plugins.Utils ( ) where -#include "../../config.h" +#include "../../../config.h" import System.Plugins.Env ( isLoaded ) import System.Plugins.Consts ( objSuf, hiSuf, tmpDir )