1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00

Numerous minor changes to the build scripts.

This commit is contained in:
Doug Schaefer 2004-04-22 14:24:25 +00:00
parent 3b65eeb53f
commit 8d2a6c50a0
11 changed files with 300 additions and 134 deletions

View file

@ -6,4 +6,4 @@ export PATH=$JAVA_HOME/bin:$PATH
cd `dirname $0`
java -cp ../../startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner $* 2>&1 | tee build.log
java -cp ../org.eclipse.releng.basebuilder/startup.jar org.eclipse.core.launcher.Main -application org.eclipse.ant.core.antRunner $* 2>&1 | tee build.log

View file

@ -11,7 +11,7 @@
<property name="timestamp" value="${DSTAMP}${TSTAMP}" />
<property name="buildDirectory" value="${basedir}/results" />
<property name="baseLocation" value="${buildDirectory}/eclipse"/>
<property name="pde.build.scripts" value="${baseLocation}/plugins/org.eclipse.pde.build_3.0.0/scripts" />
<property name="pde.build.scripts" value="${basedir}/../org.eclipse.releng.basebuilder/plugins/org.eclipse.pde.build_3.0.0/scripts" />
<property name="eclipseZip" value="eclipse-SDK.zip"/>
<property name="buildType" value="I" />
<property name="buildId" value="${buildType}${timestamp}"/>
@ -21,6 +21,7 @@
<property name="sitedir" value="${buildDirectory}/build.site"/>
<property name="siteversion" value="2.0.0"/>
<property name="milestonedir" value="${buildDirectory}/${milestone}"/>
<property name="buildingOSGi" value="true"/>
</target>
<target name="zips" depends="init">
@ -28,9 +29,9 @@
<ant antfile="build.xml" dir="${pde.build.scripts}">
<property name="builder" value="${basedir}/platform" />
</ant>
<ant antfile="build.xml" dir="${pde.build.scripts}">
<property name="builder" value="${basedir}/builders" />
</ant>
<!--ant antfile="build.xml" dir="${pde.build.scripts}">
<property name="builder" value="${basedir}/sdk" />
</ant-->
<concat destfile="compile.log">
<fileset dir="${buildDirectory}/plugins" includes="**/*.bin.log"/>
</concat>
@ -47,8 +48,6 @@
<!-- This depends on what platform we run the test, it would be
nice to figure this out on the fly -->
<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-linux.gtk.x86.zip" dest="${buildDirectory}"/>
<unzip src="${zipsdir}/org.eclipse.cdt.make-${buildId}.zip" dest="${buildDirectory}"/>
<unzip src="${zipsdir}/org.eclipse.cdt.managedbuilder-${buildId}.zip" dest="${buildDirectory}"/>
<unzip src="${zipsdir}/org.eclipse.cdt.testing-${buildId}.zip" dest="${buildDirectory}"/>
<copy todir="${buildDirectory}/eclipse/plugins/org.eclipse.test">
<fileset dir="../org.eclipse.test"/>
@ -71,8 +70,6 @@
<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-qnx.photon.x86.zip" dest="${sitedir}"/>
<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-solaris.motif.sparc.zip" dest="${sitedir}"/>
<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-win32.win32.x86.zip" dest="${sitedir}"/>
<unzip src="${zipsdir}/org.eclipse.cdt.make-${buildId}.zip" dest="${sitedir}"/>
<unzip src="${zipsdir}/org.eclipse.cdt.managedbuilder-${buildId}.zip" dest="${sitedir}"/>
<antcall target="allElements">
<param name="target" value="updateJars"/>
</antcall>
@ -94,8 +91,8 @@
</xslt>
<move file="x" tofile="${sitedir}/eclipse/${dir}/${id}_${siteversion}/${type}.xml"/>
<mkdir dir="${sitedir}/${dir}"/>
<jar basedir="${sitedir}/eclipse/${dir}/${id}_${siteversion}"
destfile="${sitedir}/${dir}/${id}_${siteversion}.${timestamp}.jar"/>
<zip basedir="${sitedir}/eclipse/${dir}/${id}_${siteversion}"
zipfile="${sitedir}/${dir}/${id}_${siteversion}.${timestamp}.jar"/>
</target>
<target name="milestoneSite" depends="init" unless="hasErrors">
@ -106,8 +103,6 @@
<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-qnx.photon.x86.zip" dest="${milestonedir}"/>
<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-solaris.motif.sparc.zip" dest="${milestonedir}"/>
<unzip src="${zipsdir}/org.eclipse.cdt-${buildId}-win32.win32.x86.zip" dest="${milestonedir}"/>
<unzip src="${zipsdir}/org.eclipse.cdt.make-${buildId}.zip" dest="${milestonedir}"/>
<unzip src="${zipsdir}/org.eclipse.cdt.managedbuilder-${buildId}.zip" dest="${milestonedir}"/>
<antcall target="allElements">
<param name="target" value="milestoneJars"/>
</antcall>
@ -156,7 +151,7 @@
<target name="mailFail" if="hasErrors">
<mail subject="CDT Build ${siteversion}.${timestamp} failed"
tolist="cdt-test-dev@eclipse.org" from="dschaefe@ca.ibm.com">
<message src="compile.logs"/>
<message src="compile.log"/>
</mail>
</target>
@ -166,16 +161,6 @@
<param name="dir" value="features"/>
<param name="id" value="org.eclipse.cdt"/>
</antcall>
<antcall target="${target}">
<param name="type" value="feature"/>
<param name="dir" value="features"/>
<param name="id" value="org.eclipse.cdt.make"/>
</antcall>
<antcall target="${target}">
<param name="type" value="feature"/>
<param name="dir" value="features"/>
<param name="id" value="org.eclipse.cdt.managedbuilder"/>
</antcall>
<antcall target="${target}">
<param name="type" value="plugin"/>
<param name="dir" value="plugins"/>

View file

@ -68,11 +68,9 @@ zipargs=
# The location of the Java jars to compile against. Typically the rt.jar for your JDK/JRE
#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
# Whether or not to include debug info in the output jars
javacDebugInfo=true
# Whether or not to fail the build if there are compiler errors
javacfailonerror=true
javacDebugInfo=on
javacVerbose=true
javacFailOnError=false
# The version of the source code
#javaSource=1.3

View file

@ -5,5 +5,3 @@ org.eclipse.cdt-@buildId@-linux.motif.x86.zip = http://download.eclipse.org/tool
org.eclipse.cdt-@buildId@-qnx.photon.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | qnx,photon,x86 | | runtime
org.eclipse.cdt-@buildId@-solaris.motif.sparc.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | solaris,motif,sparc | | runtime
org.eclipse.cdt-@buildId@-win32.win32.x86.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | win32,win32,x86 | | runtime
org.eclipse.cdt.make-@buildId@.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | | | runtime
org.eclipse.cdt.managedbuilder-@buildId@.zip = http://download.eclipse.org/tools/cdt/updates/builds/2.0/zips/@buildId@/ | | | runtime

View file

@ -173,57 +173,43 @@
</font>
</a>
</td>
<td>
<a>
<xsl:attribute name="href">
<xsl:text>zips/I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>/org.eclipse.cdt.make-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</xsl:attribute>
<font size="1">
<xsl:text>org.eclipse.cdt.make-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</font>
</a>
</td>
</tr>
<tr>
<td>
<a>
<xsl:attribute name="href">
<xsl:text>zips/I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>/org.eclipse.cdt.managedbuilder-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</xsl:attribute>
<font size="1">
<xsl:text>org.eclipse.cdt.managedbuilder-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</font>
</a>
</td>
<td>
<a>
<xsl:attribute name="href">
<xsl:text>zips/I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>/org.eclipse.cdt.testing-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</xsl:attribute>
<font size="1">
<xsl:text>org.eclipse.cdt.testing-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</font>
</a>
</td>
</tr>
<xsl:if test="substring(@label, 17, 8) &lt; '20040420'">
<tr>
<td>
<a>
<xsl:attribute name="href">
<xsl:text>zips/I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>/org.eclipse.cdt.make-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</xsl:attribute>
<font size="1">
<xsl:text>org.eclipse.cdt.make-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</font>
</a>
</td>
<td>
<a>
<xsl:attribute name="href">
<xsl:text>zips/I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>/org.eclipse.cdt.managedbuilder-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</xsl:attribute>
<font size="1">
<xsl:text>org.eclipse.cdt.managedbuilder-I</xsl:text>
<xsl:value-of select="substring(@label, 17, 12)"/>
<xsl:text>.zip</xsl:text>
</font>
</a>
</td>
</tr>
</xsl:if>
</table>
</li>
</ul>

View file

@ -3,6 +3,12 @@
plugin@org.eclipse.cdt.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.make.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.make.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.managedbuilder.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.managedbuilder.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.debug.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.debug.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
@ -24,16 +30,6 @@ fragment@org.eclipse.cdt.core.qnx=HEAD,:pserver:anonymous@dev.eclipse.org:/home/
fragment@org.eclipse.cdt.core.solaris=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
fragment@org.eclipse.cdt.core.win32=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
! Builders
plugin@org.eclipse.cdt.make.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.make.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
feature@org.eclipse.cdt.make=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt.make-feature
plugin@org.eclipse.cdt.managedbuilder.core=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
plugin@org.eclipse.cdt.managedbuilder.ui=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
feature@org.eclipse.cdt.managedbuilder=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt.managedbuilder-feature
! Testing feature
plugin@org.eclipse.cdt.core.tests=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,
@ -44,3 +40,4 @@ feature@org.eclipse.cdt.testing=HEAD,:pserver:anonymous@dev.eclipse.org:/home/to
! Source Feature
feature@org.eclipse.cdt.source=HEAD,:pserver:anonymous@dev.eclipse.org:/home/tools,,org.eclipse.cdt.source-feature

View file

@ -75,11 +75,9 @@ zipargs=
# The location of the Java jars to compile against. Typically the rt.jar for your JDK/JRE
#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
# Whether or not to include debug info in the output jars
javacDebugInfo=true
# Whether or not to fail the build if there are compiler errors
javacfailonerror=true
javacDebugInfo=on
javacVerbose=true
javacFailOnError=false
# The version of the source code
#javaSource=1.3

View file

@ -0,0 +1,88 @@
#####################
# Parameters describing how and where to execute the build.
# Typical users need only update the following properties:
# baseLocation - where things you are building against are installed
# bootclasspath - The base jars to compile against (typicaly rt.jar)
# configs - the list of {os, ws, arch} configurations to build.
#
# Of course any of the settings here can be overridden by spec'ing
# them on the command line (e.g., -DbaseLocation=d:/eclipse
############# CVS CONTROL ################
# The CVS tag to use when fetching the map files from the repository
mapVersionTag=HEAD
# The CVS tag to use when fetching elements to build. By default the
# builder will use whatever is in the maps. Use this value to override
# for example, when doing a nightly build out of HEAD
# fetchTag=HEAD
############## BUILD / GENERATION CONTROL ################
# The directory into which the build elements will be fetched and where
# the build will take place. buildDirectory and install should be the same
# value.
buildDirectory=build
# Type of build. Used in naming the build output. Typically this value is
# one of I, N, M, S, ...
buildType=I
# ID of the build. Used in naming the build output.
buildId=TestBuild
# Label for the build. Used in naming the build output
buildLabel=${buildType}.${buildId}
# Timestamp for the build. Used in naming the build output
timestamp=007
# Base location for anything the build needs to compile against. For example,
# when building GEF, the baseLocation should be the location of a previously
# installed Eclipse against which the GEF code will be compiled.
baseLocation=
#Os/Ws/Arch/nl of the eclipse specified by baseLocation
#baseos
#basews
#basearch
#basenl
# The location underwhich all of the build output will be collected. This will be
# the root path in the resultant zip file.
collPlace=eclipse
# The directory in which to execute zip of the ${collPlace} directory
collBase=.
# The list of {os, ws, arch} configurations to build. This
# value is a '&' separated list of ',' separate triples. For example,
# configs=win32,win32,x86 & linux,motif,x86
# By default the value is *,*,*
configs=\
aix,motif,ppc \
& hpux,motif,PA_RISC \
& linux,gtk,x86 \
& linux,motif,x86 \
& qnx,photon,x86 \
& solaris,motif,sparc \
& win32,win32,x86
#Arguments to send to the zip executable
zipargs=
############# JAVA COMPILER OPTIONS ##############
# The location of the Java jars to compile against. Typically the rt.jar for your JDK/JRE
#bootclasspath=d:/ibm1.3.1/jre/lib/rt.jar
# Whether or not to include debug info in the output jars
javacDebugInfo=true
# Whether or not to fail the build if there are compiler errors
javacfailonerror=true
# The version of the source code
#javaSource=1.3
# The version of the byte code targeted
#javacTarget=1.1

View file

@ -0,0 +1,154 @@
<project name="Build specific targets and properties" default="noDefault" >
<property name="basews" value="gtk" />
<property name="baseos" value="linux" />
<property name="basearch" value="x86" />
<property name="basenl" value="en_US" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
<!-- ===================================================================== -->
<target name="allElements">
<ant antfile="${genericTargets}" target="${target}" >
<property name="type" value="feature" />
<property name="id" value="org.eclipse.cdt.source" />
</ant>
</target>
<!-- ===================================================================== -->
<!-- Targets to assemble the built elements for particular configurations -->
<!-- These generally call the generated assemble scripts (named in -->
<!-- ${assembleScriptName}) but may also add pre and post processing -->
<!-- Add one target for each root element and each configuration -->
<!-- ===================================================================== -->
<target name="assemble.org.eclipse.cdt.source.aix.motif.ppc">
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
<target name="assemble.org.eclipse.cdt.source.hpux.motif.PA_RISC">
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
<target name="assemble.org.eclipse.cdt.source.linux.gtk.x86">
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
<target name="assemble.org.eclipse.cdt.source.linux.motif.x86">
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
<target name="assemble.org.eclipse.cdt.source.qnx.photon.x86">
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
<target name="assemble.org.eclipse.cdt.source.solaris.motif.sparc">
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
<target name="assemble.org.eclipse.cdt.source.win32.win32.x86">
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
<!-- ===================================================================== -->
<!-- Check out map files from correct repository -->
<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
<!-- ===================================================================== -->
<target name="getMapFiles">
<copy todir="${buildDirectory}/maps">
<fileset dir="${builder}/../maps"/>
</copy>
</target>
<!-- ===================================================================== -->
<!-- Steps to do before setup -->
<!-- ===================================================================== -->
<target name="preSetup">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after setup but before starting the build proper -->
<!-- ===================================================================== -->
<target name="postSetup">
</target>
<!-- ===================================================================== -->
<!-- Steps to do before fetching the build elements -->
<!-- ===================================================================== -->
<target name="preFetch">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after fetching the build elements -->
<!-- ===================================================================== -->
<target name="postFetch">
</target>
<!-- ===================================================================== -->
<!-- Steps to do before generating the build scripts. -->
<!-- ===================================================================== -->
<target name="preGenerate">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts. -->
<!-- ===================================================================== -->
<target name="postGenerate">
</target>
<!-- ===================================================================== -->
<!-- Steps to do before running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
<target name="preProcess">
<replace dir="${buildDirectory}/plugins" value="${timestamp}" token="@build@">
<include name="**/about.mappings" />
</replace>
</target>
<!-- ===================================================================== -->
<!-- Steps to do after running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
<target name="postProcess">
</target>
<!-- ===================================================================== -->
<!-- Steps to do before running assemble. -->
<!-- ===================================================================== -->
<target name="preAssemble">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after running assemble. -->
<!-- ===================================================================== -->
<target name="postAssemble">
</target>
<!-- ===================================================================== -->
<!-- Steps to do after the build is done. -->
<!-- ===================================================================== -->
<target name="postBuild">
</target>
<!-- ===================================================================== -->
<!-- Steps to do to test the build results -->
<!-- ===================================================================== -->
<target name="test">
</target>
<!-- ===================================================================== -->
<!-- Steps to do to publish the build results -->
<!-- ===================================================================== -->
<target name="publish">
</target>
<!-- ===================================================================== -->
<!-- Default target -->
<!-- ===================================================================== -->
<target name="noDefault">
<echo message="You must specify a target when invoking this file" />
</target>
</project>

View file

@ -4,10 +4,4 @@
<feature id="org.eclipse.cdt" url="features/org.eclipse.cdt_2.0.0.jar" version="2.0.0">
<category name="cdt"/>
</feature>
<feature id="org.eclipse.cdt.make" url="features/org.eclipse.cdt.make_2.0.0.jar" version="2.0.0">
<category name="cdt"/>
</feature>
<feature id="org.eclipse.cdt.managedbuilder" url="features/org.eclipse.cdt.managedbuilder_2.0.0.jar" version="2.0.0">
<category name="cdt"/>
</feature>
</site>

View file

@ -33,38 +33,6 @@
</xsl:attribute>
</category>
</feature>
<feature id="org.eclipse.cdt.make">
<xsl:attribute name="url">
<xsl:text>features/org.eclipse.cdt.make_</xsl:text>
<xsl:value-of select="$version"/>
<xsl:text>.jar</xsl:text>
</xsl:attribute>
<xsl:attribute name="version">
<xsl:value-of select="$version"/>
</xsl:attribute>
<category>
<xsl:attribute name="name">
<xsl:text>cdt_</xsl:text>
<xsl:value-of select="$version"/>
</xsl:attribute>
</category>
</feature>
<feature id="org.eclipse.cdt.managedbuilder">
<xsl:attribute name="url">
<xsl:text>features/org.eclipse.cdt.managedbuilder_</xsl:text>
<xsl:value-of select="$version"/>
<xsl:text>.jar</xsl:text>
</xsl:attribute>
<xsl:attribute name="version">
<xsl:value-of select="$version"/>
</xsl:attribute>
<category>
<xsl:attribute name="name">
<xsl:text>cdt_</xsl:text>
<xsl:value-of select="$version"/>
</xsl:attribute>
</category>
</feature>
</site>
</xsl:template>