Browse Source

Fixing some installer issues

Patrick Falls 12 years ago
parent
commit
b2007b802b

+ 1 - 0
config/benchmark_profile

@@ -3,6 +3,7 @@ export RESIN_HOME=~/FrameworkBenchmarks/installs/resin-4.0.34
 export GRAILS_HOME=~/FrameworkBenchmarks/installs/grails-2.1.1
 export VERTX_HOME=~/FrameworkBenchmarks/installs/vert.x-1.3.1.final
 export GOROOT=~/FrameworkBenchmarks/installs/go
+export GOPATH=$GOROOT:~/FrameworkBenchmarks/go:~/FrameworkBenchmarks/webgo
 export TOMCAT_HOME=~/FrameworkBenchmarks/installs/apache-tomcat-7.0.35
 export NODE_HOME=~/FrameworkBenchmarks/installs/node-v0.10.2-linux-x64
 export PLAY_HOME=~/FrameworkBenchmarks/installs/play-2.1.1

+ 8 - 0
config/erlang.list

@@ -0,0 +1,8 @@
+deb http://binaries.erlang-solutions.com/debian quantal contrib
+deb http://binaries.erlang-solutions.com/debian precise contrib
+deb http://binaries.erlang-solutions.com/debian oneiric contrib
+deb http://binaries.erlang-solutions.com/debian natty contrib
+deb http://binaries.erlang-solutions.com/debian maverick contrib
+deb http://binaries.erlang-solutions.com/debian lucid contrib
+
+deb http://binaries.erlang-solutions.com/debian squeeze contrib

+ 0 - 0
go/bin/.gitkeep


+ 0 - 0
go/pkg/.gitkeep


+ 1 - 1
go/setup.py

@@ -4,7 +4,7 @@ import os
 
 def start(args):
   
-  subprocess.Popen("go run hello.go".rsplit(" "), cwd="go")
+  subprocess.Popen("go run src/hello/hello.go".rsplit(" "), cwd="go")
   return 0
 def stop():
   

+ 0 - 0
go/hello.go → go/src/hello/hello.go


+ 7 - 7
installer.py

@@ -33,8 +33,13 @@ class Installer:
     #
     # Erlang
     #
-    self.__run_command("curl -klO https://elearning.erlang-solutions.com/couchdb//rbingen_adapter//package_R16B_precise64_1361901944/esl-erlang_16.b-1~ubuntu~precise_amd64.deb")
-    self.__run_command("sudo /usr/bin/dpkg --install esl-erlang_16.b-1~ubuntu~precise_amd64.deb")
+    self.__run_command("sudo cp ../config/erlang.list /etc/apt/sources.list.d/erlang.list")
+    self.__run_command("wget -O - http://binaries.erlang-solutions.com/debian/erlang_solutions.asc | sudo apt-key add -")
+    self.__run_command("sudo apt-get update")
+    self.__run_command("sudo apt-get install esl-erlang")
+    
+    #self.__run_command("curl -klO https://elearning.erlang-solutions.com/couchdb//rbingen_adapter//package_R16B_precise64_1361901944/esl-erlang_16.b-1~ubuntu~precise_amd64.deb")
+    #self.__run_command("sudo /usr/bin/dpkg --install esl-erlang_16.b-1~ubuntu~precise_amd64.deb")
 
     #
     # Python
@@ -225,11 +230,6 @@ class Installer:
     ##############################
     self.__run_command("curl http://vertx.io/downloads/vert.x-1.3.1.final.tar.gz | tar xvz")
 
-    ##############################
-    # WebGO
-    ##############################
-    self.__run_command("go/bin/go get github.com/hoisie/web")
-
     ##############################
     # Yesod
     ##############################

+ 0 - 0
webgo/.gitkeep


+ 0 - 0
webgo/bin/.gitkepp


+ 0 - 0
webgo/pkg/.gitkeep


+ 1 - 1
webgo/setup.py

@@ -5,7 +5,7 @@ import os
 
 def start(args):
   
-  subprocess.Popen("go run hello.go".rsplit(" "), cwd="webgo")
+  subprocess.Popen("go run src/hello/hello.go".rsplit(" "), cwd="webgo")
   return 0
 def stop():
   

+ 0 - 0
webgo/hello.go → webgo/src/hello/hello.go