Browse Source

Removing unneeded cabal commands pertaining to snap, these steps are handled sufficiently by the setup.py file

Brendan Hay 12 years ago
parent
commit
bba2340f4b
2 changed files with 2 additions and 8 deletions
  1. 0 6
      installer.py
  2. 2 2
      snap/setup.py

+ 0 - 6
installer.py

@@ -236,12 +236,6 @@ class Installer:
     self.__run_command("cabal update")
     self.__run_command("cabal install yesod persistent-mysql")
 
-    ##############################
-    # Snap
-    ##############################
-    self.__run_command("cabal update")
-    self.__run_commnad("cabal install HDBC HDBC-mysql MonadCatchIO-transformers configurator json snap-core snap-server resource-pool")
-
     ##############################################################
     #
     # System Tools

+ 2 - 2
snap/setup.py

@@ -5,8 +5,8 @@ import os
 
 def start(args):
   setup_util.replace_text("snap/bench/cfg/db.cfg", "host=\".*\"", "host=\"" + args.database_host + "\"")
-  subprocess.check_call("cabal configure", shell=True, cwd="snap/bench")
-  subprocess.check_call("cabal build", shell=True, cwd="snap/bench")
+  subprocess.check_call("cabal update", shell=True, cwd="snap/bench")
+  subprocess.check_call("cabal install", shell=True, cwd="snap/bench")
 
   t = str(args.max_threads)
   subprocess.Popen("dist/build/snap-bench/snap-bench +RTS -A" + t + "M -N" + t + " > /dev/null", shell=True, cwd="snap/bench")