Changeset 552

Timestamp:

11/27/13 21:12:16 (10 years ago)

Author:

davidb

Message:

Clearer separation of setup, devel, and local files

Location:

trunk

Files:

• expeditee-devel.sh (modified) (2 diffs)
• expeditee-setup.sh (modified) (1 diff)
• local-devel.sh.in (added)

trunk/expeditee-devel.sh

@@ +1 @@
+
+. expeditee-setup.sh
 
 
-which javac  >/dev/null 2>&1
+#which javac  >/dev/null 2>&1
 
-if [ $? != 0 ] ; then
-  export JAVA_HOME="/cygdrive/c/Program Files/Java/jdk1.7.0_45"
-  export PATH=$JAVA_HOME/bin/:$PATH
+#if [ $? != 0 ] ; then
+#  export JAVA_HOME="/cygdrive/c/Program Files/Java/jdk1.7.0_45"
+#  export PATH=$JAVA_HOME/bin/:$PATH
 
-  echo "+ Set JAVA_HOME to $JAVA_HOME and updated path"
+#  echo "+ Set JAVA_HOME to $JAVA_HOME and updated path"
 
-  cygpath 2>/dev/null
-  if [ $? != 0 ] ; then
-    echo "Detected runing in Cygwin environment => Changing JAVA_HOME to Windows native format"
-    export JAVA_HOME=`cygpath -w "$JAVA_HOME"`
-  fi
-
-fi
+#  cygpath 2>/dev/null
+#  if [ $? != 0 ] ; then
+#    echo "Detected runing in Cygwin environment => Changing JAVA_HOME to Windows native format"
+#    export JAVA_HOME=`cygpath -w "$JAVA_HOME"`
+#  fi
+#
+#fi
 
 
@@ -24 +26 @@
 echo "+ Set ANT_HOME to $ANT_HOME and updated path"
 
+if test -e local-devel.sh ; then
+    echo "Sourcing local-devel.sh"
+    . ./local-devel.sh
+  fi
+fi
+
 
 echo "-----"
-echo "To create an Expeditee distribution, type:"
+echo "To compile Expeditee, type:"
 echo ""
-echo "  ant fresh_dist_exp"
-echo ""
-echo "or:"
-echo "  ant fresh_dist_apollo"
+echo "  ant build"
+echo "-----"
 
-echo ""
 

trunk/expeditee-setup.sh

@@ -246 +246 @@
 unset exptoenc
 
-if test -e local ; then
-  if test -e local/setup.sh ; then 
-    echo "Sourcing local/setup.sh"
-    cd local ; . ./setup.sh ; cd ..
-  fi
-fi
-
-#which >/dev/null java 2>&1 
+
+#which java >/dev/null 2>&1 
 #
 #if [ $? != 0 ] ; then