mavenized bidmach script for Windows

Author: jcanny

bidmach

@@ -22,49 +22,49 @@ LIBDIR="${BIDMACH_ROOT}/lib"
 JCUDA_VERSION=`echo lib/jcuda-natives-*.jar | sed 's/.*jcuda-natives-//' | sed 's/-.*\.jar//'`
 BIDMAT_VERSION=`echo lib/BIDMat-*-cpu-*.jar | sed 's/.*BIDMat-//' | sed 's/-cpu.*\.jar//'`
 
-OS=`uname -a`
+OSS=`uname -a`
 if [ "$ARCH" = "" ]; then
     ARCH=`arch`
 fi
-if [[ "$OS" == Darwin* ]] ; then
-    if [[ "$OS" == *x86_64 ]] ; then
+if [[ "$OSS" == Darwin* ]] ; then
+    if [[ "$OSS" == *x86_64 ]] ; then
 	    ARCH="x86_64"
     fi
-    OS="apple"
-elif [[ "$OS" == Linux* ]] ; then
-    OS="linux"
-elif [[ "$OS" == CYGWIN* ]] ; then
-    if [[ "$OS" == *WOW* ]] ; then
+    OSS="apple"
+elif [[ "$OSS" == Linux* ]] ; then
+    OSS="linux"
+elif [[ "$OSS" == CYGWIN* ]] ; then
+    if [[ "$OSS" == *WOW* ]] ; then
         ARCH="x86_64"
     fi
-	OS="windows"
+	OSS="windows"
 else
-    echo "OS not supported" $OS
+    echo "OS not supported" $OSS
     exit 1
 fi
 
 popd > /dev/null
-if [ "$OS" = "Windows_NT" ]; then
+if [ "$OSS" = "windows" ]; then
     if [ ! "${JAVA_HOME}" = "" ]; then
         JAVA_HOME=`${BIDMACH_ROOT}/shortpath.bat "${JAVA_HOME}"`
 	    export JAVA_HOME=`echo ${JAVA_HOME} | sed 's_\\\\_/_g'`/bin
     fi
 fi
 
 BIDMACH_LIBS="${BIDMACH_ROOT}/target/BIDMach-${BIDMAT_VERSION}.jar;\
-${LIBDIR}/BIDMach-${BIDMAT_VERSION}-cpu-${OS}-${ARCH}.jar;\
-${LIBDIR}/BIDMach-${BIDMAT_VERSION}-gpu-${OS}-${ARCH}.jar;\
+${LIBDIR}/BIDMach-${BIDMAT_VERSION}-cpu-${OSS}-${ARCH}.jar;\
+${LIBDIR}/BIDMach-${BIDMAT_VERSION}-gpu-${OSS}-${ARCH}.jar;\
 ${LIBDIR}/BIDMat-${BIDMAT_VERSION}.jar;\
-${LIBDIR}/BIDMat-${BIDMAT_VERSION}-cpu-${OS}-${ARCH}.jar;\
-${LIBDIR}/BIDMat-${BIDMAT_VERSION}-gpu-${OS}-${ARCH}.jar;\
+${LIBDIR}/BIDMat-${BIDMAT_VERSION}-cpu-${OSS}-${ARCH}.jar;\
+${LIBDIR}/BIDMat-${BIDMAT_VERSION}-gpu-${OSS}-${ARCH}.jar;\
 ${LIBDIR}/ptplot.jar;${LIBDIR}/ptplotapplication.jar;\
-${LIBDIR}/jhdf5-3.2.1.jar;${LIBDIR}/jhdf5-3.2.1-${OS}-${ARCH}.jar;\
+${LIBDIR}/jhdf5-3.2.1.jar;${LIBDIR}/jhdf5-3.2.1-${OSS}-${ARCH}.jar;\
 ${LIBDIR}/commons-math3-3.2.jar;${LIBDIR}/lz4-1.3.jar;${LIBDIR}/json-io-4.1.6.jar;\
 ${LIBDIR}/jfreechart-1.0.19.jar;${LIBDIR}/jcommon-1.0.23.jar"
 
 JCUDA_LIBS=""
 for lib in jcuda jcublas jcufft jcurand jcusolver jcusparse; do
-    JCUDA_LIBS="${JCUDA_LIBS};${LIBDIR}/${lib}-${JCUDA_VERSION}.jar;${LIBDIR}/${lib}-natives-${JCUDA_VERSION}-${OS}-${ARCH}.jar"
+    JCUDA_LIBS="${JCUDA_LIBS};${LIBDIR}/${lib}-${JCUDA_VERSION}.jar;${LIBDIR}/${lib}-natives-${JCUDA_VERSION}-${OSS}-${ARCH}.jar"
 done
 
 if [ ! -e ${LIBDIR}/IScala.jar ]; then
@@ -73,11 +73,11 @@ if [ ! -e ${LIBDIR}/IScala.jar ]; then
     curl -o ${LIBDIR}/IScala.jar ${source}/lib/IScala.jar
 fi
 
-ALL_LIBS="${LIBDIR}/IScala.jar;${BIDMACH_ROOT}/BIDMach.jar;${BIDMACH_LIBS};${JCUDA_LIBS};${JAVA_HOME}/lib/tools.jar"
+ALL_LIBS=";${LIBDIR}/IScala.jar;${BIDMACH_ROOT}/BIDMach.jar;${BIDMACH_LIBS};${JCUDA_LIBS};${JAVA_HOME}/lib/tools.jar"
 
-if [ "$OS" = "Windows_NT" ]; then
+if [ "$OSS" = "windows" ]; then
     if [ ! "${CUDA_PATH}" = "" ]; then
-	    NEWPATH=`${BIDMAT_ROOT}/shortpath.bat "${CUDA_PATH}"`
+	    NEWPATH=`${BIDMACH_ROOT}/shortpath.bat "${CUDA_PATH}"`
 	    NEWPATH=`echo $NEWPATH | sed 's_\\\\_/_g'`/bin
     fi
 else
@@ -93,7 +93,6 @@ if [ "$1" = "notebook" ]; then
     fi
     ipython notebook --profile=scala --KernelManager.kernel_cmd="$KERNEL_CMD"
 else
-    [[ $(ps -o stat= -p $$) == *+* ]] || export NOREPL="-howtorun:script"
     ${BIDMACH_ROOT}/scripts/scala/scala -nobootcp -toolcp "${ALL_LIBS}" -cp "${ALL_LIBS}" -Yrepl-sync -i ${LIBDIR}/bidmach_init.scala ${NOREPL} "$@"
 fi