diff --git a/releng/org.eclipse.rse.build/build.properties b/releng/org.eclipse.rse.build/build.properties
index 19d739040bb..ab5010df177 100644
--- a/releng/org.eclipse.rse.build/build.properties
+++ b/releng/org.eclipse.rse.build/build.properties
@@ -1,4 +1,15 @@
+milestone=
+release=1.0${milestone}
+
archivePrefix=eclipse
-buildId=1.0M1
-buildLabel=S-1.0M1-20060427-1500
-collectingFolder=COLLECTOR
\ No newline at end of file
+collectingFolder=${archivePrefix}
+buildType=P
+buildId=unknown
+buildLabel=${buildType}-${release}-${buildId}
+mapVersionTag=HEAD
+
+#this is set to the tag from the map file unless forced here
+#forceContextQualifier=vYYYYMMDD
+
+#adds checksum suffix to directory names
+#generateFeatureVersionSuffix=true
diff --git a/releng/org.eclipse.rse.build/build.rb b/releng/org.eclipse.rse.build/build.rb
index d587a529428..23dc0b137ea 100644
--- a/releng/org.eclipse.rse.build/build.rb
+++ b/releng/org.eclipse.rse.build/build.rb
@@ -6,25 +6,54 @@
require "ftools"
+def ask(question, default)
+ message = "#{question} (default is #{default})"
+ STDERR.print message
+ answer = readline()
+ answer = answer.strip.empty? ? default : answer
+ return answer
+end
+
# "eclipse" is the location of the basic PDE and plugins to compile against
-# "builder" is the location of the build scripts (i.e. the contents of org.eclipse.rse.build)
-# "working" is where the build is actually done, does not need to exist
+# This should include the org.eclipse.pde.build project
eclipse = "c:/work/targets/OpenRSE-1.0/eclipse"
-builder = "."
+
+# "builder" is the location of the custom build scripts customTargets.xml and build.properties
+# (i.e. the contents of org.eclipse.rse.build)
+builder = File.expand_path(".") # needs to be an absolute path
+
+# "working" is where the build is actually done, does not need to exist
working = "c:/temp/build"
+# Find the base build scripts
+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 (N=Nightly, I=Integration, M=Milestone)", "N")
+buildId = ask("Enter the build id", 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 #{builder}/build.xml "
-command += "-DbuildDirectory=#{working}/build "
-command += "-DpackageDirectory=#{working}/package "
-command += "-DpublishDirectory=#{working}/publish "
+command += "-buildfile #{baseBuilder}/scripts/build.xml "
+command += "-DbuildDirectory=#{buildDirectory} "
+command += "-DpackageDirectory=#{packageDirectory} "
+command += "-DpublishDirectory=#{publishDirectory} "
command += "-Dbuilder=#{builder} "
command += "-DbaseLocation=#{eclipse} "
-command += "-Dbld_do_extract=yes "
-command += "-Dbld_do_build=yes "
-command += "-Dbld_do_package=yes "
-command += "-Dbld_do_publish=yes "
+command += "-DbuildType=#{buildType} "
+command += "-DbuildId=#{buildId} "
+command += "-DmapVersionTag=#{tag} "
puts(command)
diff --git a/releng/org.eclipse.rse.build/build.xml b/releng/org.eclipse.rse.build/build.xml
index 4bbcc0ac073..f721cdcb92b 100644
--- a/releng/org.eclipse.rse.build/build.xml
+++ b/releng/org.eclipse.rse.build/build.xml
@@ -1,145 +1,126 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index 6d028951008..04beec18a83 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -5,6 +5,10 @@
+
+
+
+
@@ -30,6 +34,10 @@
+
+
+
+
@@ -60,9 +68,19 @@
dest="${buildDirectory}/maps"
tag="${mapVersionTag}"
/>
- -->
-
+
+
+ -->
+
+
+
+
+
@@ -70,6 +88,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -128,6 +157,9 @@
+
+
+
@@ -161,19 +193,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -205,7 +224,7 @@
-
+
@@ -252,6 +271,10 @@
+
+
+
+
@@ -259,8 +282,8 @@
-
-
+
+
@@ -300,5 +323,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.rse.build/genericTargets.xml b/releng/org.eclipse.rse.build/genericTargets.xml
index b9ca652fa3f..306a588a62b 100644
--- a/releng/org.eclipse.rse.build/genericTargets.xml
+++ b/releng/org.eclipse.rse.build/genericTargets.xml
@@ -18,6 +18,13 @@
+
+
+
+
+
+
+
@@ -30,16 +37,15 @@
directory="${buildDirectory}/directory.txt"
fetchTag="${fetchTag}"
configInfo="${configs}"
+ baseLocation="${baseLocation}"
/>
-
-
-
+
@@ -55,14 +61,22 @@
-
-
@@ -73,20 +87,16 @@
-
-
-
-
@@ -105,6 +115,11 @@ set here?
+
+
+
+
+
@@ -135,6 +150,13 @@ set here?
+
+
+
+
+
+
+
@@ -145,4 +167,4 @@ set here?
-
+
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.build/myBuild.xml b/releng/org.eclipse.rse.build/myBuild.xml
new file mode 100644
index 00000000000..4bbcc0ac073
--- /dev/null
+++ b/releng/org.eclipse.rse.build/myBuild.xml
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.rse.build/myGenericTargets.xml b/releng/org.eclipse.rse.build/myGenericTargets.xml
new file mode 100644
index 00000000000..b9ca652fa3f
--- /dev/null
+++ b/releng/org.eclipse.rse.build/myGenericTargets.xml
@@ -0,0 +1,148 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/releng/org.eclipse.rse.build/rse.map b/releng/org.eclipse.rse.build/rse.map
index c61402c2b9a..de6334e7d48 100644
--- a/releng/org.eclipse.rse.build/rse.map
+++ b/releng/org.eclipse.rse.build/rse.map
@@ -1,29 +1,31 @@
-feature@org.eclipse.rse.core=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
-feature@org.eclipse.rse.dstore=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
-feature@org.eclipse.rse.ftp=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
-feature@org.eclipse.rse.local=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
-plugin@org.eclipse.dstore.core=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
-plugin@org.eclipse.dstore.extra=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
-plugin@org.eclipse.rse.connectorservice.dstore=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
-plugin@org.eclipse.rse.connectorservice.local=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
-plugin@org.eclipse.rse.core=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
-plugin@org.eclipse.rse.dstore.security=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
-plugin@org.eclipse.rse.files.ui=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
-plugin@org.eclipse.rse.logging=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.logging
-plugin@org.eclipse.rse.processes.ui=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
-plugin@org.eclipse.rse.services.dstore=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
-plugin@org.eclipse.rse.services.files.ftp=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
-plugin@org.eclipse.rse.services.local=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
-plugin@org.eclipse.rse.services=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
-plugin@org.eclipse.rse.shells.ui=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
-plugin@org.eclipse.rse.subsystems.files.core=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
-plugin@org.eclipse.rse.subsystems.files.dstore=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
-plugin@org.eclipse.rse.subsystems.files.ftp=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
-plugin@org.eclipse.rse.subsystems.files.local=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
-plugin@org.eclipse.rse.subsystems.processes.core=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
-plugin@org.eclipse.rse.subsystems.processes.dstore=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
-plugin@org.eclipse.rse.subsystems.processes.local=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
-plugin@org.eclipse.rse.subsystems.shells.core=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
-plugin@org.eclipse.rse.subsystems.shells.dstore=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
-plugin@org.eclipse.rse.subsystems.shells.local=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
-plugin@org.eclipse.rse.ui=v20060427,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
+feature@org.eclipse.rse.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.sdk-feature
+feature@org.eclipse.rse.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
+feature@org.eclipse.rse.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
+feature@org.eclipse.rse.ftp=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.ftp-feature
+feature@org.eclipse.rse.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.local-feature
+plugin@org.eclipse.dstore.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.core
+plugin@org.eclipse.dstore.extra=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.dstore.extra
+plugin@org.eclipse.rse.connectorservice.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.dstore
+plugin@org.eclipse.rse.connectorservice.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.connectorservice.local
+plugin@org.eclipse.rse.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.core
+plugin@org.eclipse.rse.dstore.security=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.dstore.security
+plugin@org.eclipse.rse.files.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.files.ui
+plugin@org.eclipse.rse.logging=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.logging
+plugin@org.eclipse.rse.processes.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.processes.ui
+plugin@org.eclipse.rse.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.sdk
+plugin@org.eclipse.rse.services.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.dstore
+plugin@org.eclipse.rse.services.files.ftp=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.files.ftp
+plugin@org.eclipse.rse.services.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
+plugin@org.eclipse.rse.services=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
+plugin@org.eclipse.rse.shells.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
+plugin@org.eclipse.rse.subsystems.files.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
+plugin@org.eclipse.rse.subsystems.files.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
+plugin@org.eclipse.rse.subsystems.files.ftp=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
+plugin@org.eclipse.rse.subsystems.files.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
+plugin@org.eclipse.rse.subsystems.processes.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.core
+plugin@org.eclipse.rse.subsystems.processes.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.dstore
+plugin@org.eclipse.rse.subsystems.processes.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.processes.local
+plugin@org.eclipse.rse.subsystems.shells.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.core
+plugin@org.eclipse.rse.subsystems.shells.dstore=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.dstore
+plugin@org.eclipse.rse.subsystems.shells.local=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
+plugin@org.eclipse.rse.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui