ajack 2003/10/23 16:10:22 Modified: python/gump logic.py . gumpy.sh project krysalis-centipede.xml Log: 1) Safer gumpy.sh cleanup 2) Set k-centipede runtime (stating with ant) 3) More printouts for testing CLASSPATH code Revision Changes Path 1.40 +4 -3 jakarta-gump/python/gump/logic.py Index: logic.py =================================================================== RCS file: /home/cvs/jakarta-gump/python/gump/logic.py,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- logic.py 23 Oct 2003 19:38:16 -0000 1.39 +++ logic.py 23 Oct 2003 23:10:22 -0000 1.40 @@ -768,11 +768,12 @@ # get parsed workspace definition workspace=load(ws, context) - projects=getPackagedProjectContexts(context) - print "Packaged Projects : " + str(len(projects)) - for p in projects: print "Packaged Project " + str(p.name) + #projects=getPackagedProjectContexts(context) + #print "Packaged Projects : " + str(len(projects)) + #for p in projects: print "Packaged Project " + str(p.name) printSeparator() + print "Project Expression : " + ps projects=getProjectsForProjectExpression(ps) #print "Resolved Projects : " + str(len(projects)) 1.19 +3 -5 jakarta-gump/gumpy.sh Index: gumpy.sh =================================================================== RCS file: /home/cvs/jakarta-gump/gumpy.sh,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gumpy.sh 23 Oct 2003 20:28:22 -0000 1.18 +++ gumpy.sh 23 Oct 2003 23:10:22 -0000 1.19 @@ -105,15 +105,13 @@ # Preliminary cleanup # -# Gump level tmp +# Gump-level tmp if [ -d $GUMP_TMP ] ; then - cd $GUMP_TMP - rm -f *.txt + rm -f $GUMP_TMP/*.txt fi # Gump work tmp if [ -d $GUMP_WS_TMP ] ; then - cd $GUMP_WS_TMP/tmp - rm -f *.txt + rm -f $GUMP_WS_TMP/*.txt fi # Clear the forrest build area... if [ -d $GUMP_WS/forrest/build/ ] ; then @@ -195,6 +193,8 @@ pkill -KILL -P $$ # $Log$ -# Revision 1.18 2003/10/23 20:28:22 ajack -# Remove *.txt from ws tmp, not ws -- thanks Nick. +# Revision 1.19 2003/10/23 23:10:22 ajack +# 1) Safer gumpy.sh cleanup +# 2) Set k-centipede runtime (stating with ant) +# 3) More printouts for testing CLASSPATH code # 1.9 +12 -13 jakarta-gump/project/krysalis-centipede.xml Index: krysalis-centipede.xml =================================================================== RCS file: /home/cvs/jakarta-gump/project/krysalis-centipede.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- krysalis-centipede.xml 23 Oct 2003 19:38:15 -0000 1.8 +++ krysalis-centipede.xml 23 Oct 2003 23:10:22 -0000 1.9 @@ -95,18 +95,18 @@ <property name="ant.home" project="ant" reference="home"/> </ant> - <depend project="ant" inherit="runtime" /> - <depend project="ant-contrib" /> - <depend project="commons-jxpath"/> - <depend project="commons-logging" /> - <depend project="commons-vfs" /> - <depend project="jakarta-regexp" /> - <depend project="krysalis-ruper-core" /> - <depend project="krysalis-version-core" /> - <depend project="krysalis-ruper-ant" /> - <depend project="krysalis-version-ant" /> - <depend project="xml-xalan2" /> - <depend project="xml-xerces" /> + <depend project="ant" inherit="runtime" runtime="true"/> + <depend project="ant-contrib" inherit="runtime" runtime="true"/> + <depend project="commons-jxpath" inherit="runtime" runtime="true"/> + <depend project="commons-logging" inherit="runtime" runtime="true"/> + <depend project="commons-vfs" inherit="runtime" runtime="true"/> + <depend project="jakarta-regexp" inherit="runtime" runtime="true"/> + <depend project="krysalis-ruper-core" inherit="runtime" runtime="true"/> + <depend project="krysalis-version-core" inherit="runtime" runtime="true"/> + <depend project="krysalis-ruper-ant" inherit="runtime" runtime="true"/> + <depend project="krysalis-version-ant" inherit="runtime" runtime="true"/> + <depend project="xml-xalan2" inherit="runtime" runtime="true"/> + <depend project="xml-xerces" inherit="runtime" runtime="true"/> <jar name="lib/krysalis-centipede.jar" /> <!-- Work dirs to be included in classpath --> @@ -139,7 +139,6 @@ <property name="ant.home" project="ant" reference="home"/> </ant> <depend project="krysalis-centipede" inherit="runtime" /> - <depend project="ant" inherit="runtime" /> <nag to="[EMAIL PROTECTED]" from="Nicola Ken Barozzi <[EMAIL PROTECTED]>"/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]