[ccmtools-cvs] ccmtools/bin ccmconfix, 1.4, 1.5 ccmtools-idl, 1.6, 1.7 ccmidl, 1.5, 1.6 ccmmodel, 1.5, 1.6 ccmjava, 1.10, 1.11 ccmdescriptor, 1.8, 1.9 ccmtools, 1.13, 1.14

[Robert L. <rle...@us...>]

Update of /cvsroot/ccmtools/ccmtools/bin
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv8984/bin

Modified Files:
	ccmconfix ccmtools-idl ccmidl ccmmodel ccmjava ccmdescriptor 
	ccmtools 
Log Message:
better usage of CLASSPATH

Index: ccmtools
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmtools,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ccmtools	6 Nov 2006 13:11:28 -0000	1.13
--- ccmtools	18 Apr 2007 08:08:30 -0000	1.14
***************
*** 16,27 ****
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH"
  	else
! 		CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH"
  	fi	
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Dccmtools.templates="$CCMTOOLS_HOME/templates" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.ui.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi
\ No newline at end of file
--- 16,27 ----
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH"
  	else
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH"
  	fi	
! 	exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Dccmtools.templates="$CCMTOOLS_HOME/templates" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.ui.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi

Index: ccmmodel
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmmodel,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ccmmodel	19 Jan 2007 12:07:24 -0000	1.5
--- ccmmodel	18 Apr 2007 08:08:30 -0000	1.6
***************
*** 16,27 ****
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CCMTOOLS_HOME/lib/ccm-runtime.jar;$CLASSPATH"
  	else
! 		CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	fi	
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.parser.idl.metamodel.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi
\ No newline at end of file
--- 16,27 ----
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CCMTOOLS_HOME/lib/ccm-runtime.jar;$CLASSPATH"
  	else
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	fi	
! 	exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.parser.idl.metamodel.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi

Index: ccmconfix
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmconfix,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ccmconfix	10 Aug 2006 20:21:56 -0000	1.4
--- ccmconfix	18 Apr 2007 08:08:30 -0000	1.5
***************
*** 16,27 ****
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		CLASSPATH="$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH"
  	else
! 		CLASSPATH="$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH"
  	fi
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.confix.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi
\ No newline at end of file
--- 16,27 ----
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH"
  	else
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH"
  	fi
! 	exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.confix.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi

Index: ccmdescriptor
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmdescriptor,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ccmdescriptor	22 Jan 2007 09:08:37 -0000	1.8
--- ccmdescriptor	18 Apr 2007 08:08:30 -0000	1.9
***************
*** 16,27 ****
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/jdom.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH"
  	else
! 		CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH"
  	fi
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.deployment.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi
\ No newline at end of file
--- 16,27 ----
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/jdom.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CLASSPATH"
  	else
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CLASSPATH"
  	fi
! 	exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.deployment.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi

Index: ccmtools-idl
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmtools-idl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ccmtools-idl	23 Oct 2006 15:44:02 -0000	1.6
--- ccmtools-idl	18 Apr 2007 08:08:30 -0000	1.7
***************
*** 1,3 ****
! #! /usr/bin/env python
  
  ## ccmtools-idl : IDL compiler wrapper
--- 1,3 ----
! #! /bin/env python
  
  ## ccmtools-idl : IDL compiler wrapper

Index: ccmidl
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmidl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ccmidl	24 Nov 2006 14:48:17 -0000	1.5
--- ccmidl	18 Apr 2007 08:08:30 -0000	1.6
***************
*** 16,27 ****
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		CLASSPATH="$CCMTOOLS_HOME/lib/xpp3_min-1.1.3.4.O.jar;$CCMTOOLS_HOME/lib/xstream-1.2.jar;$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/jdom.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	else
! 		CLASSPATH="$CCMTOOLS_HOME/lib/xpp3_min-1.1.3.4.O.jar:$CCMTOOLS_HOME/lib/xstream-1.2.jar:$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	fi		
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.idl.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi
\ No newline at end of file
--- 16,27 ----
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/xpp3_min-1.1.3.4.O.jar;$CCMTOOLS_HOME/lib/xstream-1.2.jar;$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/jdom.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	else
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/xpp3_min-1.1.3.4.O.jar:$CCMTOOLS_HOME/lib/xstream-1.2.jar:$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	fi		
! 	exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.idl.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi

Index: ccmjava
===================================================================
RCS file: /cvsroot/ccmtools/ccmtools/bin/ccmjava,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ccmjava	6 Nov 2006 13:11:28 -0000	1.10
--- ccmjava	18 Apr 2007 08:08:30 -0000	1.11
***************
*** 16,27 ****
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/jdom.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CCMTOOLS_HOME/lib/ccm-runtime.jar;$CLASSPATH"
  	else
! 		CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	fi
! 	exec "$JAVA_HOME/bin/java" -cp $CLASSPATH -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.java.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi
\ No newline at end of file
--- 16,27 ----
  if [ -x $JAVA_LAUNCHER ]; then 
  	if [ "`uname`" = "Interix" ]; then
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar;$CCMTOOLS_HOME/lib/java-cup-11a.jar;$CCMTOOLS_HOME/lib/commons-cli-1.0.jar;$CCMTOOLS_HOME/lib/jdom.jar;$CCMTOOLS_HOME/lib/ccmtools.jar;$CCMTOOLS_HOME/lib/ccm-runtime.jar;$CLASSPATH"
  	else
! 		export CLASSPATH="$CCMTOOLS_HOME/lib/antlr.jar:$CCMTOOLS_HOME/lib/java-cup-11a.jar:$CCMTOOLS_HOME/lib/commons-cli-1.0.jar:$CCMTOOLS_HOME/lib/jdom.jar:$CCMTOOLS_HOME/lib/ccmtools.jar:$CCMTOOLS_HOME/lib/ccm-runtime.jar:$CLASSPATH"
  	fi
! 	exec "$JAVA_HOME/bin/java" -Dccmtools.home="$CCMTOOLS_HOME" -Djava.util.logging.config.file="$CCMTOOLS_HOME/etc/logging.properties" ccmtools.generator.java.Main $@  
  else
  	echo "ERROR!"
  	echo "Java executable not found in" "$JAVA_HOME/bin"
  	exit 1
! fi