Browse Source

Enable onion to find it's installation directory

Hamilton Turner 11 years ago
parent
commit
29bb497638

+ 3 - 0
frameworks/C/onion/bash_profile.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+export ONION_LOG=noinfo

+ 2 - 2
frameworks/C/onion/setup.py

@@ -5,9 +5,9 @@ import setup_util
 
 def start(args, logfile, errfile):
   setup_util.replace_text("onion/hello.c", "mysql_real_connect\(data.db\[i\], \".*\",", "mysql_real_connect(data.db[i], \"" + args.database_host + "\",")
-  os.putenv("ONION_LOG","noinfo")
+  
   subprocess.call("rm *.o", cwd="onion", shell=True, stderr=errfile, stdout=logfile)
-  subprocess.call("cp -R installs/onion/* onion/onion", shell=True, stderr=errfile, stdout=logfile)
+  subprocess.call("cp -R $IROOT/onion/* onion/onion", shell=True, stderr=errfile, stdout=logfile)
   subprocess.call("rm CMakeCache.txt", shell=True, cwd="onion/onion/build", stderr=errfile, stdout=logfile)
   subprocess.Popen("make && ./hello", shell=True, cwd="onion", stderr=errfile, stdout=logfile)
   return 0

+ 4 - 2
toolset/setup/linux/frameworks/onion.sh

@@ -4,10 +4,12 @@ RETCODE=$(fw_exists onion)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 git clone https://github.com/davidmoreno/onion.git
-
-
 cd onion
+
+# Latest commit on master as of July 10 2014
+# This is post tag v0.7, but pre any later tags
 git checkout c460557bfc7d45fb6ba61cb6b7259480a67dde82
+
 mkdir -p build
 cd build
 cmake ..