Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormfeldman2006-03-16 14:26:49 -0500
committermfeldman2006-03-16 14:26:49 -0500
commitcc54baaacf73a618e0a19e3226afa0759e387b8b (patch)
tree797152f7b0374e3a61892e8c8c443dd8b48a2c98
parentfd54def70cb3c7df8850963cda32a14472cf1245 (diff)
downloadorg.eclipse.gmf-tooling-cc54baaacf73a618e0a19e3226afa0759e387b8b.tar.gz
org.eclipse.gmf-tooling-cc54baaacf73a618e0a19e3226afa0759e387b8b.tar.xz
org.eclipse.gmf-tooling-cc54baaacf73a618e0a19e3226afa0759e387b8b.zip
EMF, EMF examples and UML2 are taken as zips
-rw-r--r--releng/org.eclipse.gmf.releng.builder/scripts/install.xml24
1 files changed, 17 insertions, 7 deletions
diff --git a/releng/org.eclipse.gmf.releng.builder/scripts/install.xml b/releng/org.eclipse.gmf.releng.builder/scripts/install.xml
index c0d4ecb5d..6de2e6e85 100644
--- a/releng/org.eclipse.gmf.releng.builder/scripts/install.xml
+++ b/releng/org.eclipse.gmf.releng.builder/scripts/install.xml
@@ -96,11 +96,17 @@
<target name="installEMF" unless="emfExists" depends="checkEMFInstalled">
<!-- Until the EMF/EMFT update sites are squared away, revert to using zips below... -->
+<!--
<ant antfile="${scripts}/update.xml" target="installFeature">
<property name="featureId" value="${emfFeatureId}" />
<property name="version" value="${emfUpdateVersion}" />
<property name="updateSite" value="${emfUpdateSite}" />
</ant>
+-->
+ <available file="${baseLocationRoot}/${emfZipName}" property="emfZipExists" />
+ <antcall target="getEMF"/>
+ <unzip dest="${baseLocationRoot}/" overwrite="true" src="${baseLocationRoot}/${emfZipName}" />
+
<ant antfile="${scripts}/update.xml" target="installFeature">
<property name="featureId" value="${emfOCLFeatureId}" />
<property name="version" value="${emfOCLUpdateVersion}" />
@@ -137,10 +143,11 @@
<property name="updateSite" value="${emfWorkspaceUpdateSite}" />
</ant>
<!-- Alternative, download zip method...
+
<available file="${baseLocationRoot}/${emfZipName}" property="emfZipExists" />
<antcall target="getEMF"/>
<unzip dest="${baseLocationRoot}/" overwrite="true" src="${baseLocationRoot}/${emfZipName}" />
-
+
<available file="${baseLocationRoot}/${emfOCLZipName}" property="emfOCLZipExists" />
<antcall target="getEMFOCL"/>
<unzip dest="${baseLocationRoot}/" overwrite="true" src="${baseLocationRoot}/${emfOCLZipName}" />
@@ -184,17 +191,19 @@
</target>
<target name="installEMFExamples" unless="emfExampleExists" depends="checkEMFExamplesInstalled">
- <!-- Until the EMF/EMFT update sites are squared away, revert to using zips -->
+ <!-- Until the EMF/EMFT update sites are squared away, revert to using zips
+
<ant antfile="${scripts}/update.xml" target="installFeature">
<property name="featureId" value="${emfExamplesFeatureId}" />
<property name="version" value="${emfUpdateVersion}" />
<property name="updateSite" value="${emfUpdateSite}" />
</ant>
-<!-- Alternative, download zip method...
+ -->
+<!-- Alternative, download zip method... -->
<available file="${baseLocationRoot}/${emfExamplesZipName}" property="emfExamplesZipExists" />
<antcall target="getEMFExamples"/>
<unzip dest="${baseLocationRoot}/" overwrite="true" src="${baseLocationRoot}/${emfExamplesZipName}" />
--->
+
</target>
<target name="getEMFExamples" unless="emfExamplesZipExists">
<get src="${emfExamplesZipURL}" dest="${baseLocationRoot}/${emfExamplesZipName}" verbose="true" usetimestamp="true" />
@@ -226,17 +235,18 @@
</target>
<target name="installUML2" unless="uml2Exists" depends="checkUML2Installed">
- <!-- Need to resolve issues with new update sites containing qualifiers... revert to zips -->
+ <!-- Need to resolve issues with new update sites containing qualifiers... revert to zips
<ant antfile="${scripts}/update.xml" target="installFeature">
<property name="featureId" value="${uml2FeatureId}" />
<property name="version" value="${uml2UpdateVersion}" />
<property name="updateSite" value="${uml2UpdateSite}" />
</ant>
-<!-- Alternative, download zip method
+ -->
+<!-- Alternative, download zip method -->
<available file="${baseLocationRoot}/${uml2ZipName}" property="uml2ZipExists" />
<antcall target="getUML2"/>
<unzip dest="${baseLocationRoot}/" overwrite="true" src="${baseLocationRoot}/${uml2ZipName}" />
--->
+
</target>
<target name="getUML2" unless="uml2ZipExists">

Back to the top