From 4293d74b9d46a8270e11254c18a2c16b157afe75 Mon Sep 17 00:00:00 2001 From: David Dykstal Date: Tue, 27 Jun 2006 02:18:56 +0000 Subject: [PATCH] making the ruby version identical to the perl version --- releng/org.eclipse.rse.build/build.rb | 130 +++++++++++++------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb index a74dd190d5a..e5d9945a05c 100644 --- a/releng/org.eclipse.rse.build/build.rb +++ b/releng/org.eclipse.rse.build/build.rb @@ -1,66 +1,66 @@ -#!/usr/bin/ruby -# Build script for Remote System Explorer -# Author: Dave Dykstal, Kushal Munir -# Prerequisites: -# written in ruby -# java and cvs have to be in the path - -require "ftools" - -def ask(question, default) - message = "#{question} (default is #{default}): " - STDERR.print message - answer = readline().strip - answer = answer.empty? ? default : answer - return answer -end - -# "eclipse" is the location of the basic PDE and plugins to compile against -# This should include the org.eclipse.pde.build project -eclipse = "../eclipse" - -# "builder" is the location of the custom build scripts customTargets.xml and build.properties -# (i.e. the contents of org.eclipse.rse.build) -builder = "." - -# "working" is where the build is actually done, does not need to exist -working = "../build" - -# make these absolute paths -eclipse = File.expand_path(eclipse) -builder = File.expand_path(builder) -working = File.expand_path(working) - -# Find the base build scripts: genericTargets.xml and build.xml -candidates = Dir["#{eclipse}/plugins/org.eclipse.pde.build*"] -if (candidates.size == 0) then - raise("PDE Build was not found.") -end -if (candidates.size > 1) then - raise("Too many versions of PDE Build were found.") -end -baseBuilder = candidates[0] - -buildDirectory = "#{working}/build" -packageDirectory = "#{working}/package" -publishDirectory = "#{working}/publish" - -tag = ask("Enter tag to fetch from CVS", "HEAD") -buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P") -buildId = ask("Enter the build id", buildType + Time.now.strftime("%Y%m%d-%H%M")) - -command = "java -cp #{eclipse}/startup.jar org.eclipse.core.launcher.Main " -command += "-application org.eclipse.ant.core.antRunner " -command += "-buildfile #{baseBuilder}/scripts/build.xml " -command += "-DbuildDirectory=#{buildDirectory} " -command += "-DpackageDirectory=#{packageDirectory} " -command += "-DpublishDirectory=#{publishDirectory} " -command += "-Dbuilder=#{builder} " -command += "-DbaseLocation=#{eclipse} " -command += "-DbuildType=#{buildType} " -command += "-DbuildId=#{buildId} " -command += "-DmapVersionTag=#{tag} " - -puts(command) - +#!/usr/bin/ruby +# Build script for Remote System Explorer +# Author: Dave Dykstal, Kushal Munir +# Prerequisites: +# written in ruby +# java and cvs have to be in the path + +require "ftools" + +def ask(question, default) + message = "#{question} (default is #{default}): " + STDERR.print message + answer = readline().strip + answer = answer.empty? ? default : answer + return answer +end + +# "eclipse" is the location of the basic PDE and plugins to compile against +# This should include the org.eclipse.pde.build project +eclipse = "../eclipse" + +# "builder" is the location of the custom build scripts customTargets.xml and build.properties +# (i.e. the contents of org.eclipse.rse.build) +builder = "." + +# "working" is where the build is actually done, does not need to exist +working = "../working" + +# make these absolute paths +eclipse = File.expand_path(eclipse) +builder = File.expand_path(builder) +working = File.expand_path(working) + +# Find the base build scripts: genericTargets.xml and build.xml +candidates = Dir["#{eclipse}/plugins/org.eclipse.pde.build*"] +if (candidates.size == 0) then + raise("PDE Build was not found.") +end +if (candidates.size > 1) then + raise("Too many versions of PDE Build were found.") +end +baseBuilder = candidates[0] + +buildDirectory = "#{working}/build" +packageDirectory = "#{working}/package" +publishDirectory = "#{working}/publish" + +tag = ask("Enter tag to fetch from CVS", "HEAD") +buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P") +buildId = ask("Enter the build id", buildType + Time.now.strftime("%Y%m%d%H%M")) + +command = "java -cp #{eclipse}/startup.jar org.eclipse.core.launcher.Main " +command += "-application org.eclipse.ant.core.antRunner " +command += "-buildfile #{baseBuilder}/scripts/build.xml " +command += "-DbuildDirectory=#{buildDirectory} " +command += "-DpackageDirectory=#{packageDirectory} " +command += "-DpublishDirectory=#{publishDirectory} " +command += "-Dbuilder=#{builder} " +command += "-DbaseLocation=#{eclipse} " +command += "-DbuildType=#{buildType} " +command += "-DbuildId=#{buildId} " +command += "-DmapVersionTag=#{tag} " + +puts(command) + system(command) \ No newline at end of file