Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivian Kong2008-04-09 15:19:39 +0000
committerVivian Kong2008-04-09 15:19:39 +0000
commit1ec18cdaf50db261ac92e87a5074ab33858853c5 (patch)
treec76c3cefcb4e96e1839f16ab9194b063788d3661
parentccf86f2d8a9aab031964904f54112bf6769ee1e5 (diff)
downloadorg.eclipse.cdt-1ec18cdaf50db261ac92e87a5074ab33858853c5.tar.gz
org.eclipse.cdt-1ec18cdaf50db261ac92e87a5074ab33858853c5.tar.xz
org.eclipse.cdt-1ec18cdaf50db261ac92e87a5074ab33858853c5.zip
adding utilities plug-in to build
-rw-r--r--releng/org.eclipse.cdt.master/feature.xml4
-rw-r--r--releng/org.eclipse.cdt.releng/build.xml12
-rw-r--r--releng/org.eclipse.cdt.releng/buildindex.html1
-rw-r--r--releng/org.eclipse.cdt.releng/buildsite.xml3
-rw-r--r--releng/org.eclipse.cdt.releng/maps/cdt.map6
-rw-r--r--releng/org.eclipse.cdt.releng/util/build.properties94
-rw-r--r--releng/org.eclipse.cdt.releng/util/customTargets.xml133
7 files changed, 252 insertions, 1 deletions
diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index 525d5942aa9..46ab8686961 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -44,5 +44,9 @@
<includes
id="org.eclipse.cdt.xlc.sdk"
version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.cdt.util"
+ version="0.0.0"/>
</feature>
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index b2c482b04cd..98cc1238ece 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -64,6 +64,9 @@
<ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
<property name="builder" value="${basedir}/xlc.sdk"/>
</ant>
+ <ant antfile="build.xml" dir="${pde.build.scripts}" target="preBuild">
+ <property name="builder" value="${basedir}/util"/>
+ </ant>
<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
<property name="builder" value="${basedir}/platform"/>
</ant>
@@ -82,6 +85,9 @@
<ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
<property name="builder" value="${basedir}/xlc.sdk"/>
</ant>
+ <ant antfile="build.xml" dir="${pde.build.scripts}" target="fetch">
+ <property name="builder" value="${basedir}/util"/>
+ </ant>
</target>
<target name="unzip" depends="init" unless="dontUnzip">
@@ -378,6 +384,12 @@
</antcall>
<antcall target="tagone">
<param name="tagmodule" value="org.eclipse.cdt/xlc/org.eclipse.cdt.xlc.sdk-feature"/>
+ </antcall>
+ <antcall target="tagone">
+ <param name="tagmodule" value="org.eclipse.cdt/util/org.eclipse.cdt.util"/>
+ </antcall>
+ <antcall target="tagone">
+ <param name="tagmodule" value="org.eclipse.cdt/util/org.eclipse.cdt.util-feature"/>
</antcall>
<antcall target="tagone">
<param name="tagmodule" value="org.eclipse.cdt/releng/org.eclipse.cdt.master"/>
diff --git a/releng/org.eclipse.cdt.releng/buildindex.html b/releng/org.eclipse.cdt.releng/buildindex.html
index 002bdb49063..48eb28a6e27 100644
--- a/releng/org.eclipse.cdt.releng/buildindex.html
+++ b/releng/org.eclipse.cdt.releng/buildindex.html
@@ -24,6 +24,7 @@ you want to install. You will at nead require the C/C++ Development Tooling feat
<li>GDB Hardware Debugging - Provides a launch configuration for launching gdb to do hardware debugging.</li>
<li>XL C/C++ Compiler Support - Provides an error parser and managed build support for IBM's XL C/C++ compilers.</li>
<li>LR Parser - Provides a parser for the ISO/IEC 9899:1999 variant of the C programming language (aka C99), generated from a grammar using the LPG parser generator. The grammar can be reused and extended to create your own parser for variants on the C programming language.</li>
+<li>CDT Utilities - Provides utilities for C/C++ Development Tools</li>
<li>CDT Testing Feature - includes all test plugins required for running automated JUnit tests</li>
</ul>
</body>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index f1d0b705dcf..595b7364215 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -21,6 +21,9 @@
<feature id="org.eclipse.cdt.xlc.sdk" url="features/org.eclipse.cdt.xlc.sdk_@buildVersion@.jar" version="@buildVersion@">
<category name="CDT Optional Features"/>
</feature>
+ <feature id="org.eclipse.cdt.util" url="features/org.eclipse.cdt.util_@buildVersion@.jar" version="@buildVersion@">
+ <category name="CDT Optional Features"/>
+ </feature>
<feature id="org.eclipse.cdt.testing" url="features/org.eclipse.cdt.testing_@buildVersion@.jar" version="@buildVersion@">
<category name="CDT Optional Features"/>
</feature>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index 8f2f48332de..3198e411636 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -74,5 +74,9 @@ feature@org.eclipse.cdt.xlc.sdk=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvs
! LR parser
plugin@org.eclipse.cdt.core.lrparser=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/lrparser/org.eclipse.cdt.core.lrparser
-plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20080209163815/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200711021030.jar
+plugin@net.sourceforge.lpg.lpgjavaruntime,1.1.0=GET,http://download.eclipse.org/tools/orbit/downloads/drops/S20080326131619/bundles/net.sourceforge.lpg.lpgjavaruntime_1.1.0.v200803061910.jar
feature@org.eclipse.cdt.core.lrparser.feature=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/lrparser/org.eclipse.cdt.core.lrparser.feature
+
+! CDT Utilities
+plugin@org.eclipse.cdt.util=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/util/org.eclipse.cdt.util
+feature@org.eclipse.cdt.util.feature=@cdtTag@,:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,,org.eclipse.cdt/util/org.eclipse.cdt.util-feature
diff --git a/releng/org.eclipse.cdt.releng/util/build.properties b/releng/org.eclipse.cdt.releng/util/build.properties
new file mode 100644
index 00000000000..6d93b4839e2
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/util/build.properties
@@ -0,0 +1,94 @@
+###############################################################################
+# Copyright (c) 2008 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+#####################
+# 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
+
+cdtTag=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=*,*,*
+
+archivesFormat=*,*,*-zip
+
+#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=on
+
+# Whether or not to fail the build if there are compiler errors
+javacfailonerror=true
+
+# The version of the source code
+javacSource=1.5
+
+# The version of the byte code targeted
+javacTarget=1.5
diff --git a/releng/org.eclipse.cdt.releng/util/customTargets.xml b/releng/org.eclipse.cdt.releng/util/customTargets.xml
new file mode 100644
index 00000000000..6c16afa794e
--- /dev/null
+++ b/releng/org.eclipse.cdt.releng/util/customTargets.xml
@@ -0,0 +1,133 @@
+<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.util" />
+ </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.util">
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+ <property name="archiveName" value="cdt-util-${branchVersion}-${buildId}.zip"/>
+ </ant>
+</target>
+
+<!-- ===================================================================== -->
+<!-- Check out map files from correct repository -->
+<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
+<!-- ===================================================================== -->
+<target name="getMapFiles">
+ <copy file="${builder}/../maps/cdt.map" todir="${buildDirectory}/maps"/>
+ <replace file="${buildDirectory}/maps/cdt.map">
+ <replacefilter token="@cdtTag@" value="${cdtTag}"/>
+ </replace>
+</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>

Back to the top