diff options
| author | Silenio Quarti <silenio> | 2011-07-18 23:44:39 -0400 |
|---|---|---|
| committer | Silenio Quarti <silenio> | 2011-07-18 23:44:39 -0400 |
| commit | 41482a994ff7b63521a1de3fdfec18e82a13e819 (patch) | |
| tree | e372a6827160cd5782a5072c390697443f5ebe2d /bundles/org.eclipse.swt/buildSWT.xml | |
| parent | 5155b47579761b9f0bb4fca19e0b5b0ffe2f4f0d (diff) | |
| download | eclipse.platform.swt-41482a994ff7b63521a1de3fdfec18e82a13e819.tar.gz eclipse.platform.swt-41482a994ff7b63521a1de3fdfec18e82a13e819.tar.xz eclipse.platform.swt-41482a994ff7b63521a1de3fdfec18e82a13e819.zip | |
another try with waitfor
Diffstat (limited to 'bundles/org.eclipse.swt/buildSWT.xml')
| -rw-r--r-- | bundles/org.eclipse.swt/buildSWT.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bundles/org.eclipse.swt/buildSWT.xml b/bundles/org.eclipse.swt/buildSWT.xml index 78c34af25d..edde3f14f0 100644 --- a/bundles/org.eclipse.swt/buildSWT.xml +++ b/bundles/org.eclipse.swt/buildSWT.xml @@ -784,12 +784,6 @@ <!-- Params: fragment, swt_version --> <target name="commit_fragment" depends="init_fragment,get_version" if="natives_changed"> - <waitfor maxwait="1" maxwaitunit="hour"> - <not> - <available file="${bin.repo}/.git/index.lock" type="file"/> - </not> - </waitfor> - <fileset id="removeid" dir="${fragment_dir}"> <filename regex="[0-9][0-9][0-9][0-9]."/> <filename regex="${swt_version}." negate="true"/> @@ -813,13 +807,20 @@ <condition property="files_removed"> <length string="${removed_files}" trim="true" when="greater" length="0"/> </condition> - <antcall target="git_rm"/> <exec dir="${src.repo}" executable="git" failonerror="true" outputproperty="HEAD_TAG"> <arg line="rev-list ${TAG} -1"/> </exec> <propertyfile file="${fragment_dir}/build.sha1"> <entry key="SHA1" value="${HEAD_TAG}"/> </propertyfile> + + <waitfor maxwait="1" maxwaitunit="hour"> + <not> + <available file="${bin.repo}/.git/index.lock" type="file"/> + </not> + </waitfor> + + <antcall target="git_rm"/> <exec dir="${bin.repo}" executable="git" failonerror="true"> <arg line="add 'bundles/${fragment}'"/> </exec> |