Преглед изворни кода

Help gemini find root directory

Hamilton Turner пре 11 година
родитељ
комит
547c661230
2 измењених фајлова са 3 додато и 3 уклоњено
  1. 1 1
      frameworks/Java/gemini/Docroot/WEB-INF/resin.xml
  2. 2 2
      frameworks/Java/gemini/setup.py

+ 1 - 1
frameworks/Java/gemini/Docroot/WEB-INF/resin.xml

@@ -14,7 +14,7 @@
     </server>
 
     <host>
-      <web-app id="/" root-directory="/home/fb/FrameworkBenchmarks/gemini/Docroot" />
+      <web-app id="/" root-directory="/home/tfb/FrameworkBenchmarks/gemini/Docroot" />
     </host>
 
   </cluster>

+ 2 - 2
frameworks/Java/gemini/setup.py

@@ -6,12 +6,12 @@ from os.path import expanduser
 def start(args, logfile, errfile):
   
   setup_util.replace_text("gemini/Docroot/WEB-INF/GeminiHello.conf", "db.ConnectString = .*:3306", "db.ConnectString = " + args.database_host + ":3306")
-  setup_util.replace_text("gemini/Docroot/WEB-INF/resin.xml", "root-directory=\".*\/FrameworkBenchmarks", "root-directory=\"%s" % args.fwroot)
+  setup_util.replace_text("gemini/Docroot/WEB-INF/resin.xml", "root-directory=\".*\/FrameworkBenchmarks/gemini", "root-directory=\"%s" % args.troot)
   
   try:
     subprocess.call("mkdir -p classes", shell=True, cwd="gemini/Docroot/WEB-INF", stderr=errfile, stdout=logfile)
     subprocess.check_call("ant compile", shell=True, cwd="gemini", stderr=errfile, stdout=logfile)
-    subprocess.check_call("$RESIN_HOME/bin/resinctl -conf $FWROOT/gemini/Docroot/WEB-INF/resin.xml start", shell=True, stderr=errfile, stdout=logfile)
+    subprocess.check_call("$RESIN_HOME/bin/resinctl -conf $TROOT/Docroot/WEB-INF/resin.xml start", shell=True, stderr=errfile, stdout=logfile)
     return 0
   except subprocess.CalledProcessError:
     return 1