Changeset 1705

Timestamp:

2010-09-08 12:51:06 (3 years ago)

Author:

mpo

Message:

making the script suitable for running in hudson context

File:

• trunk/tools/restlet-dependency/make_restlet4kauri.sh (modified) (5 diffs)

trunk/tools/restlet-dependency/make_restlet4kauri.sh

@@ -1 +1 @@
 #!/bin/bash
+#
+# environment variables you can set before running this
+# DIR - should point to the directory holding the restlet-svn checkout to build
+#   if omitted the script will create a new checkout directory for each version it is building 
+# TAG - should indicate the revision name to use
+#   if omitted the script will assign a tag based on the current restlet-repo-revision number: svn{revision}
+# note these are intended to optimise the use in the hudson context at ci.outerthought.org
+# when ran locally you should typically let the script assign DIR and TAG
+# 
 
 ME=$(basename ${0});
@@ -5 +14 @@
 NAME="restlet";
 SVN_TRUNK_URI="http://restlet.tigris.org/svn/restlet/trunk";
-BUILD_PARAMS="-Dverify=false"; #unsafe build - clear to run tests!
+BUILD_PARAMS=${BUILD_PARAMS:-}; # to skip tests use BUILD_PARAMS="-Dverify=false"
 JDK_VERSION_TEST="java version \"1.5";
 
-echo "-- ${ME} -- Check JDK version ";
-JAVA_CMD="$(which java)";
-if [[ -x ${JAVA_HOME}/bin/java ]] ; then
- JAVA_CMD="${JAVA_HOME}/bin/java";
+
+if [[ ! -d ${DIR} ]] ; then
+  echo "-- ${ME} -- Check JDK version ";
+  JAVA_CMD="$(which java)";
+  if [[ -x ${JAVA_HOME}/bin/java ]] ; then
+   JAVA_CMD="${JAVA_HOME}/bin/java";
+  fi
+  CHECK=$(${JAVA_CMD} -version 2>&1| grep "${JDK_VERSION_TEST}");
+
+  if [[ "${CHECK}" = "" ]] ; then
+    echo "Java JDK version does not match <<${JDK_VERSION_TEST}>>";
+    exit 1;
+  fi 
+
+  echo "-- ${ME} -- Retrieving current trunk revision number ";
+  REVISION=$(svn info ${SVN_TRUNK_URI} |grep Revision|sed -e "s/Revision: //");
+  TAG="svn${REVISION}";
+
+  SVN_REV_URI="${SVN_TRUNK_URI}@${REVISION}";
+  DIR="${NAME}-${TAG}";
+  echo "-- ${ME} -- Export current trunk revision to ./${DIR}";
+  svn export ${SVN_REV_URI} ${DIR};
+else 
+  TAG=${TAG:-TEMP_OVERWRITE};
 fi
-CHECK=$(${JAVA_CMD} -version 2>&1| grep "${JDK_VERSION_TEST}");
-
-if [[ "${CHECK}" = "" ]] ; then
-  echo "Java JDK version does not match <<${JDK_VERSION_TEST}>>";
-  exit 1;
-fi 
-
-
-echo "-- ${ME} -- Retrieving current trunk revision number ";
-REVISION=$(svn info ${SVN_TRUNK_URI} |grep Revision|sed -e "s/Revision: //");
-
-
-SVN_REV_URI="${SVN_TRUNK_URI}@${REVISION}";
-DIR="${NAME}-r${REVISION}";
-echo "-- ${ME} -- Export current trunk revision to ./${DIR}";
-svn export ${SVN_REV_URI} ${DIR};
 
 
@@ -34 +47 @@
 echo "-- ${ME} -- Generate custom build props to ./${PROPS}";
 cat <<-EOF  > ${PROPS}
-# Custom Kauri-friendly build properties - generated for r${REVISION}
+# Custom Kauri-friendly build properties - generated for ${TAG}
 # -------------------------------------------------------------------
 # Used only for the maven distribution
-suffix-maven: -svn${REVISION}
-version-maven: svn${REVISION}
+suffix-maven: -${TAG}
+version-maven: ${TAG}
 # Indicates if the Maven distribution should be regenerated.
 maven: true
@@ -52 +65 @@
 cd ${DIR}/build;
 ant rebuild ${BUILD_PARAMS};
-SUCCESS=$?;
+SUCCESS=$?; #helas ant reports suucessful builds with warnings as != 0
 cd -;
 
 
 echo "-- ${ME} -- Grab Maven2 Artifacts.";
-M2_TGZ="restlet-${REVISION}-m2.tgz";
+M2_TGZ="restlet-${TAG}-m2.tgz";
 M2_DIST="${DIR}/build/dist/maven2";
 DISTNAME="$(ls -1 ${M2_DIST} | head -1)";
@@ -74 +87 @@
 
 
-echo "-- ${ME} -- Done building restlet-${REVISION}";
-
-# TODO maybe something to clean/remove old builds (not the current one: as that is useful sometimes to have around) - maybe do it at the start then (easier)
+echo "-- ${ME} -- Done building restlet-${TAG}";