|
From: Markus B. <mba...@us...> - 2005-09-18 10:21:40
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3396/bootstrap Modified Files: run.sh Log Message: define noclean instead of clean; new variable buildTarget Index: run.sh =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.build/bootstrap/run.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** run.sh 13 Jul 2005 22:05:15 -0000 1.8 --- run.sh 18 Sep 2005 10:21:29 -0000 1.9 *************** *** 14,18 **** arch=${RDT_ARCH:-x86} usePserver=${RDT_USE_PSERVER:+-DusePserver=true} ! testClean=${RDT_TEST_CLEAN:+-Dclean=true} dontRunTests=${RDT_DONT_RUN_TESTS:+-DdontRunTests=true} --- 14,19 ---- arch=${RDT_ARCH:-x86} usePserver=${RDT_USE_PSERVER:+-DusePserver=true} ! # the default is to clean up before testing, it can be avoided by defining noclean ! testNoclean=${RDT_TEST_NOCLEAN:+-Dnoclean=true} dontRunTests=${RDT_DONT_RUN_TESTS:+-DdontRunTests=true} *************** *** 22,28 **** buildfile=$eclipseDir/plugins/org.eclipse.pde.build_$pdeBuildPluginVersion/scripts/build.xml echo Starting eclipse in $eclipseDir, $vm ! cmd="$vm -cp $eclipseDir/startup.jar org.eclipse.core.launcher.Main -ws $ws -os $os -application org.eclipse.ant.core.antRunner -buildfile $buildfile -data $buildDirectory/workspace $verboseAnt $usePserver $dontRunTests -Dbasews=$ws -Dbaseos=$os -Dbasearch=$arch -Dbuilder=$bootstrapDir $testClean -DjavacFailOnError=true -DbuildDirectory=$buildDirectory -DbaseLocation=$eclipseDir -DeclipseAutomatedTestHome=$eclipseAutomatedTestHome -Drdt.rubyInterpreter="$rubyInterpreter" -Drdt-tests-workspace=$buildDirectory/workspace-rdt-tests -Ddocbook.root=$docbookRoot" echo $cmd exec $cmd \ No newline at end of file --- 23,32 ---- buildfile=$eclipseDir/plugins/org.eclipse.pde.build_$pdeBuildPluginVersion/scripts/build.xml + # buildTarget can be one of the build targets defined in $buildfile: + # main, preBuild, fetch, generate, process, assemble, package, postBuild, clean + buildTarget=${RDT_BUILD_TARGET:+main} echo Starting eclipse in $eclipseDir, $vm ! cmd="$vm -cp $eclipseDir/startup.jar org.eclipse.core.launcher.Main -ws $ws -os $os -application org.eclipse.ant.core.antRunner -buildfile $buildfile $buildTarget -data $buildDirectory/workspace $verboseAnt $usePserver $dontRunTests -Dbasews=$ws -Dbaseos=$os -Dbasearch=$arch -Dbuilder=$bootstrapDir $testNoclean -DjavacFailOnError=true -DbuildDirectory=$buildDirectory -DbaseLocation=$eclipseDir -DeclipseAutomatedTestHome=$eclipseAutomatedTestHome -Drdt.rubyInterpreter="$rubyInterpreter" -Drdt-tests-workspace=$buildDirectory/workspace-rdt-tests -Ddocbook.root=$docbookRoot" echo $cmd exec $cmd \ No newline at end of file |