Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2005-11-21 11:27:25 -0500
committerDoug Schaefer2005-11-21 11:27:25 -0500
commit4ee4285e5dd63255ad9bfa079bd371e573442fc1 (patch)
tree34ce7158759f8fd04b994d3a986b2c91e5d28d3a
parentf024ed0dea872b8407327805f0e9702bf2b0cdf1 (diff)
downloadorg.eclipse.cdt-4ee4285e5dd63255ad9bfa079bd371e573442fc1.tar.gz
org.eclipse.cdt-4ee4285e5dd63255ad9bfa079bd371e573442fc1.tar.xz
org.eclipse.cdt-4ee4285e5dd63255ad9bfa079bd371e573442fc1.zip
Build Cleanup.
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF3
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF1
-rw-r--r--doc/org.eclipse.cdt.doc.isv/.externalToolBuilders/cdt.doc.isv doc builder.launch5
-rw-r--r--doc/org.eclipse.cdt.doc.isv/.project16
-rw-r--r--doc/org.eclipse.cdt.doc.isv/build.properties13
-rw-r--r--doc/org.eclipse.cdt.doc.isv/build.xml77
-rw-r--r--doc/org.eclipse.cdt.doc.isv/buildDoc.xml1
7 files changed, 24 insertions, 92 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
index 107dfd490f..6e962745e8 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/META-INF/MANIFEST.MF
@@ -18,6 +18,5 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.cdt.make.core,
org.eclipse.core.resources,
org.eclipse.ui,
- org.eclipse.ui.ide,
- org.eclipse.compare
+ org.eclipse.ui.ide
Eclipse-AutoStart: true
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
index 44c3b793b3..580710620d 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.cdt.managedbuilder.ui,
- org.eclipse.cdt.ui,
org.junit,
org.eclipse.cdt.managedbuilder.core,
org.eclipse.cdt.core
diff --git a/doc/org.eclipse.cdt.doc.isv/.externalToolBuilders/cdt.doc.isv doc builder.launch b/doc/org.eclipse.cdt.doc.isv/.externalToolBuilders/cdt.doc.isv doc builder.launch
index f249cc0a5f..6ae65b62c3 100644
--- a/doc/org.eclipse.cdt.doc.isv/.externalToolBuilders/cdt.doc.isv doc builder.launch
+++ b/doc/org.eclipse.cdt.doc.isv/.externalToolBuilders/cdt.doc.isv doc builder.launch
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/org.eclipse.cdt.doc.isv&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.cdt.doc.isv}"/>
+<booleanAttribute key="org.eclipse.ant.uiSET_INPUTHANDLER" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.cdt.doc.isv/buildDoc.xml}"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
diff --git a/doc/org.eclipse.cdt.doc.isv/.project b/doc/org.eclipse.cdt.doc.isv/.project
index e22df7e00a..66c3b1b41a 100644
--- a/doc/org.eclipse.cdt.doc.isv/.project
+++ b/doc/org.eclipse.cdt.doc.isv/.project
@@ -6,23 +6,23 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <triggers>full,incremental,</triggers>
<arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value>&lt;project&gt;/.externalToolBuilders/cdt.doc.isv doc builder.launch</value>
+ </dictionary>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
+ <name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <triggers>full,incremental,</triggers>
+ <name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value>&lt;project&gt;/.externalToolBuilders/cdt.doc.isv doc builder.launch</value>
- </dictionary>
</arguments>
</buildCommand>
</buildSpec>
diff --git a/doc/org.eclipse.cdt.doc.isv/build.properties b/doc/org.eclipse.cdt.doc.isv/build.properties
index 38ba591fbf..1e62607c4f 100644
--- a/doc/org.eclipse.cdt.doc.isv/build.properties
+++ b/doc/org.eclipse.cdt.doc.isv/build.properties
@@ -8,5 +8,14 @@
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
-custom = true
-bin.includes = META-INF/
+bin.includes = META-INF/,\
+ reference/,\
+ guide/,\
+ book.css,\
+ about.html,\
+ schema.css,\
+ toc.xml,\
+ topics_Guide.xml,\
+ topics_Reference.xml,\
+ plugin.xml,\
+ notices.html
diff --git a/doc/org.eclipse.cdt.doc.isv/build.xml b/doc/org.eclipse.cdt.doc.isv/build.xml
deleted file mode 100644
index 64acbe635c..0000000000
--- a/doc/org.eclipse.cdt.doc.isv/build.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.cdt.doc.isv" default="build.jars" basedir=".">
-
- <target name="init">
- <property name="plugin" value="org.eclipse.cdt.doc.isv"/>
- <property name="version.suffix" value="_3.1.0"/>
- <property name="full.name" value="${plugin}${version.suffix}"/>
- <property name="temp.folder" value="${basedir}/temp.folder"/>
- <property name="plugin.destination" value="${basedir}"/>
- <property name="build.result.folder" value="${basedir}"/>
- <available file="${basedir}/doc.zip" property="doc.zip.present"/>
- </target>
-
- <target name="build.update.jar" depends="init">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <zip zipfile="${plugin.destination}/${full.name}.jar" basedir="${temp.folder}/${full.name}" filesonly="false"/>
- <delete dir="${temp.folder}"/>
- </target>
-
- <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
- <antcall target="buildDocZip" />
- <mkdir dir="${destination.temp.folder}/${full.name}"/>
- <copy todir="${destination.temp.folder}/${full.name}">
- <fileset dir="${basedir}" includes="*.properties,*.xml,*.zip,*.html,*.htm,*.gif,*.css" excludes="build.properties,build.xml,buildDoc.xml"/>
- </copy>
- </target>
-
- <target name="buildDocZip" depends="init" unless="doc.zip.present">
- <ant antfile="buildDoc.xml" />
- </target>
-
- <target name="build.jars" depends="init">
- </target>
-
- <target name="gather.sources" depends="init" if="destination.temp.folder">
- </target>
-
- <target name="build.sources" depends="init">
- </target>
-
- <target name="gather.logs" depends="init" if="destination.temp.folder">
- </target>
-
- <target name="clean" depends="init">
- <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">
- <eclipse.refreshLocal resource="${plugin}" depth="infinite"/>
- </target>
-
- <target name="zip.plugin" depends="init">
- <delete dir="${temp.folder}"/>
- <mkdir dir="${temp.folder}"/>
- <antcall target="build.jars"/>
- <antcall target="build.sources"/>
- <antcall target="gather.bin.parts">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <antcall target="gather.sources">
- <param name="destination.temp.folder" value="${temp.folder}/"/>
- </antcall>
- <delete>
- <fileset dir="${temp.folder}" includes="**/*.bin.log"/>
- </delete>
- <zip zipfile="${plugin.destination}/${full.name}.zip" basedir="${temp.folder}" filesonly="true"/>
- <delete dir="${temp.folder}"/>
- </target>
-
-</project> \ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
index 194272ef8f..d9fcd46e48 100644
--- a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
+++ b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
@@ -5,7 +5,6 @@
<antcall target="convertSchemaToHtml" />
<!--antcall target="examplesDocCopy" /-->
<antcall target="generateJavadoc" />
- <antcall target="createDocZip" />
</target>
<target name="convertSchemaToHtml" if="eclipse.running">

Back to the top