Permalink
Browse files

- Build scripts improvements.

  • Loading branch information...
1 parent 4d52cd9 commit 430a3e45b3a2ae8d1ceb9359928aaa1b46768470 @graninas committed Jan 29, 2014
Showing with 68 additions and 56 deletions.
  1. +14 −52 Amoeba.cabal
  2. BIN Game/Amoeba
  3. +4 −4 build.sh
  4. +14 −0 build.sh~
  5. +18 −0 rebuild.sh
  6. +18 −0 rebuild.sh~
View
@@ -8,7 +8,7 @@ description: The Amoeba World Conquest Game
license: GPL-3
library
- build-depends:
+ build-depends:
base >= 4,
vector,
OpenGL,
@@ -27,29 +27,34 @@ library
transformers,
BigSpaceLibrary,
linear,
+ ConfigFile
ghc-options: -O1
hs-source-dirs: Amoeba
main-is: Amoeba.hs
- other-modules:
+ other-modules:
Amoeba,
Application.Boot,
Application.Environment,
Application.MainLoop,
- GameLogic.Language.Parser,
- GameLogic.Runtime.Game,
GameLogic.AI.AI,
GameLogic.AI.GenericAI,
+ GameLogic.Assets.Objects,
GameLogic.Assets.Scenarios,
+ GameLogic.Base.Geometry,
GameLogic.Data.Facade,
+ GameLogic.Data.Object,
+ GameLogic.Data.Player,
+ GameLogic.Language.Parser,
GameLogic.Runtime.Evaluation,
- Test.GeometryTest,
- Application.Config.Parser,
+ GameLogic.Runtime.Game,
+ GameLogic.Runtime.World,
Middleware.Config.Config,
- Middleware.Config.Scheme,
Middleware.Config.Facade,
- View.View,
+ Middleware.Config.Language,
+ Middleware.Config.Scheme,
+ View.Color,
View.Config,
- Middleware.Config.Language
+ View.View
executable Amoeba
build-depends: base >= 4
@@ -75,46 +80,3 @@ executable Amoeba
View.View,
View.Config,
Middleware.Config.Language
-
-c.World.Descripted
-
-World.GenericWorld
-
-gic.World.Geometry
-
-GameLogic.World.Id
-
-ogic.World.Objects
-
-Logic.World.Player
-
-c.World.Properties
-
-c.World.Stochastic
-
-eLogic.World.Types
-
-eLogic.World.Utils
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
-eLogic.World.World
-
View
Binary file not shown.
View
@@ -7,8 +7,8 @@ cd Amoeba
ghc -threaded --make -outputdir ../.bin -o ../.bin/Amoeba Amoeba.hs
cd ..
-echo "Copying..."
-rm ./Game/Amoeba
-cp ./.bin/Amoeba ./Game/
+set +e
-set +e
+echo "Copying..."
+rm -f "./Game/Amoeba"
+cp "./.bin/Amoeba" ./Game/
View
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+echo "Building..."
+cd Amoeba
+ghc -threaded --make -outputdir ../.bin -o ../.bin/Amoeba Amoeba.hs
+cd ..
+
+set +e
+
+echo "Copying..."
+rm -f ./Game/Amoeba
+cp ./.bin/Amoeba ./Game/
View
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+echo "Cleaning..."
+
+rm -fr "./.bin/*"
+
+echo "Building..."
+cd Amoeba
+ghc -threaded --make -outputdir ../.bin -o ../.bin/Amoeba Amoeba.hs
+cd ..
+
+set +e
+
+echo "Copying..."
+rm -f "./Game/Amoeba"
+cp "./.bin/Amoeba" "./Game/"
View
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+echo "Cleaning..."
+
+rm -fr "./.bin/*"
+
+echo "Building..."
+cd Amoeba
+ghc -threaded --make -outputdir ../.bin -o ../.bin/Amoeba Amoeba.hs
+cd ..
+
+set +e
+
+echo "Copying..."
+rm -f ./Game/Amoeba
+cp ./.bin/Amoeba ./Game/

0 comments on commit 430a3e4

Please sign in to comment.