projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first cut of merge of STABLE-pre1_0 into HEAD. I won't even guarantee that it
[mir.git]
/
build.sh-dist
diff --git
a/build.sh-dist
b/build.sh-dist
index
93bc2ac
..
097c579
100755
(executable)
--- a/
build.sh-dist
+++ b/
build.sh-dist
@@
-10,7
+10,7
@@
LOCALCLASSPATH=`echo /usr/share/java/*.jar | tr ' ' ':'`
LIB_HOME=lib
TOMCAT_HOME=/usr/share/tomcat
LIB_HOME=lib
TOMCAT_HOME=/usr/share/tomcat
-CP=$LIB_HOME/servlet.jar
+CP=$LIB_HOME/servlet
-2.2
.jar
CP=$CP:$ANT_HOME/ant.jar:$ANT_HOME/xerces.jar
CP=$CP:$LOCALCLASSPATH
CP=$CP:$TOMCAT_HOME/lib/tomcat.jar
CP=$CP:$ANT_HOME/ant.jar:$ANT_HOME/xerces.jar
CP=$CP:$LOCALCLASSPATH
CP=$CP:$TOMCAT_HOME/lib/tomcat.jar
@@
-25,6
+25,10
@@
CP=$CP:$LIB_HOME/jai_core.jar
CP=$CP:$JAVA_HOME/lib/tools.jar
CP=$CP:$JAVA_HOME/lib/rt.jar
CP=$CP:$LIB_HOME/strutsmesg.jar
CP=$CP:$JAVA_HOME/lib/tools.jar
CP=$CP:$JAVA_HOME/lib/rt.jar
CP=$CP:$LIB_HOME/strutsmesg.jar
+CP=$CP:$LIB_HOME/poolman.jar
+CP=$CP:$LIB_HOME/log4j.jar
+CP=$CP:$LIB_HOME/jdbc-se2.0.jar
+CP=$CP:$LIB_HOME/postgresql.jar
# The path to ANT
#ANT_HOME=/usr/share/ant/lib # use own ant
# The path to ANT
#ANT_HOME=/usr/share/ant/lib # use own ant
@@
-35,12
+39,5
@@
ANT_HOME=LIB_HOME # use mir-ant
$JAVA_HOME/bin/java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main \
-Dtomcat.home=$TOMCAT_HOME "$@"
$JAVA_HOME/bin/java -classpath $CP:$CLASSPATH org.apache.tools.ant.Main \
-Dtomcat.home=$TOMCAT_HOME "$@"
-
-#
-# execute postbuild script if present
-
-if [ -f ./build.post ]; then
- echo "Executing build.post"
- sh build.post
-fi
-
+# Set permissions correctly
+./perms.sh-dist