Skip to content
Snippets Groups Projects
Commit cc3ffbfe authored by lmandel's avatar lmandel
Browse files

[128098] Cleaned up build script and updated to function with .qualifier.

parent 9ec555d3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
docs/org.eclipse.jst.doc.isv/META-INF/MANIFEST.MF
+ 2
− 2
View file @ cc3ffbfe
......@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.doc.isv; singleton:=true
Bundle-Version: 1.0.1.v1
Bundle-Version: 1.0.101.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Eclipse-AutoStart: true
Eclipse-LazyStart: true
Require-Bundle: org.eclipse.help
docs/org.eclipse.jst.doc.isv/build.xml
+ 14
− 41
View file @ cc3ffbfe
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.eclipse.jst.doc.isv" default="build.jars" basedir=".">
<property name="bootclasspath" value=""/>
<property name="basews" value="${ws}"/>
<property name="baseos" value="${os}"/>
<property name="basearch" value="${arch}"/>
<property name="basenl" value="${nl}"/>
<property name="javacFailOnError" value="false"/>
<property name="javacDebugInfo" value="on"/>
<property name="javacVerbose" value="true"/>
<property name="javacSource" value="1.3"/>
<property name="javacTarget" value="1.2"/>
<property name="compilerArg" value=""/>
<property name="pluginVersion" value="1.0.1.v1"/>
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
<isset property="buildTempFolder"/>
</condition>
<property name="pluginTemp" value="${basedir}"/>
<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.jst.doc.isv">
<isset property="buildTempFolder"/>
</condition>
<property name="build.result.folder" value="${basedir}"/>
<target name="init">
<property name="plugin" value="org.eclipse.jst.doc.isv"/>
<property name="version.suffix" value="1.0.1"/>
<property name="full.name" value="${plugin}_${version.suffix}"/>
<property name="temp.folder" value="${basedir}/temp.folder"/>
<property name="plugin.destination" value="${basedir}"/>
</target>
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
<property name="build.result.folder" value="${basedir}"/>
</target>
<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.jst.doc.isv for an update site.">
......@@ -38,48 +17,42 @@
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
</antcall>
<zip destfile="${plugin.destination}/org.eclipse.jst.doc.isv_${pluginVersion}.jar" basedir="${temp.folder}/org.eclipse.jst.doc.isv_${pluginVersion}" filesonly="false" whenempty="skip" update="false"/>
<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
<delete dir="${temp.folder}"/>
</target>
<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.jst.doc.isv.">
<ant antfile="javadoc.xml" dir="${basedir}"/>
<ant antfile="buildExtDocs.xml" dir="${basedir}"/>
</target>
<target name="build.sources" depends="init">
</target>
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/org.eclipse.jst.doc.isv_${pluginVersion}"/>
<copy todir="${destination.temp.folder}/org.eclipse.jst.doc.isv_${pluginVersion}" failonerror="true">
<ant antfile="javadoc.xml" dir="${basedir}"/>
<ant antfile="buildExtDocs.xml" dir="${basedir}"/>
<mkdir dir="${destination.temp.folder}/${full.name}"/>
<copy todir="${destination.temp.folder}/${full.name}">
<fileset dir="${basedir}" includes="plugin.xml,plugin.properties,about.html,toc.xml,toc_JST.xml,topics_Reference.xml,META-INF/,reference/,book.css,html/,notices.html,topics_ExtPoint_Reference.xml,javadoctoc.xml,schema.css"/>
</copy>
<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}"/>
</target>
<target name="build.zips" depends="init">
</target>
<target name="gather.sources" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/org.eclipse.jst.doc.isv_${pluginVersion}"/>
<copy todir="${destination.temp.folder}/org.eclipse.jst.doc.isv_${pluginVersion}" failonerror="false">
<fileset dir="${basedir}" includes="toc.xml,api-overview/,build.xml,build.properties,javadoc.properties,javadoc.xml,javadoc.xsl"/>
</copy>
</target>
<target name="gather.logs" depends="init" if="destination.temp.folder">
</target>
<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.jst.doc.isv of all the zips, jars and logs created.">
<delete file="${plugin.destination}/org.eclipse.jst.doc.isv_${pluginVersion}.jar"/>
<delete file="${plugin.destination}/org.eclipse.jst.doc.isv_${pluginVersion}.zip"/>
<delete file="${plugin.destination}/${full.name}.jar"/>
<delete file="${plugin.destination}/${full.name}.zip"/>
<delete dir="${temp.folder}"/>
</target>
<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
<!--
<eclipse.convertPath fileSystemPath="D:/wtp_v10m3/workspace_releng/org.eclipse.jst.doc.isv" property="resourcePath"/>
-->
<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
</target>
......@@ -97,7 +70,7 @@
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin.log" />
</delete>
<zip destfile="${plugin.destination}/org.eclipse.jst.doc.isv_${pluginVersion}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
<delete dir="${temp.folder}"/>
</target>
......
docs/org.eclipse.wst.doc.isv/META-INF/MANIFEST.MF
+ 2
− 1
View file @ cc3ffbfe
......@@ -3,6 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.wst.doc.isv; singleton:=true
Bundle-Version: 1.0.1.v1
Bundle-Version: 1.0.101.qualifier
Bundle-Localization: plugin
Eclipse-LazyStart: true
Require-Bundle: org.eclipse.help
docs/org.eclipse.wst.doc.isv/build.xml
+ 15
− 42
View file @ cc3ffbfe
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.eclipse.wst.doc.isv" default="build.jars" basedir=".">
<property name="bootclasspath" value=""/>
<property name="basews" value="${ws}"/>
<property name="baseos" value="${os}"/>
<property name="basearch" value="${arch}"/>
<property name="basenl" value="${nl}"/>
<property name="javacFailOnError" value="false"/>
<property name="javacDebugInfo" value="on"/>
<property name="javacVerbose" value="true"/>
<property name="javacSource" value="1.3"/>
<property name="javacTarget" value="1.2"/>
<property name="compilerArg" value=""/>
<property name="pluginVersion" value="1.0.1.v1"/>
<target name="init" depends="properties">
<condition property="pluginTemp" value="${buildTempFolder}/plugins">
<isset property="buildTempFolder"/>
</condition>
<property name="pluginTemp" value="${basedir}"/>
<condition property="build.result.folder" value="${pluginTemp}/org.eclipse.wst.doc.isv">
<isset property="buildTempFolder"/>
</condition>
<property name="build.result.folder" value="${basedir}"/>
<target name="init">
<property name="plugin" value="org.eclipse.wst.doc.isv"/>
<property name="version.suffix" value="1.0.1"/>
<property name="full.name" value="${plugin}_${version.suffix}"/>
<property name="temp.folder" value="${basedir}/temp.folder"/>
<property name="plugin.destination" value="${basedir}"/>
</target>
<target name="properties" if="eclipse.running">
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
<property name="build.result.folder" value="${basedir}"/>
</target>
<target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.wst.doc.isv for an update site.">
......@@ -38,49 +17,43 @@
<antcall target="gather.bin.parts">
<param name="destination.temp.folder" value="${temp.folder}/"/>
</antcall>
<zip destfile="${plugin.destination}/org.eclipse.wst.doc.isv_${pluginVersion}.jar" basedir="${temp.folder}/org.eclipse.wst.doc.isv_${pluginVersion}" filesonly="false" whenempty="skip" update="false"/>
<zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
<delete dir="${temp.folder}"/>
</target>
<target name="build.jars" depends="init" description="Build all the jars for the plug-in: org.eclipse.wst.doc.isv.">
<ant antfile="javadoc.xml" dir="${basedir}"/>
<ant antfile="buildExtDocs.xml" dir="${basedir}"/>
</target>
<target name="build.sources" depends="init">
</target>
<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/org.eclipse.wst.doc.isv_${pluginVersion}"/>
<copy todir="${destination.temp.folder}/org.eclipse.wst.doc.isv_${pluginVersion}" failonerror="true">
<ant antfile="javadoc.xml" dir="${basedir}"/>
<ant antfile="buildExtDocs.xml" dir="${basedir}"/>
<mkdir dir="${destination.temp.folder}/${full.name}"/>
<copy todir="${destination.temp.folder}/${full.name}">
<fileset dir="${basedir}" includes="plugin.xml,plugin.properties,about.html,toc.xml,toc_WST.xml,topics_Reference.xml,META-INF/,html/,reference/,book.css,notices.html,topics_ExtPoint_Reference.xml,schema.css,javadoctoc.xml"/>
</copy>
<eclipse.versionReplacer path="${destination.temp.folder}/${full.name}" version="${version.suffix}"/>
</target>
<target name="build.zips" depends="init">
</target>
<target name="gather.sources" depends="init" if="destination.temp.folder">
<mkdir dir="${destination.temp.folder}/org.eclipse.wst.doc.isv_${pluginVersion}"/>
<copy todir="${destination.temp.folder}/org.eclipse.wst.doc.isv_${pluginVersion}" failonerror="false">
<fileset dir="${basedir}" includes="build.xml,build.properties,javadoc.properties,javadoc.xml,javadoc.xsl,api-overview/"/>
</copy>
</target>
<target name="gather.logs" depends="init" if="destination.temp.folder">
</target>
<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.wst.doc.isv of all the zips, jars and logs created.">
<delete file="${plugin.destination}/org.eclipse.wst.doc.isv_${pluginVersion}.jar"/>
<delete file="${plugin.destination}/org.eclipse.wst.doc.isv_${pluginVersion}.zip"/>
<delete file="${plugin.destination}/${full.name}.jar"/>
<delete file="${plugin.destination}/${full.name}.zip"/>
<delete dir="${temp.folder}"/>
</target>
<target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
<!--
<eclipse.convertPath fileSystemPath="D:/wtp_v10m3/workspace_releng/org.eclipse.wst.doc.isv" property="resourcePath"/>
-->
<eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
<eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
</target>
<target name="zip.plugin" depends="init" description="Create a zip containing all the elements for the plug-in: org.eclipse.wst.doc.isv.">
......@@ -97,7 +70,7 @@
<delete>
<fileset dir="${temp.folder}" includes="**/*.bin.log" />
</delete>
<zip destfile="${plugin.destination}/org.eclipse.wst.doc.isv_${pluginVersion}.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
<zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
<delete dir="${temp.folder}"/>
</target>
......
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