removed incubation, added debug info, 3 part version number
diff --git a/org.eclipse.scout.releng/buildFiles/build.properties b/org.eclipse.scout.releng/buildFiles/build.properties
index 36b5ad5..40a8c3b 100644
--- a/org.eclipse.scout.releng/buildFiles/build.properties
+++ b/org.eclipse.scout.releng/buildFiles/build.properties
@@ -14,7 +14,7 @@
# skipSign=true
# skipDownloadRepository=true
# skipUpload=true
-incubation=true
+incubation=false
workspace=${env.WORKSPACE}
relengRootDir=${workspace}/org.eclipse.scout.releng
@@ -44,10 +44,10 @@
################# ECLIPSE 3.7 #######################
## uncomment X.X_skipValidateBuild to ensure a validate build gets done.
#3.7_skipValidateBuild=true
-3.7_eclipseFileName=eclipse-SDK-3.7RC4-win32.zip
-3.7_eclipseDownloadUrl=http://download.eclipse.org/eclipse/downloads/drops/S-3.7RC4-201106030909/${3.7_eclipseFileName}
-3.7_eclipseDeltapackName=eclipse-3.7RC4-delta-pack.zip
-3.7_eclipseDeltapackUrl=http://download.eclipse.org/eclipse/downloads/drops/S-3.7RC4-201106030909/${3.7_eclipseDeltapackName}
+3.7_eclipseFileName=eclipse-SDK-3.7-win32.zip
+3.7_eclipseDownloadUrl=http://download.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/${3.7_eclipseFileName}
+3.7_eclipseDeltapackName=eclipse-3.7-delta-pack.zip
+3.7_eclipseDeltapackUrl=http://download.eclipse.org/eclipse/downloads/drops/R-3.7-201106131736/${3.7_eclipseDeltapackName}
3.7_pdeBuildPluginVersion=3.7.0.v20110512-1320
3.7_equinoxLauncherPluginVersion=1.2.0.v20110502
@@ -64,8 +64,8 @@
versionMajor=3
versionMinor=7
-versionMicro=0
-versionMilestone=RC4
+versionMicro=1
+versionMilestone=RC2
#versionMilestone=N
eclipseVersion=[3.5,3.7]
diff --git a/org.eclipse.scout.releng/buildFiles/step020_buildFeatures.xml b/org.eclipse.scout.releng/buildFiles/step020_buildFeatures.xml
index 14fa7c6..0a7dde8 100644
--- a/org.eclipse.scout.releng/buildFiles/step020_buildFeatures.xml
+++ b/org.eclipse.scout.releng/buildFiles/step020_buildFeatures.xml
@@ -53,6 +53,7 @@
<arg line="-Djavahome=${env.JAVA_HOME}" />
<arg line="-DIndividualSourceBundles=true" />
<arg line="-DbuildType=${buildType}" />
+ <arg line="-DjavacDebugInfo=true" />
<classpath>
<pathelement location="${relengRootDir}/working/eclipse/plugins/org.eclipse.equinox.launcher_${equinoxLauncherPluginVersion}.jar" />
</classpath>
@@ -80,6 +81,7 @@
<arg line="-Djavahome=${env.JAVA_HOME}" />
<arg line="-DIndividualSourceBundles=true" />
<arg line="-DbuildType=${buildType}" />
+ <arg line="-DjavacDebugInfo=true" />
<classpath>
<pathelement location="${relengRootDir}/working/eclipse/plugins/org.eclipse.equinox.launcher_${equinoxLauncherPluginVersion}.jar" />
</classpath>
diff --git a/org.eclipse.scout.releng/buildFiles/step040_markIncubation.xml b/org.eclipse.scout.releng/buildFiles/step040_markIncubation.xml
index c07165d..bd34be8 100644
--- a/org.eclipse.scout.releng/buildFiles/step040_markIncubation.xml
+++ b/org.eclipse.scout.releng/buildFiles/step040_markIncubation.xml
@@ -24,28 +24,17 @@
</target>
<target name="build">
- <condition property="conditionIncubation">
- <istrue value="${incubation}" />
+ <condition property="skipMarkIncubation">
+ <isfalse value="${incubation}" />
</condition>
<available file="${buildDataDir}/step040/output/incubationMarker.created" property="skipStep040" />
- <antcall target="markIncubation" />
+ <antcall target="prepareMarkIncubation" />
<delete dir="${buildDataDir}/step040/input" failonerror="false" />
</target>
- <target name="skipTask" unless="conditionIncubation">
- <antcall target="clean" />
- <property name="outputFolder" location="${buildDataDir}/step040/output" />
- <mkdir dir="${outputFolder}" />
- <copy todir="${outputFolder}">
- <fileset dir="${buildDataDir}/step030/output">
- <include name="**/*" />
- <exclude name="*.created" />
- </fileset>
- </copy>
- <touch file="${outputFolder}/incubationMarker.created" />
- </target>
- <target name="markIncubation" unless="skipStep040">
+
+ <target name="prepareMarkIncubation" unless="skipStep040">
<antcall target="clean" />
<property name="inputFolder" location="${buildDataDir}/step040/input" />
<property name="outputFolder" location="${buildDataDir}/step040/output" />
@@ -57,12 +46,16 @@
<exclude name="*.created" />
</fileset>
</copy>
+ <antcall target="markIncubation" />
+ <touch file="${outputFolder}/incubationMarker.created" />
+ </target>
+
+ <target name="markIncubation" unless="skipMarkIncubation">
<custom.markIncubation>
<fileset dir="${buildDataDir}/step040/output">
<include name="**/**.jar" />
</fileset>
</custom.markIncubation>
- <touch file="${outputFolder}/incubationMarker.created" />
</target>
diff --git a/org.eclipse.scout.releng/buildFiles/upload.xml b/org.eclipse.scout.releng/buildFiles/upload.xml
index c2d994c..81ca622 100644
--- a/org.eclipse.scout.releng/buildFiles/upload.xml
+++ b/org.eclipse.scout.releng/buildFiles/upload.xml
@@ -31,7 +31,7 @@
<condition property="repository" value="nightly">
<equals arg1="N" arg2="${buildType}" />
</condition>
- <condition property="repository" value="${versionMajor}.${versionMinor}">
+ <condition property="repository" value="${versionMajor}.${versionMinor}.${versionMicro}">
<or>
<equals arg1="R" arg2="${buildType}" />
<equals arg1="S" arg2="${buildType}" />
