Still working out build.
diff --git a/releng/org.eclipse.amp.releng/build-local-macosx.properties b/releng/org.eclipse.amp.releng/build-local-macosx.properties
index 3629fd2..b7cb653 100644
--- a/releng/org.eclipse.amp.releng/build-local-macosx.properties
+++ b/releng/org.eclipse.amp.releng/build-local-macosx.properties
@@ -6,14 +6,14 @@
 thirdPartyDownloadLicenseAcceptance="I accept"

 

 # MUST BE SET #

-projectid=emf.mwe

-zipPrefix=emft-mwe

+projectid=modeling.amp

+zipPrefix=AMP

 incubation=-incubation

-version=0.7.2

-buildType=N

-mainFeatureToBuildID=org.eclipse.emf.mwe.sdk

-testFeatureToBuildID=org.eclipse.emf.mwe.tests

-

+version=0.2.0

+buildType=I

+mainFeatureToBuildID=org.eclipse.amp.all.feature

+testFeatureToBuildID=org.eclipse.amp.test

+downloadsDir=/Users/milesparker/Downloads

 

 #	LINUX		#

 #JAVA_HOME=/opt/public/common/ibm-java2-ppc-50

@@ -24,16 +24,15 @@
 

 #-------------#

 #	Mac OSX	#

-JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

-JAVA60_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

-JAVA50_64_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

-JAVA50_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

-JAVA14_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home

+JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

+JAVA60_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

+JAVA50_64_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

+JAVA50_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

+JAVA14_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home

 JavaSE-1.6=${JAVA60_HOME}/jre/lib/rt.jar:${JAVA60_HOME}/jre/lib/annotation.jar:${JAVA60_HOME}/jre/lib/beans.jar:${JAVA60_HOME}/jre/lib/ibmorbapi.jar:${JAVA60_HOME}/jre/lib/java.util.jar:${JAVA60_HOME}/jre/lib/jlm.jar:${JAVA60_HOME}/jre/lib/logging.jar:${JAVA60_HOME}/jre/lib/resources.jar:${JAVA60_HOME}/jre/lib/rt.jar:${JAVA60_HOME}/jre/lib/security.jar:${JAVA60_HOME}/jre/lib/sql.jar:${JAVA60_HOME}/jre/lib/vm.jar:${JAVA60_HOME}/jre/lib/xmldsigfw.jar:${JAVA60_HOME}/jre/lib/xml.jar:${JAVA60_HOME}/jre/lib/jsse.jar:${JAVA60_HOME}/lib/dt.jar:${JAVA60_HOME}/../Classes/dt.jar:${JAVA60_HOME}/../Classes/classes.jar:${JAVA60_HOME}/../Classes/jsse.jar

 J2SE-1.5=${JAVA50_HOME}/jre/lib/rt.jar:${JAVA50_HOME}/jre/lib/vm.jar:${JAVA50_HOME}/jre/lib/core.jar:${JAVA50_HOME}/jre/lib/xml.jar:${JAVA50_HOME}/jre/lib/graphics.jar:${JAVA50_HOME}/jre/lib/server.jar:${JAVA50_HOME}/jre/lib/ibmorbapi.jar:${JAVA50_HOME}/jre/lib/security.jar:${JAVA50_HOME}/jre/lib/classes.jar:${JAVA50_HOME}/jre/lib/jsse.jar:${JAVA50_HOME}/../Classes/dt.jar:${JAVA50_HOME}/../Classes/classes.jar:${JAVA50_HOME}/../Classes/jsse.jar

 J2SE-1.4=${JAVA14_HOME}/lib/rt.jar:${JAVA14_HOME}/jre/lib/rt.jar:${JAVA14_HOME}/jre/lib/core.jar:${JAVA14_HOME}/jre/lib/xml.jar:${JAVA14_HOME}/jre/lib/graphics.jar:${JAVA14_HOME}/jre/lib/server.jar:${JAVA14_HOME}/jre/lib/ibmorbapi.jar:${JAVA14_HOME}/jre/lib/security.jar:${JAVA14_HOME}/jre/lib/classes.jar:${JAVA14_HOME}/jre/lib/jsse.jar:${JAVA14_HOME}/../Classes/dt.jar:${JAVA14_HOME}/../Classes/classes.jar:${JAVA14_HOME}/../Classes/jsse.jar

-

-dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/S-3.5.1RC1-200908070800/download.php?dropFile=eclipse-SDK-3.5.1RC1-macosx-cocoa-x86_64.tar.gz

+dependencyURLs=http://download.eclipse.org/eclipse/downloads/drops/S-3.5.1RC1-200908070800/eclipse-SDK-3.5.1RC1-macosx-cocoa-x86_64.tar.gz

 #what steps should we do? default: build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

 #build.steps=buildUpdate,buildZips,buildTests,generateDigests,test,publish,cleanup

 build.steps=buildUpdate

@@ -74,7 +73,7 @@
 #projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/tools

 projRelengRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling

 projRelengPath=org.eclipse.amp/releng/org.eclipse.amp.releng

-basebuilderBranch=R35_RC4

+basebuilderBranch=R35_M6
 

 # TODO: not used yet

 # define regex patterns to use when automatically selecting zips from a directory or list file

diff --git a/releng/org.eclipse.amp.releng/build.properties b/releng/org.eclipse.amp.releng/build.properties
index 436385c..1a94de6 100755
--- a/releng/org.eclipse.amp.releng/build.properties
+++ b/releng/org.eclipse.amp.releng/build.properties
@@ -11,9 +11,11 @@
 incubation=-incubation
 version=0.2.0
 buildType=I
-mainFeatureToBuildID=org.eclipse.amp.all
+mainFeatureToBuildID=org.eclipse.amp.all.feature
 testFeatureToBuildID=org.eclipse.amp.test
 
+downloadsDir=/Users/milesparker/Downloads
+
 # MUST BE SET #
 JAVA_HOME=/opt/public/common/ibm-java2-ppc-50
 JAVA50_HOME=/opt/public/common/ibm-java2-ppc-50
diff --git a/releng/org.eclipse.amp.releng/maps/amp.map b/releng/org.eclipse.amp.releng/maps/amp.map
index 0abf089..3a48cf5 100755
--- a/releng/org.eclipse.amp.releng/maps/amp.map
+++ b/releng/org.eclipse.amp.releng/maps/amp.map
@@ -29,22 +29,22 @@
 plugin@org.eclipse.amp.axf.ide.test=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.axf/tests/org.eclipse.amp.axf.ide.test
 
 !***FEATURES
-features@org.ascape.core.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.ascape/features/org.ascape.core.feature
-features@org.eclipse.amp.platform.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp/features/org.eclipse.amp.platform.feature
-features@org.eclipse.amp.agf.chart.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/features/org.eclipse.amp.agf.chart.feature
-features@org.eclipse.amp.agf.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/features/org.eclipse.amp.agf.feature
-features@org.eclipse.amp.agf.zest.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/features/org.eclipse.amp.agf.zest.feature
-features@org.eclipse.amp.agf3d.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature
-features@org.eclipse.amp.amf.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.feature
-features@org.eclipse.amp.amf.gen.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.gen.feature
-features@org.eclipse.amp.amf.ide.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.ide.feature
-features@org.eclipse.amp.amf.target.ascape.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.ascape.feature
+feature@org.ascape.core.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.ascape/features/org.ascape.core.feature
+feature@org.eclipse.amp.all.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp/features/org.eclipse.amp.all.feature
+feature@org.eclipse.amp.agf.chart.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/features/org.eclipse.amp.agf.chart.feature
+feature@org.eclipse.amp.agf.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/features/org.eclipse.amp.agf.feature
+feature@org.eclipse.amp.agf.zest.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/features/org.eclipse.amp.agf.zest.feature
+feature@org.eclipse.amp.agf3d.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/features/org.eclipse.amp.agf3d.feature
+feature@org.eclipse.amp.amf.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.feature
+feature@org.eclipse.amp.amf.gen.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.gen.feature
+feature@org.eclipse.amp.amf.ide.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.ide.feature
+feature@org.eclipse.amp.amf.target.ascape.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.ascape.feature
 !***TODO Fix this directory name on CVS
-features@org.eclipse.amp.amf.target.escape.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape
-features@org.eclipse.amp.amf.target.repast.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.repast.feature
-features@org.eclipse.amp.amfx.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amfx.feature
-features@org.eclipse.amp.axf.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.axf/features/org.eclipse.amp.axf.feature
-features@org.eclipse.amp.escape.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.escape/features/org.eclipse.amp.escape.feature
+feature@org.eclipse.amp.amf.target.escape.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.escape
+feature@org.eclipse.amp.amf.target.repast.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amf.target.repast.feature
+feature@org.eclipse.amp.amfx.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.amf/features/org.eclipse.amp.amfx.feature
+feature@org.eclipse.amp.axf.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.axf/features/org.eclipse.amp.axf.feature
+feature@org.eclipse.amp.escape.feature=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.escape/features/org.eclipse.amp.escape.feature
 
 !***PLUGINS
 plugins@org.eclipse.amp.agf.chart=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/modeling,,org.eclipse.amp/org.eclipse.amp.agf/plugins/org.eclipse.amp.agf.chart