diff options
| author | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2011-10-17 12:21:47 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio_quarti@ca.ibm.com> | 2011-10-17 12:22:42 -0400 |
| commit | e9c45430401cf8442932d187e036ca8624217374 (patch) | |
| tree | 1a96b044d0f144cfea6ed32b55b053c576de8c68 | |
| parent | d75387281e3f7290fa9b8e633737e35bb2b24961 (diff) | |
| download | eclipse.platform.swt-e9c45430401cf8442932d187e036ca8624217374.tar.gz eclipse.platform.swt-e9c45430401cf8442932d187e036ca8624217374.tar.xz eclipse.platform.swt-e9c45430401cf8442932d187e036ca8624217374.zip | |
Update map file from git
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 70 |
1 files changed, 26 insertions, 44 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 1e2c9b01d8..1a3a1ba462 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -34,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'"/> @@ -588,28 +588,11 @@ <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"> + <target name="get_tag" unless="swt_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}"> + <property name="map" value="${repo.common}/maps/org.eclipse.releng/maps/swt.map"/> + <loadfile property="swt_tag" srcfile="${map}"> <filterchain> <tokenfilter delimoutput=""> <containsstring contains="plugin@org.eclipse.swt=GIT,tag="/> @@ -731,30 +714,10 @@ <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"> <!-- 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> + <property name="map" value="${repo.common}/maps/org.eclipse.releng/maps/swt.map"/> + <replaceregexp file="${map}" match="=v\d\d\d\d[a-z]?" replace="=v${swt_new_tag}" byline="true"/> </target> <target name="check_sha1_file" unless="natives_changed"> @@ -1076,6 +1039,16 @@ <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> <target name="push_remote"> @@ -1097,6 +1070,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> |