From 83bd1a368e59d57739b66b8088c9503ad7103b01 Mon Sep 17 00:00:00 2001
From: David Huynh <dfhuynh@gmail.com>
Date: Wed, 12 May 2010 22:57:31 +0000
Subject: [PATCH] Got build script to support building Windows .exe of x.x.x
 versions.

git-svn-id: http://google-refine.googlecode.com/svn/trunk@732 7d457c2a-affb-35e4-300a-418c747d4874
---
 build.xml |  6 +++---
 gridworks | 12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/build.xml b/build.xml
index 352c567fe..a5f6fa897 100644
--- a/build.xml
+++ b/build.xml
@@ -178,12 +178,12 @@
                 <opt>-Djava.library.path=lib/native/windows -Dgridworks.version=${revision}</opt>
             </jre>
             <versionInfo
-                fileVersion="${num_version}.0.0"
+                fileVersion="${full_version}"
                 txtFileVersion="${version}"
                 fileDescription="gridworks"
                 copyright="Copyright (c) 2010, Metaweb Technologies, Inc."
-                productVersion="${num_version}.0.0"
-                txtProductVersion="${num_version}.0.0"
+                productVersion="${full_version}"
+                txtProductVersion="${full_version}"
                 productName="Gridworks"
                 companyName="Metaweb Technologies, Inc."
                 internalName="gridworks"
diff --git a/gridworks b/gridworks
index b958f7668..553738233 100755
--- a/gridworks
+++ b/gridworks
@@ -143,6 +143,16 @@ get_version() {
         fail "Must specify a version number"
     fi
     
+    if [[ "${VERSION}" == *.*.*.* ]]; then
+        FULL_VERSION="${VERSION}"
+    elif [[ "${VERSION}" == *.*.* ]]; then
+        FULL_VERSION="${VERSION}.0"
+    elif [[ "${VERSION}" == *.* ]]; then
+        FULL_VERSION="${VERSION}.0.0"
+    else
+        FULL_VERSION="${VERSION}.0.0.0"
+    fi
+    
     NUM_VERSION=`echo $VERSION | sed 's/[a-zA-Z]//g'`
 }
 
@@ -359,7 +369,7 @@ ant() {
     
     #export ANT_OPTS="-Xmx1024M"
     
-    "$ANT" -f build.xml $ANT_PARAMS -Dbuild.dir="$GRIDWORKS_BUILD_DIR" -Ddist.dir="$GRIDWORKS_DIST_DIR" -Dversion="$VERSION" -Dnum_version="$NUM_VERSION" -Drevision="$REVISION" $1 || error "Error while running ant task '$1'"
+    "$ANT" -f build.xml $ANT_PARAMS -Dbuild.dir="$GRIDWORKS_BUILD_DIR" -Ddist.dir="$GRIDWORKS_DIST_DIR" -Dversion="$VERSION" -Dnum_version="$NUM_VERSION" -Dfull_version="$FULL_VERSION" -Drevision="$REVISION" $1 || error "Error while running ant task '$1'"
 }
 
 # ----------------------------------------------------------------------------------------------