diff options
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 96 |
1 files changed, 41 insertions, 55 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index f3ae0ec4c8..bb0a7513e3 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -23,12 +23,7 @@ for Example: ant -f buildSWT.xml increment_version -Dnatives_changed=true To build the libraries of a fragment, run - ant -f <fragment dir>/build.xml build_libraries - - Notes: - To void clean after build define a property named "clean" to empty (""). - To run only clean define a property named "targets" to empty (""). - + ant -f <fragment dir>/build.xml build_libraries --> <project name="swtbuild" basedir="."> @@ -39,7 +34,7 @@ <property name="repo.src" value="../../../eclipse.platform.swt"/> <property name="repo.bin" value="../../../eclipse.platform.swt.binaries"/> - <property name="repo.releng" value="../../../eclipse.platform.releng"/> + <property name="repo.common" value="../../../eclipse.platform.common"/> <property name="src_common" value="'bundles/org.eclipse.swt/Eclipse SWT/common/library' 'bundles/org.eclipse.swt/Eclipse SWT Mozilla/common/library' 'bundles/org.eclipse.swt/Eclipse SWT PI/common/library'"/> <property name="src_win32" value="${src_common} 'bundles/org.eclipse.swt/Eclipse SWT PI/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT AWT/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT OpenGL/win32/library' 'bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/library'"/> @@ -55,6 +50,7 @@ <property name="file_make_common" value="bundles/org.eclipse.swt/Eclipse SWT/common/library/make_common.mak"/> <property name="file_version" value="bundles/org.eclipse.swt/Eclipse SWT/common/version.txt"/> <property name="file_build_notes" value="bundles/org.eclipse.swt/buildnotes_swt.html"/> + <property name="file_swt_map" value="maps/org.eclipse.releng/maps/swt.map"/> <target name="check_libraries" depends="get_version"> <antcall target="check_fragment_libraries"> @@ -161,6 +157,7 @@ </target> <target name="check_fragment_libraries" depends="get_version"> + <echo>Checking ${fragment}</echo> <property name="checkdir" value="~/build/check_libraries"/> <property name="library_count" value="124"/> <property name="fragment" value=""/> @@ -592,28 +589,9 @@ <replace file="${repo.src}/${file_build_notes}" token="${match_line}" value="${match_line}${body}"/> </target> - <target name="cvs_tag"> - <condition property="CVS_TAG" value="" else="-r${TAG}"> - <equals arg1="${TAG}" arg2="master"/> - </condition> - </target> - <!-- Set swt_tag to the current tag in the swt map file --> - <target name="get_tag" unless="swt_tag" depends="cvs_tag"> - <property name="tmpdir" value="${tmphome}"/> - <!--property name="map" value="${repo.releng}/bundles/org.eclipse.releng/maps/swt.map"/--> - <property name="map" value="org.eclipse.releng/maps/swt.map"/> - <property name="cvsRsh" value="plink"/> - <property name="cvsRoot" value=":ext:fheidric@dev.eclipse.org:/cvsroot/eclipse"/> - <cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}"> - <commandline> - <argument value="checkout"/> - <argument line="${CVS_TAG}"/> - <argument value="${map}"/> - </commandline> - </cvs> - - <loadfile property="swt_tag" srcfile="${tmpdir}/${map}"> + <target name="get_tag" unless="swt_tag"> + <loadfile property="swt_tag" srcfile="${repo.common}/${file_swt_map}"> <filterchain> <tokenfilter delimoutput=""> <containsstring contains="plugin@org.eclipse.swt=GIT,tag="/> @@ -735,30 +713,19 @@ <antcall target="update_swt_map"/> </target> - <target name="update_swt_map" depends="cvs_tag"> - <property name="tmpdir" value="${tmphome}"/> - <property name="cvsRsh" value="plink"/> - <property name="cvsRoot" value=":ext:fheidric@dev.eclipse.org:/cvsroot/eclipse"/> - <!-- download the map file --> - <property name="map" value="org.eclipse.releng/maps/swt.map"/> - <cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}"> - <commandline> - <argument value="checkout"/> - <argument line="${CVS_TAG}"/> - <argument value="${map}"/> - </commandline> - </cvs> - + <target name="update_swt_map" depends="get_new_tag"> <!-- update and commit map file --> - <replaceregexp file="${tmpdir}/${map}" match="=v\d\d\d\d[a-z]?" replace="=v${swt_new_tag}" byline="true"/> - <cvs cvsRoot="${cvsRoot}" cvsrsh="${cvsRsh}" failonerror="true" dest="${tmpdir}"> - <commandline> - <argument value="commit"/> - <argument value="-m"/> - <argument value="'new version v${swt_new_tag}'"/> - <argument value="${map}"/> - </commandline> - </cvs> + <replaceregexp file="${repo.common}/${file_swt_map}" match="=v\d\d\d\d[a-z]?" replace="=v${swt_new_tag}" byline="true"/> + + <exec dir="${repo.common}" executable="git" failonerror="true"> + <arg line="add '${file_swt_map}'"/> + </exec> + <exec dir="${repo.common}" executable="git" failonerror="true"> + <arg line="status"/> + </exec> + <exec dir="${repo.common}" executable="git" failonerror="true"> + <arg line="commit -m 'SWT contribution v${swt_new_tag}'"/> + </exec> </target> <target name="check_sha1_file" unless="natives_changed"> @@ -1064,20 +1031,30 @@ <param name="repo" value="eclipse.platform.swt"/> <param name="repo.exists" value="repo.src.exists"/> </antcall> - <exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true"> + <exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true" timeout="900000"> <arg line="fetch"/> </exec> - <exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true"> + <exec dir="../../../../${TAG}/eclipse.platform.swt" executable="git" failonerror="true" timeout="900000"> <arg line="reset --hard origin/${TAG}"/> </exec> <antcall target="init_repo"> <param name="repo" value="eclipse.platform.swt.binaries"/> <param name="repo.exists" value="repo.bin.exists"/> </antcall> - <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true"> + <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true" timeout="900000"> <arg line="fetch"/> </exec> - <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true"> + <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true" timeout="900000"> + <arg line="reset --hard origin/${TAG}"/> + </exec> + <antcall target="init_repo"> + <param name="repo" value="eclipse.platform.common"/> + <param name="repo.exists" value="repo.common.exists"/> + </antcall> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> + <arg line="fetch"/> + </exec> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> <arg line="reset --hard origin/${TAG}"/> </exec> </target> @@ -1101,6 +1078,15 @@ <exec dir="../../../../${TAG}/eclipse.platform.swt.binaries" executable="git" failonerror="true"> <arg line="push origin ${TAG}"/> </exec> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> + <arg line="fetch"/> + </exec> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> + <arg line="rebase origin/${TAG}"/> + </exec> + <exec dir="../../../../${TAG}/eclipse.platform.common" executable="git" failonerror="true"> + <arg line="push origin ${TAG}"/> + </exec> <exec dir="${repo.src}" executable="git" failonerror="true"> <arg line="push --tags"/> </exec> |