notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

svn commit: r2916 - development/main/depot/console/etc/bin

From: scottb AT brickner.net
To: notify-dpml AT lists.ibiblio.org
Subject: svn commit: r2916 - development/main/depot/console/etc/bin
Date: Fri, 24 Jun 2005 13:53:52 -0400

Author: scottb AT brickner.net
Date: Fri Jun 24 13:53:52 2005
New Revision: 2916

Modified:
development/main/depot/console/etc/bin/depot-cygwin.sh
development/main/depot/console/etc/bin/depot-unix.sh
Log:
Fix unix versions of depot scripts to have Unix line terminators.

Modified: development/main/depot/console/etc/bin/depot-cygwin.sh
==============================================================================
--- development/main/depot/console/etc/bin/depot-cygwin.sh (original)
+++ development/main/depot/console/etc/bin/depot-cygwin.sh Fri Jun 24
13:53:52 2005
@@ -1,48 +1,48 @@
-#!/bin/sh
-#
-# Copyright 2004 Niclas Hedhman
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-
-JAVA="$JAVA_HOME/bin/java"
-
-# switch necessary paths to Windows format before running java
-JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
-DPML_HOME=`cygpath --windows "$DPML_HOME"`
-DPML_SYSTEM=`cygpath --windows "$DPML_SYSTEM"`
-DEPOT_CLASSPATH=`cygpath --windows "$DEPOT_CLASSPATH"`
-[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
-
-TITLE="Starting Depot $DEPOT_VERSION."
-echo $TITLE
-echo "$TITLE" | sed 's/./=/g'
-echo " Platform: $PLATFORM"
-echo " Java Home: $JAVA_HOME"
-echo " DPML System: $DPML_SYSTEM"
-echo " DPML Home: $DPML_HOME"
-echo " Security policy: $SECURITY_POLICY"
-echo " JVM Options: $DEPOT_JVM_OPTS"
-echo " Depot Classpath: $DEPOT_CLASSPATH"
-echo " Depot Arguments: $DEPOT_ARGS $@"
-echo ""
-
-ARGS="$DEPOT_JVM_OPTS
-Djava.system.class.loader=net.dpml.depot.lang.DepotClassLoader
\"-Djava.security.policy=$SECURITY_POLICY\" -classpath \"$DEPOT_CLASSPATH\"
@DEPOT-MAIN-CLASS@ $DEPOT_ARGS $@"
-
-echo $ARGS | xargs "$JAVA"
+#!/bin/sh
+#
+# Copyright 2004 Niclas Hedhman
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+
+JAVA="$JAVA_HOME/bin/java"
+
+# switch necessary paths to Windows format before running java
+JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
+DPML_HOME=`cygpath --windows "$DPML_HOME"`
+DPML_SYSTEM=`cygpath --windows "$DPML_SYSTEM"`
+DEPOT_CLASSPATH=`cygpath --windows "$DEPOT_CLASSPATH"`
+[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+
+TITLE="Starting Depot $DEPOT_VERSION."
+echo $TITLE
+echo "$TITLE" | sed 's/./=/g'
+echo " Platform: $PLATFORM"
+echo " Java Home: $JAVA_HOME"
+echo " DPML System: $DPML_SYSTEM"
+echo " DPML Home: $DPML_HOME"
+echo " Security policy: $SECURITY_POLICY"
+echo " JVM Options: $DEPOT_JVM_OPTS"
+echo " Depot Classpath: $DEPOT_CLASSPATH"
+echo " Depot Arguments: $DEPOT_ARGS $@"
+echo ""
+
+ARGS="$DEPOT_JVM_OPTS
-Djava.system.class.loader=net.dpml.depot.lang.DepotClassLoader
\"-Djava.security.policy=$SECURITY_POLICY\" -classpath \"$DEPOT_CLASSPATH\"
@DEPOT-MAIN-CLASS@ $DEPOT_ARGS $@"
+
+echo $ARGS | xargs "$JAVA"

Modified: development/main/depot/console/etc/bin/depot-unix.sh
==============================================================================
--- development/main/depot/console/etc/bin/depot-unix.sh (original)
+++ development/main/depot/console/etc/bin/depot-unix.sh Fri Jun 24
13:53:52 2005
@@ -1,37 +1,37 @@
-#!/bin/sh
-#
-# Copyright 2004 Niclas Hedhman
-# Copyright 2005 Stephen McConnell
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-#
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-TITLE="Starting Depot $DEPOT_VERSION."
-echo $TITLE
-echo "$TITLE" | sed 's/./=/g'
-echo " Platform: $PLATFORM"
-echo " Java Home: $JAVA_HOME"
-echo " DPML System: $DPML_SYSTEM"
-echo " DPML Home: $DPML_HOME"
-echo " Security policy: $SECURITY_POLICY"
-echo " JVM Options: $DEPOT_JVM_OPTS"
-echo " Depot Classpath: $DEPOT_CLASSPATH"
-echo " Depot Arguments: $DEPOT_ARGS $@"
-echo ""
-
-JAVA="$JAVA_HOME/bin/java"
-
-ARGS="$DEPOT_JVM_OPTS
-Djava.system.class.loader=net.dpml.depot.lang.DepotClassLoader
\"-Djava.security.policy=$SECURITY_POLICY\" -classpath \"$DEPOT_CLASSPATH\"
@DEPOT-MAIN-CLASS@ $DEPOT_ARGS $@"
-
-echo $ARGS | xargs "$JAVA"
+#!/bin/sh
+#
+# Copyright 2004 Niclas Hedhman
+# Copyright 2005 Stephen McConnell
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+TITLE="Starting Depot $DEPOT_VERSION."
+echo $TITLE
+echo "$TITLE" | sed 's/./=/g'
+echo " Platform: $PLATFORM"
+echo " Java Home: $JAVA_HOME"
+echo " DPML System: $DPML_SYSTEM"
+echo " DPML Home: $DPML_HOME"
+echo " Security policy: $SECURITY_POLICY"
+echo " JVM Options: $DEPOT_JVM_OPTS"
+echo " Depot Classpath: $DEPOT_CLASSPATH"
+echo " Depot Arguments: $DEPOT_ARGS $@"
+echo ""
+
+JAVA="$JAVA_HOME/bin/java"
+
+ARGS="$DEPOT_JVM_OPTS
-Djava.system.class.loader=net.dpml.depot.lang.DepotClassLoader
\"-Djava.security.policy=$SECURITY_POLICY\" -classpath \"$DEPOT_CLASSPATH\"
@DEPOT-MAIN-CLASS@ $DEPOT_ARGS $@"
+
+echo $ARGS | xargs "$JAVA"

svn commit: r2916 - development/main/depot/console/etc/bin, scottb, 06/24/2005