Skip to content
Snippets Groups Projects
Commit 3ba9211f authored by david_williams's avatar david_williams
Browse files

synch up for bug 238868 map files get overwritten

parent b641ce3b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
releng.wtpbuilder/components/jstd/build.properties deleted 100644 → 0
+ 0
− 37
View file @ b641ce3b
###############################################################################
# Copyright (c) 2003, 2006 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
###############################################################################
# This property file is used automatically by the PDE build process
runPackager=true
# This is a subdirectory of $buildDirectory
# Set collectingFolder and archivePrefix to . if you want to create archives without
# trailing eclipse in the paths of the included files
collectingFolder=eclipse
logExtension=.xml
# The prefix that will be used in the generated archive.
# Does not make sense to use a different archivePrefix than collectingFolder,
# because zip wouldn't find any files to include into the target zip otherwise
archivePrefix=eclipse
# 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=false
##################################################
# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when
# using the JDT Compiler Adapter to compile.
javacVerbose=true
sign=true
releng.wtpbuilder/components/jstd/customTargets.xml deleted 100644 → 0
+ 0
− 370
View file @ b641ce3b
<project
name="PDECustomTargets"
default="noDefault"
basedir=".">
<!-- = = = standard properties pattern = = = -->
<!--
Note to be cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case sensitive, even if
the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
<property environment="env" />
<!--
Let users override standard properties, if desired.
If directory, file, or some properties do not exist,
then standard properties will be used.
-->
<property
file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
<!-- let this project specify properties, if not already set -->
<property file="build.properties" />
<fail unless="buildDirectory" message="buildDirectory must be set" />
<echo message="buildDirectory: ${buildDirectory}" />
<property
name="cvsProtocol"
value="${env.BUILD_CVS_WRITE_PROTOCOL}" />
<property
name="cvsUser"
value="${env.BUILD_CVS_WRITE_USER}" />
<property
name="cvsServer"
value="${env.BUILD_CVS_SERVER}" />
<property
name="cvsRoot"
value="${env.BUILD_CVS_ROOT}" />
<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- Add on <ant> task for each top level element being built. -->
<!-- ===================================================================== -->
<target name="allElements">
<echo
level="info"
message="Target:${target} " />
<echo
level="debug"
message="basedir: ${basedir}" />
<echo
level="debug"
message="component: ${component}" />
<echo
level="debug"
message="buildDirectory: ${buildDirectory}" />
<echo
level="debug"
message="baseLocation: ${baseLocation}" />
<echo
level="debug"
message="generic target: ${genericTargets}" />
<ant
antfile="${genericTargets}"
target="${target}">
<property
name="type"
value="feature" />
<property
name="id"
value="org.eclipse.wst.jsdt_sdk.feature" />
</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.wst.jsdt.feature">
<property
name="archiveName"
value="wtp-jstd-${buildLabel}.zip" />
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
</target>
<target name="prePackage" />
<target name="postPackage">
<property
name="archiveName"
value="wtp-jstd-${buildLabel}.zip" />
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="unpackUpdateJarsAndCreateZippedPackages">
<property
name="buildDirectory"
value="${buildDirectory}" />
<property
name="buildLabel"
value="${buildLabel}" />
<property
name="archiveName"
value="${archiveName}" />
</ant>
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
target="createChecksums">
<property
name="buildDirectory"
value="${buildDirectory}" />
<property
name="buildLabel"
value="${buildLabel}" />
<property
name="archiveName"
value="${archiveName}" />
</ant>
</target>
<!-- ===================================================================== -->
<!-- Check out map files from correct repository -->
<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
<!-- ===================================================================== -->
<target
name="checkLocal"
depends="check.useLocalMaps"
if="useLocalMaps">
<condition property="mapsLocal">
<available file="${buildDirectory}/maps/${env.RELENG}" />
</condition>
<echo message="mapsLocal: ${mapsLocal}" />
</target>
<target
name="getMapFiles"
depends="checkLocal"
unless="mapsLocal">
<!-- *** change the repo info -->
<property
name="mapCvsRoot"
value=":${cvsProtocol}:${cvsUser}@${cvsServer}:${cvsRoot}" />
<echo message="mapCvsRoot: ${mapCvsRoot}" />
<!-- if not otherwise set, assume HEAD -->
<property
name="mapVersionTag"
value="HEAD" />
<echo
level="info"
message="mapCvsRoot: ${mapCvsRoot} mapVersionTag: ${mapVersionTag} ">
</echo>
<property
name="cvsPackage"
value="${env.RELENGMAPS}" />
<echo
level="debug"
message="${mapCvsRoot} ${mapVersionTag} " />
<echo
level="debug"
message="cvsPackage = ${cvsPackage} " />
<cvs
cvsRoot="${mapCvsRoot}"
package="${cvsPackage}"
dest="${buildDirectory}/maps"
tag="${mapVersionTag}"
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}" />
<!--tag the map files project-->
<antcall target="tagMapFiles">
<param
name="mapCvsRoot"
value="${mapCvsRoot}" />
</antcall>
</target>
<target
name="tagMapFiles"
if="tagMaps">
<cvs
cvsRoot="${mapCvsRoot}"
dest="${buildDirectory}/maps"
command="tag v${buildType}${timestamp}"
quiet="${env.CVS_QUIET}"
reallyquiet="${env.CVS_REALLY_QUIET}" />
</target>
<!-- ===================================================================== -->
<!-- Steps to do before setup -->
<!-- ===================================================================== -->
<target name="preSetup">
<echo message="test message from preSetup in JSDT" />
</target>
<!-- ===================================================================== -->
<!-- Steps to do after setup but before starting the build proper -->
<!-- ===================================================================== -->
<target name="postSetup">
<dirname
file="${ant.file}"
property="component.dir" />
<echo
level="debug"
message="ant.file: ${ant.file}" />
<echo
level="debug"
message="component.dir: ${component.dir}" />
<ant
antfile="${component.dir}/dependency.xml"
target="get">
<property
name="dependency.properties"
value="${buildDirectory}/maps/${env.RELENG}/maps/dependencies.properties" />
<property
name="base.install.dir"
value="${buildRoot}" />
</ant>
</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="postGenerate">
<echo message="buildDirectory: ${buildDirectory}" />
<customizeAccessRules
bundleDirectory="${buildDirectory}/plugins"
defaultRules="+org/eclipse/wst/**/*, +org/eclipse/jst/**/*" />
</target>
<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts. -->
<!-- ===================================================================== -->
<target name="preGenerate"></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">
<condition property="logsAvailable">
<istrue value="${javacVerbose}" />
</condition>
<antcall target="gatherLogs" />
</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>
<!-- ===================================================================== -->
<!-- Helper targets -->
<!-- ===================================================================== -->
<target
name="gatherLogs"
if="logsAvailable">
<mkdir dir="${buildDirectory}/${buildLabel}/compilelogs" />
<echo
level="debug"
message="logExtension: ${logExtension}" />
<antcall target="allElements">
<param
name="target"
value="gatherLogs" />
<param
name="logExtension"
value="${logExtension}" />
</antcall>
<unzip
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
<fileset dir="${buildDirectory}/features/org.eclipse.wst">
<include name="**/*.log.zip" />
</fileset>
</unzip>
</target>
<target
name="clean"
unless="noclean">
<antcall target="allElements">
<param
name="target"
value="cleanElement" />
</antcall>
</target>
<!-- ===================================================================== -->
<!-- Default target -->
<!-- ===================================================================== -->
<target name="noDefault">
<echo
level="error"
message="You must specify a target when invoking this file" />
</target>
<target name="check.useLocalMaps">
<condition property="useLocalMaps">
<equals
arg1="${env.USE_LOCAL_MAPS}"
arg2="true" />
</condition>
</target>
</project>
releng.wtpbuilder/components/jstd/dependency.xml deleted 100644 → 0
+ 0
− 99
View file @ b641ce3b
<?xml version="1.0"?>
<!-- ======================================================================
Properties that must be passed to this script:
base.install.dir
dependencyTargets
local.cache.dir
dependency.properties
====================================================================== -->
<project
name="test"
default="get">
<target name="get">
<mkdir dir="${buildDirectory}/maps/${env.RELENG}/maps" />
<antcall target="getAndInstall">
<param
name="groupId"
value="orbitthirdpartymap" />
<param
name="base.install.dir"
value="${buildDirectory}/maps/${env.RELENG}/maps/" />
</antcall>
<property
name="pde.builder.path"
value="${env.BASE_BUILDERS}/${eclipse.builder.version}/${eclipse.builder}" />
<echo
level="info"
message="pde.builder.path: ${pde.builder.path}" />
<echo
level="info"
message="eclipse.builder.version: ${eclipse.builder.version}" />
<echo
level="info"
message="eclipse.builder: ${eclipse.builder}" />
<antcall target="getAndInstall">
<param
name="groupId"
value="emf" />
</antcall>
<antcall target="getAndInstall">
<param
name="groupId"
value="emfxsd" />
</antcall>
<antcall target="getAndInstall">
<param
name="groupId"
value="gef" />
</antcall>
<antcall target="getAndInstall">
<param
name="groupId"
value="eclipse" />
</antcall>
<antcall target="getAndInstall">
<param
name="groupId"
value="eclipseTestFramework" />
</antcall>
<antcall target="getAndInstall">
<param
name="groupId"
value="dita" />
</antcall>
</target>
<target name="getAndInstall">
<ant
antfile="${dependencyTargets}"
target="checkDependency">
<property
name="groupId"
value="${groupId}" />
</ant>
<ant
antfile="${dependencyTargets}"
target="installDependency">
<property
name="groupId"
value="${groupId}" />
<property
name="install.destination"
value="${base.install.dir}" />
</ant>
</target>
</project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent