From 80758c4aec6d1808f560d32be7e18eacf48de891 Mon Sep 17 00:00:00 2001 From: Raymond Hogenson Date: Fri, 25 May 2018 16:14:42 -0800 Subject: Rename application to hsc It's a more professional name, although pretty stupid. I should spend some time to come up with a good name. On the other hand, it's for "internal use only" so maybe it doesn't matter. Well, also I took the time to GPL it, so I guess the moral is that I'm bored. --- .gitignore | 2 ++ Expr.hs | 8 +++---- RealCalc.hs | 8 +++---- hsc.cabal | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.hs | 8 +++---- realCalc.cabal | 71 ---------------------------------------------------------- 6 files changed, 85 insertions(+), 83 deletions(-) create mode 100644 hsc.cabal delete mode 100644 realCalc.cabal diff --git a/.gitignore b/.gitignore index e49fa12..6283f66 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ .cabal-sandbox cabal.sandbox.config dist +shell.nix +result diff --git a/Expr.hs b/Expr.hs index 6e12a87..06bbea6 100644 --- a/Expr.hs +++ b/Expr.hs @@ -1,20 +1,20 @@ {- - Copyright 2018 Raymond Hogenson - - - This file is part of RealCalc. + - This file is part of HSC. - - RealCalc is free software: you can redistribute it and/or modify + - HSC is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - - RealCalc is distributed in the hope that it will be useful, + - HSC is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - - along with RealCalc. If not, see . + - along with HSC. If not, see . -} module Expr (parseE, Expr(..)) where diff --git a/RealCalc.hs b/RealCalc.hs index df2e06d..ac8ecb5 100644 --- a/RealCalc.hs +++ b/RealCalc.hs @@ -3,20 +3,20 @@ {- - Copyright 2018 Raymond Hogenson - - - This file is part of RealCalc. + - This file is part of HSC. - - RealCalc is free software: you can redistribute it and/or modify + - HSC is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - - RealCalc is distributed in the hope that it will be useful, + - HSC is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - - along with RealCalc. If not, see . + - along with HSC. If not, see . -} module RealCalc (calculate) where diff --git a/hsc.cabal b/hsc.cabal new file mode 100644 index 0000000..1f1f883 --- /dev/null +++ b/hsc.cabal @@ -0,0 +1,71 @@ +-- Initial hsc.cabal generated by cabal init. For further +-- documentation, see http://haskell.org/cabal/users-guide/ + +-- The name of the package. +name: hsc + +-- The package version. See the Haskell package versioning policy (PVP) +-- for standards guiding when and how versions should be incremented. +-- https://wiki.haskell.org/Package_versioning_policy +-- PVP summary: +-+------- breaking API changes +-- | | +----- non-breaking API additions +-- | | | +--- code changes with no API change +version: 0.1 + +-- A short (one-line) description of the package. +synopsis: Probably something like this already exists + +description: A small calculator meant to be opened with a keybinding for quick + calculations. + +-- A longer description of the package. +-- description: + +-- The license under which the package is released. +license: GPL-3 + +-- The file containing the license text. +license-file: LICENSE + +-- The package author(s). +author: Raymond Hogenson + +-- An email address to which users can send suggestions, bug reports, and +-- patches. +maintainer: rhogenson@posteo.net + +-- A copyright notice. +-- copyright: + +category: Math + +build-type: Simple + +-- Extra files to be distributed with the package, such as examples or a +-- README. +extra-source-files: ChangeLog.md + +-- Constraint on the version of Cabal needed to build this package. +cabal-version: >=1.10 + + +executable hsc + -- .hs or .lhs file containing the Main module. + main-is: main.hs + + -- Modules included in this executable, other than Main. + other-modules: Expr RealCalc + + -- LANGUAGE extensions used by modules in this package. + -- other-extensions: + + -- Other library packages from which modules are imported. + build-depends: base >=4.9 && <5.0, containers >=0.5 && <1.0, parsec >=3.1 && <4.0, gtk3 >=0.14.6 && <1.0.0 + + -- Directories containing source files. + -- hs-source-dirs: + + -- Base language which the package is written in. + default-language: Haskell2010 + + ghc-options: -Wall -rtsopts diff --git a/main.hs b/main.hs index 014f1ac..ef76160 100644 --- a/main.hs +++ b/main.hs @@ -3,20 +3,20 @@ {- - Copyright 2018 Raymond Hogenson - - - This file is part of RealCalc. + - This file is part of HSC. - - RealCalc is free software: you can redistribute it and/or modify + - HSC is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - - RealCalc is distributed in the hope that it will be useful, + - HSC is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - - along with RealCalc. If not, see . + - along with HSC. If not, see . -} import Graphics.UI.Gtk diff --git a/realCalc.cabal b/realCalc.cabal deleted file mode 100644 index 26d9e42..0000000 --- a/realCalc.cabal +++ /dev/null @@ -1,71 +0,0 @@ --- Initial realCalc.cabal generated by cabal init. For further --- documentation, see http://haskell.org/cabal/users-guide/ - --- The name of the package. -name: realCalc - --- The package version. See the Haskell package versioning policy (PVP) --- for standards guiding when and how versions should be incremented. --- https://wiki.haskell.org/Package_versioning_policy --- PVP summary: +-+------- breaking API changes --- | | +----- non-breaking API additions --- | | | +--- code changes with no API change -version: 0.1 - --- A short (one-line) description of the package. -synopsis: Probably something like this already exists - -description: A small calculator meant to be opened with a keybinding for quick - calculations. - --- A longer description of the package. --- description: - --- The license under which the package is released. -license: GPL-3 - --- The file containing the license text. -license-file: LICENSE - --- The package author(s). -author: Raymond Hogenson - --- An email address to which users can send suggestions, bug reports, and --- patches. -maintainer: rhogenson@posteo.net - --- A copyright notice. --- copyright: - -category: Math - -build-type: Simple - --- Extra files to be distributed with the package, such as examples or a --- README. -extra-source-files: ChangeLog.md - --- Constraint on the version of Cabal needed to build this package. -cabal-version: >=1.10 - - -executable realCalc - -- .hs or .lhs file containing the Main module. - main-is: main.hs - - -- Modules included in this executable, other than Main. - -- other-modules: - - -- LANGUAGE extensions used by modules in this package. - -- other-extensions: - - -- Other library packages from which modules are imported. - build-depends: base >=4.9 && <5.0, containers >=0.5 && <1.0, parsec >=3.1 && <4.0, gtk3 >=0.14.8 && <1.0.0 - - -- Directories containing source files. - -- hs-source-dirs: - - -- Base language which the package is written in. - default-language: Haskell2010 - - ghc-options: -Wall -- cgit v1.3.1