From 9dcee70d20382158fe90c7cb4b9d39b1ddca0dad Mon Sep 17 00:00:00 2001
From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Tue, 8 Apr 2014 19:59:00 -0700
Subject: [PATCH] Updated client version handling

---
 .gitmodules | 4 ----
 SConstruct  | 8 +++++---
 version     | 1 -
 3 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 160000 version

diff --git a/.gitmodules b/.gitmodules
index 899d090..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "version"]
-	path = version
-	url = git@github.com:FoldingAtHome/client-version.git
-	branch = master
diff --git a/SConstruct b/SConstruct
index fa63032..45c2a1c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -10,12 +10,14 @@ except Exception, e:
 env.CBAddVariables(
     BoolVariable('mostly_static', 'Link most libraries statically', 1))
 
-env.CBLoadTools('packager run_distutils osx')
+env.CBLoadTools('packager run_distutils osx fah-client-version')
 conf = env.CBConfigure()
 
 # Version
-version = open('version/version.txt', 'r').read().strip()
-major, minor, revision = version.split('.')
+try:
+    version = env.FAHClientVersion()
+except:
+    version = '0.0.0'
 
 # Config vars
 env.Replace(PACKAGE_VERSION = version)
diff --git a/version b/version
deleted file mode 160000
index cc462a4..0000000
--- a/version
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cc462a4bc12ef3d7af7579a5ef83edd27f8865a2