f1eb2de · project-m36 · git.iko.soy

git.iko.soy/project-m36

use cabal's package version macro instead of our own

commitf1eb2ded6233bebf64bb792900ce992a32778d1b authorAgentM <agentm@themactionfaction.com> dateThu 24 Aug 2017, 16:52 (9 years ago) parent9d24a9c

4 files changed+6−23

compare with master

unifiedsplit

.travis.yml+1−1 project-m36.cabal+1−18 src/bin/TutorialD/Interpreter/InformationOperator.hs+1−1 src/bin/TutorialD/tutd.hs+3−3

.travis.yml+1−1

@@ -53,6 +53,6 @@ script:

5353 - cabal sdist

5454 - cabal new-build -w ${HC} -j1

5555 - cabal new-test -w ${HC}

56− - curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s lint src test examples --cpp-define PROJECTM36_VERSION=HLINT

56+ - curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s lint src test examples

5757

5858# EOF

project-m36.cabal+1−18

@@ -1,5 +1,5 @@

11Name: project-m36

2−Version: 0.1

2+Version: 0.2

33License: PublicDomain

44Build-Type: Simple

55Homepage: https://github.com/agentm/project-m36

@@ -216,7 +216,6 @@ Executable tutd

216216 TutorialD.Interpreter.TransGraphRelationalOperator,

217217 TutorialD.Interpreter.SchemaOperator

218218 main-is: TutorialD/tutd.hs

219− CPP-Options: -DPROJECTM36_VERSION="v0.1"

220219 CC-Options: -fPIC

221220 GHC-Options: -Wall

222221 Hs-Source-Dirs: ./src/bin

@@ -262,7 +261,6 @@ Executable project-m36-server

262261 list-t,

263262 base64-bytestring

264263 Main-Is: ./src/bin/ProjectM36/Server/project-m36-server.hs

265− CPP-Options: -DPROJECTM36_VERSION="v0.1"

266264 GHC-Options: -Wall -threaded -rtsopts

267265 if flag(profiler)

268266 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

@@ -279,7 +277,6 @@ Executable bigrel

279277 TutorialD.Interpreter.Types

280278 main-is: benchmark/bigrel.hs

281279 GHC-Options: -Wall -threaded -rtsopts

282− CPP-Options: -DPROJECTM36_VERSION="v0.1"

283280 HS-Source-Dirs: ./src/bin

284281 if flag(profiler)

285282 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

@@ -293,7 +290,6 @@ Test-Suite test-tutoriald

293290 Other-Modules: TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.TestBase, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator

294291 GHC-Options: -Wall

295292 Hs-Source-Dirs: ./src/bin, ., test

296− CPP-Options: -DPROJECTM36_VERSION="v0.1"

297293

298294Test-Suite test-tutoriald-atomfunctionscript

299295 Default-Language: Haskell2010

@@ -304,7 +300,6 @@ Test-Suite test-tutoriald-atomfunctionscript

304300 Build-Depends: base, HUnit, project-m36, uuid, containers, megaparsec, text, vector, directory, bytestring, mtl, haskeline, random, MonadRandom, semigroups, time

305301 GHC-Options: -Wall

306302 Hs-Source-Dirs: ./src/bin, ./test, .

307− CPP-Options: -DPROJECTM36_VERSION="v0.1"

308303

309304Test-Suite test-tutoriald-databasecontextfunctionscript

310305 Default-Language: Haskell2010

@@ -315,7 +310,6 @@ Test-Suite test-tutoriald-databasecontextfunctionscript

315310 Build-Depends: base, HUnit, project-m36, uuid, containers, megaparsec, text, vector, directory, bytestring, mtl, haskeline, random, MonadRandom, semigroups, time

316311 GHC-Options: -Wall

317312 Hs-Source-Dirs: ./src/bin, ./test, .

318− CPP-Options: -DPROJECTM36_VERSION="v0.1"

319313

320314Test-Suite test-relation

321315 Default-Language: Haskell2010

@@ -332,7 +326,6 @@ Test-Suite test-static-optimizer

332326 main-is: test/Relation/StaticOptimizer.hs

333327 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, project-m36, transformers

334328 GHC-Options: -Wall

335− CPP-Options: -DPROJECTM36_VERSION="v0.1"

336329

337330Test-Suite test-transactiongraph-persist

338331 Default-Language: Haskell2010

@@ -351,7 +344,6 @@ Test-Suite test-relation-import-csv

351344 main-is: test/Relation/Import/CSV.hs

352345 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, stm-containers, project-m36

353346 GHC-Options: -Wall

354− CPP-Options: -DPROJECTM36_VERSION="v0.1"

355347

356348Test-Suite test-tutoriald-import-tutoriald

357349 Default-Language: Haskell2010

@@ -410,7 +402,6 @@ Executable Example-OutOfTheTarpit

410402 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36

411403 Main-Is: examples/out_of_the_tarpit.hs

412404 GHC-Options: -Wall

413− CPP-Options: -DPROJECTM36_VERSION="v0.1"

414405

415406Executable Example-Hair

416407 Default-Language: Haskell2010

@@ -418,7 +409,6 @@ Executable Example-Hair

418409 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, aeson, path-pieces, either, conduit, http-api-data, template-haskell, ghc, ghc-paths, project-m36

419410 Main-Is: examples/hair.hs

420411 GHC-Options: -Wall

421− CPP-Options: -DPROJECTM36_VERSION="v0.1"

422412

423413Test-Suite test-scripts

424414 Default-Language: Haskell2010

@@ -436,7 +426,6 @@ Executable project-m36-websocket-server

436426 Main-Is: ProjectM36/Server/WebSocket/websocket-server.hs

437427 Other-Modules: ProjectM36.Client.Json, ProjectM36.Server.RemoteCallTypes.Json, ProjectM36.Server.WebSocket, TutorialD.Interpreter, TutorialD.Interpreter.Base, TutorialD.Interpreter.DatabaseContextExpr, TutorialD.Interpreter.DatabaseContextIOOperator, TutorialD.Interpreter.Export.Base, TutorialD.Interpreter.Export.CSV, TutorialD.Interpreter.Import.Base, TutorialD.Interpreter.Import.BasicExamples, TutorialD.Interpreter.Import.CSV, TutorialD.Interpreter.Import.TutorialD, TutorialD.Interpreter.InformationOperator, TutorialD.Interpreter.RODatabaseContextOperator, TutorialD.Interpreter.RelationalExpr, TutorialD.Interpreter.TransactionGraphOperator, TutorialD.Interpreter.Types, TutorialD.Interpreter.TransGraphRelationalOperator, TutorialD.Interpreter.SchemaOperator

438428 GHC-Options: -Wall

439− CPP-Options: -DPROJECTM36_VERSION="v0.1"

440429 Hs-Source-Dirs: ./src/bin

441430 Default-Extensions: OverloadedStrings

442431

@@ -449,7 +438,6 @@ Test-Suite test-websocket-server

449438 Default-Extensions: OverloadedStrings

450439 GHC-Options: -Wall

451440 Hs-Source-Dirs: ./src/bin, .

452− CPP-Options: -DPROJECTM36_VERSION="v0.1"

453441

454442Test-Suite test-isomorphic-schemas

455443 Default-Language: Haskell2010

@@ -459,7 +447,6 @@ Test-Suite test-isomorphic-schemas

459447 Default-Extensions: OverloadedStrings

460448 GHC-Options: -Wall

461449 Hs-Source-Dirs: ./src/bin, .

462− CPP-Options: -DPROJECTM36_VERSION="v0.1"

463450

464451Test-Suite test-atomable

465452 Default-Language: Haskell2010

@@ -470,7 +457,6 @@ Test-Suite test-atomable

470457 Default-Extensions: OverloadedStrings

471458 GHC-Options: -Wall

472459 Hs-Source-Dirs: ./src/bin, ., test/

473− CPP-Options: -DPROJECTM36_VERSION="v0.1"

474460

475461Test-Suite test-multiprocess-access

476462 Default-Language: Haskell2010

@@ -480,7 +466,6 @@ Test-Suite test-multiprocess-access

480466 Default-Extensions: OverloadedStrings

481467 GHC-Options: -Wall

482468 Hs-Source-Dirs: ./src/bin, ., test/

483− CPP-Options: -DPROJECTM36_VERSION="v0.1"

484469

485470Test-Suite test-transactiongraph-automerge

486471 Default-Language: Haskell2010

@@ -490,7 +475,6 @@ Test-Suite test-transactiongraph-automerge

490475 Default-Extensions: OverloadedStrings

491476 GHC-Options: -Wall

492477 Hs-Source-Dirs: ./src/bin, ., test/

493− CPP-Options: -DPROJECTM36_VERSION="v0.1"

494478

495479Test-Suite test-tupleable

496480 Default-Language: Haskell2010

@@ -500,4 +484,3 @@ Test-Suite test-tupleable

500484 Default-Extensions: OverloadedStrings

501485 GHC-Options: -Wall

502486 Hs-Source-Dirs: ./src/bin, ., test/

503− CPP-Options: -DPROJECTM36_VERSION="v0.1"

src/bin/TutorialD/Interpreter/InformationOperator.hs+1−1

@@ -21,7 +21,7 @@ getVersionP :: Parser InformationOperator

2121getVersionP = reserved ":version" >> pure GetVersionOperator

2222

2323evalInformationOperator :: InformationOperator -> Either Text Text

24−evalInformationOperator GetVersionOperator = Right ("tutd " `append` PROJECTM36_VERSION)

24+evalInformationOperator GetVersionOperator = Right ("tutd " `append` VERSION_project_m36)

2525-- display generic help

2626evalInformationOperator HelpOperator = Right $ intercalate "\n" help

2727 where

src/bin/TutorialD/tutd.hs+3−3

@@ -71,12 +71,12 @@ ghcPkgPathsForConfig _ = error "Clients cannot configure remote ghc package path

7171errDie :: String -> IO ()

7272errDie err = hPutStrLn stderr err >> exitFailure

7373

74−#ifndef PROJECTM36_VERSION

75−#error PROJECTM36_VERSION is not defined

74+#ifndef VERSION_project_m36

75+#error VERSION_project_m36 is not defined

7676#endif

7777printWelcome :: IO ()

7878printWelcome = do

79− putStrLn $ "Project:M36 TutorialD Interpreter " ++ PROJECTM36_VERSION

79+ putStrLn $ "Project:M36 TutorialD Interpreter " ++ VERSION_project_m36

8080 putStrLn "Type \":help\" for more information."

8181 putStrLn "A full tutorial is available at:"

8282 putStrLn "https://github.com/agentm/project-m36/blob/master/docs/tutd_tutorial.markdown"