From 845834c2fdefb18c5c6122ef4e984263ce30c3cd Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Tue, 30 Sep 2014 18:55:30 +0000
Subject: [PATCH] properly setup java path for ant script
---
bin/dm-ant | 4 ++--
setup.sh | 11 ++++++-----
src/Makefile | 4 ++--
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/bin/dm-ant b/bin/dm-ant
index c9e6e2fc..633233f6 100755
--- a/bin/dm-ant
+++ b/bin/dm-ant
@@ -13,8 +13,8 @@ if [ -z $DM_ROOT_DIR ]; then
fi
DM_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-export JAVA_HOME=$DM_SUPPORT/java/$DM_HOST_ARCH
-export ANT_HOME=$DM_SUPPORT/ant
+export JAVA_HOME=$DM_SUPPORT_DIR/java/$DM_HOST_ARCH
+export ANT_HOME=$DM_SUPPORT_DIR/ant
export PATH=$ANT_HOME/bin:$PATH
ant $@
diff --git a/setup.sh b/setup.sh
index 6c11e728..bd290424 100644
--- a/setup.sh
+++ b/setup.sh
@@ -53,8 +53,10 @@ prependPathIfDirExists() {
}
# Setup path and other variables
-PATH=$DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH/bin:$PATH
-PATH=$DM_ROOT_DIR/bin:$PATH
+prependPathIfDirExists $DM_SUPPORT_DIR/postgresql/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_SUPPORT_DIR/java/$DM_HOST_ARCH/bin
+prependPathIfDirExists $DM_SUPPORT_DIR/ant/bin
+prependPathIfDirExists $DM_ROOT_DIR/bin
PATH=.:$PATH
export PATH
@@ -65,9 +67,8 @@ else
fi
export LD_LIBRARY_PATH
-# Setup python path. First check for wx, then try to find it locally, and
-# then re-check for it.
-# Check if we have local python
+# Setup python path.
+# Check if we have local python
if [ -z $DM_PYTHON_DIR ]; then
pythonDir=$DM_SUPPORT_DIR/python/$DM_HOST_ARCH
else
diff --git a/src/Makefile b/src/Makefile
index 6d9c7bda..f1bebab4 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,6 @@
-TOP = ../..
-SUBDIRS = DmWebPortal
+TOP = ..
+SUBDIRS = java
include $(TOP)/tools/make/RULES_DM
--
GitLab