r26 - tools/devel/trunk/bin

[Dennis Gregorovic <dgregoro@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Author: dgregoro
Date: 2004-09-23 17:51:36 +0200 (Thu, 23 Sep 2004)
New Revision: 26

Modified:
   tools/devel/trunk/bin/ccm-configure
Log:
print out all commands when using the verbose flag; use .tmp.project.xml as 
the source for the ccm.classpath tranformation

Modified: tools/devel/trunk/bin/ccm-configure
===================================================================
--- tools/devel/trunk/bin/ccm-configure 2004-09-22 19:50:06 UTC (rev 25)
+++ tools/devel/trunk/bin/ccm-configure 2004-09-23 15:51:36 UTC (rev 26)
@@ -42,8 +42,8 @@
     &checkSchema();
     &runxsl2("combine.xsl", "project.xml", ".tmp.project.xml");
     &runxsl2("build-template.xsl", ".tmp.project.xml", "build.xml");
-    &runxsl2("classpath-template.xsl", "project.xml", "ccm.classpath", 
"-PARAM shared.lib.dist.dir \"$sharedlibdir\" -PARAM base.dir $dir");
-    unlink(".tmp.project.xml");
+    &runxsl2("classpath-template.xsl", ".tmp.project.xml", "ccm.classpath", 
"-PARAM shared.lib.dist.dir \"$sharedlibdir\" -PARAM base.dir $dir");
+    #unlink(".tmp.project.xml");
 } else {
     if ( ! defined $version ) {
         print "  WARNING: Could not find ccmVersion attribute in ccm:project 
tag\n";
@@ -79,7 +79,9 @@
     print "Writing $outfile\n";
     my $classpath = join (":", File::Spec->catfile($CCM_CONFIG_HOME, "lib", 
"xalan.jar"), File::Spec->catfile($CCM_CONFIG_HOME,"lib","xerces.jar"));
     my $xsl = File::Spec->catfile ($CCM_CONFIG_HOME,"xsl",$xslfile);
-    CCM::CommandsUtil::runAndExitOnError("$JAVA_CMD -cp $classpath 
org.apache.xalan.xslt.Process -IN project.xml -XSL $xsl -OUT $outfile 
$params");
+    my $cmd = "$JAVA_CMD -cp $classpath org.apache.xalan.xslt.Process -IN 
project.xml -XSL $xsl -OUT $outfile $params";
+    print "$cmd\n" if ($verbose);
+    CCM::CommandsUtil::runAndExitOnError($cmd);
 }
 
 sub runxsl2 {
@@ -92,7 +94,9 @@
     my $classpath = CCM::Util::catpath(File::Spec->catfile($CCM_CONFIG_HOME, 
"lib", "xalan.jar"),
                                        
File::Spec->catfile($CCM_CONFIG_HOME,"lib","xercesImpl.jar"));
     my $xsl = File::Spec->catfile ($CCM_CONFIG_HOME,"xsl",$xslfile);
-    CCM::CommandsUtil::runAndExitOnError("$JAVA_CMD -cp $classpath 
org.apache.xalan.xslt.Process -IN $infile -XSL $xsl -OUT $outfile $params");
+    my $cmd = "$JAVA_CMD -cp $classpath org.apache.xalan.xslt.Process -IN 
$infile -XSL $xsl -OUT $outfile $params";
+    print "$cmd\n" if ($verbose);
+    CCM::CommandsUtil::runAndExitOnError($cmd);
 }
 
 sub getVersion {