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

Fixed the build scripts to use a seperate script generator

version of eclipse so that we can use 2.1.2 to generate
the scripts since 3.0 is broken.
This commit is contained in:
Doug Schaefer 2004-01-07 22:20:44 +00:00
parent bf3ef0b67e
commit 208055cbb3
3 changed files with 17 additions and 7 deletions

View file

@ -11,3 +11,4 @@ index.html
main.xml main.xml
site.xml site.xml
dist dist
host

View file

@ -21,6 +21,10 @@
<ant antfile="main.xml" target="build"/> <ant antfile="main.xml" target="build"/>
</target> </target>
<target name="test" depends="bootstrap">
<ant antfile="main.xml" target="test"/>
</target>
<target name="upload" depends="bootstrap"> <target name="upload" depends="bootstrap">
<ant antfile="main.xml" target="upload"/> <ant antfile="main.xml" target="upload"/>
</target> </target>

View file

@ -23,7 +23,7 @@
<property file="build.number"/> <property file="build.number"/>
<echo message="Build number: ${{build.version}}.${{build.number}}"/> <echo message="Build number: ${{build.version}}.${{build.number}}"/>
<delete dir="build"/> <delete dir="build"/>
<unzip src="zips/eclipse-SDK-2.1.1-linux-gtk.zip" dest="."/> <unzip src="zips/eclipse-SDK.zip" dest="."/>
<move todir="build"> <move todir="build">
<fileset dir="eclipse"/> <fileset dir="eclipse"/>
</move> </move>
@ -93,10 +93,9 @@
token="plugin.properties" token="plugin.properties"
value="plugin.properties,src/"/> value="plugin.properties,src/"/>
<!-- Generate build.xml files for projects --> <!-- Generate build.xml files for projects using the host eclipse -->
<xslt in="manifest.xml" out="build/genscripts.xml" style="genscripts.xsl"/> <xslt in="manifest.xml" out="build/genscripts.xml" style="genscripts.xsl"/>
<chmod perm="+x" file="build/eclipse"/> <exec executable="${{basedir}}/host/eclipse">
<exec executable="${{basedir}}/build/eclipse">
<arg line="-nosplash -data build/workspace"/> <arg line="-nosplash -data build/workspace"/>
<arg line="-application org.eclipse.ant.core.antRunner"/> <arg line="-application org.eclipse.ant.core.antRunner"/>
<arg line="-buildfile build/genscripts.xml"/> <arg line="-buildfile build/genscripts.xml"/>
@ -195,10 +194,14 @@
</xsl:for-each> </xsl:for-each>
</fileset> </fileset>
</copy> </copy>
</target>
<target name="test">
<property file="build.number"/>
<!-- Set up the test environment --> <!-- Set up the test environment -->
<delete dir="test"/> <delete dir="test"/>
<unzip src="zips/eclipse-SDK-2.1.1-linux-gtk.zip" dest="."/> <unzip src="zips/eclipse-SDK.zip" dest="."/>
<move todir="test"> <move todir="test">
<fileset dir="eclipse"/> <fileset dir="eclipse"/>
</move> </move>
@ -222,7 +225,7 @@
</xsl:attribute> </xsl:attribute>
</unjar> </unjar>
</xsl:for-each> </xsl:for-each>
<!-- Run the tests --> <!-- Run the tests -->
<chmod perm="+x" file="test/eclipse"/> <chmod perm="+x" file="test/eclipse"/>
<exec executable="${{basedir}}/test/eclipse" dir="test"> <exec executable="${{basedir}}/test/eclipse" dir="test">
@ -231,7 +234,6 @@
<arg line="-buildfile plugins/org.eclipse.cdt.core.tests_${{build.version}}.${{build.number}}/test.xml"/> <arg line="-buildfile plugins/org.eclipse.cdt.core.tests_${{build.version}}.${{build.number}}/test.xml"/>
<arg line="-Dorg.eclipse.test=org.eclipse.test_2.1.0"/> <arg line="-Dorg.eclipse.test=org.eclipse.test_2.1.0"/>
<arg line="-Declipse-home=${{basedir}}/test"/> <arg line="-Declipse-home=${{basedir}}/test"/>
<arg line="-Dos=linux -Dws=gtk -Darch=x86"/>
</exec> </exec>
<!-- Create the reports --> <!-- Create the reports -->
@ -258,6 +260,7 @@
</target> </target>
<target name="upload"> <target name="upload">
<property file="build.number"/>
<!-- Upload the update site --> <!-- Upload the update site -->
<ftp server="${{build.server}}" <ftp server="${{build.server}}"
userid="${{build.userid}}" password="${{build.password}}" userid="${{build.userid}}" password="${{build.password}}"
@ -275,6 +278,7 @@
</target> </target>
<target name="mail"> <target name="mail">
<property file="build.number"/>
<mail from="dschaefe@ca.ibm.com" <mail from="dschaefe@ca.ibm.com"
tolist="cdt-test-dev@eclipse.org" tolist="cdt-test-dev@eclipse.org"
subject="CDT Build ${{build.version}}.${{build.number}} completed"> subject="CDT Build ${{build.version}}.${{build.number}} completed">
@ -283,6 +287,7 @@
</target> </target>
<target name="all" depends="build,upload,mail"/> <target name="all" depends="build,upload,mail"/>
<!-- test removed since it doesn't work right now -->
</project> </project>