[260231] integration into Eclipse platform
diff --git a/build.properties b/build.properties index 58812b8..4476dac 100644 --- a/build.properties +++ b/build.properties
@@ -231,10 +231,10 @@ #source build individualSourceBundles=true -#p2 -generate.p2.metadata=true -p2.metadata.repo=file:${buildDirectory}/repository -p2.artifact.repo=file:${buildDirectory}/repository -p2.metadata.repo.name="Accessibility Tools Framework Update Site" -p2.artifact.repo.name="Accessibility Tools Framework Artifacts" +#p2 +#generate.p2.metadata=true +#p2.metadata.repo=file:${buildDirectory}/repository +#p2.artifact.repo=file:${buildDirectory}/repository +#p2.metadata.repo.name="Accessibility Tools Framework Update Site" +#p2.artifact.repo.name="Accessibility Tools Framework Artifacts"
diff --git a/build.sh b/build.sh index 6a25978..473261f 100644 --- a/build.sh +++ b/build.sh
@@ -59,19 +59,18 @@ -DOOO_HOME=${prereqDir}/OOo -#for future use -#unzip ${buildDirectory}/${BUILD_TYPE}${TIMESTAMP}/*${TIMESTAMP}-*.zip -d ${updateSite} -#mv ${updateSite}/eclipse/* ${updateSite} -#rmdir ${updateSite}/eclipse -# -#${java} -jar ${launcherJar} \ -# -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ -# -updateSite ${updateSite}/ \ -# -site file:${buildDirectory}/repository/site.xml \ -# -metadataRepository file:${updateSite}/ \ -# -metadataRepositoryName "ACTF Update Site" \ -# -artifactRepository file:${updateSite}/ \ -# -artifactRepositoryName "ACTF Artifacts" \ -# -reusePack200Files \ -# -noDefaultIUs \ -# -vmargs -Xmx256m \ No newline at end of file +unzip ${buildDirectory}/${BUILD_TYPE}${TIMESTAMP}/*${TIMESTAMP}-*.zip -d ${updateSite} +mv ${updateSite}/eclipse/* ${updateSite} +rmdir ${updateSite}/eclipse + +${java} -jar ${launcherJar} \ + -application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator \ + -updateSite ${updateSite}/ \ + -site file:${buildDirectory}/repository/site.xml \ + -metadataRepository file:${updateSite}/ \ + -metadataRepositoryName "ACTF Update Site" \ + -artifactRepository file:${updateSite}/ \ + -artifactRepositoryName "ACTF Artifacts" \ + -reusePack200Files \ + -noDefaultIUs \ + -vmargs -Xmx256m \ No newline at end of file
diff --git a/maps/org.eclipse.actf.visualization.feature.map b/maps/org.eclipse.actf.visualization.feature.map index 0af21e6..ec9a0a5 100644 --- a/maps/org.eclipse.actf.visualization.feature.map +++ b/maps/org.eclipse.actf.visualization.feature.map
@@ -1,7 +1,6 @@ # feature feature@org.eclipse.actf.visualization=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,,org.eclipse.actf/org.eclipse.actf.visualization/features/org.eclipse.actf.visualization-feature feature@org.eclipse.actf.visualization.sdk=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,,org.eclipse.actf/org.eclipse.actf.visualization/features/org.eclipse.actf.visualization.sdk-feature -feature@org.eclipse.actf.visualization.core=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,,org.eclipse.actf/org.eclipse.actf.visualization/features/org.eclipse.actf.visualization.core-feature feature@org.eclipse.actf.visualization.ui.pdt=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,,org.eclipse.actf/org.eclipse.actf.visualization/features/org.eclipse.actf.visualization.ui.pdt-feature feature@org.eclipse.actf.visualization.ui.wst=HEAD,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,,org.eclipse.actf/org.eclipse.actf.visualization/features/org.eclipse.actf.visualization.ui.wst-feature
diff --git a/templates/milestone_site.xml b/templates/milestone_site.xml index d8eb961..2076ddf 100644 --- a/templates/milestone_site.xml +++ b/templates/milestone_site.xml
@@ -6,9 +6,20 @@ <feature url="features/org.eclipse.actf.visualization.sdk_0.7.0.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.sdk" version="0.7.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86"> <category name="ACTF Visualizaiton SDK (Incubation)"/> </feature> + <feature url="features/org.eclipse.actf.visualization.ui.pdt_0.7.0.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.ui.pdt" version="0.7.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86"> + <category name="ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation)"/> + </feature> + <feature url="features/org.eclipse.actf.visualization.ui.wst_0.7.0.XXXXXXXXXXXXX.jar" id="org.eclipse.actf.visualization.ui.wst" version="0.7.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86"> + <category name="ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation)"/> + </feature> <category-def name="ACTF Visualizaiton SDK (Incubation)" label="ACTF Visualizaiton SDK (Incubation)"> <description> ACTF Visualizaiton SDK (Incubation) </description> </category-def> + <category-def name="ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation)" label="ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation)"> + <description> + ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation) + </description> + </category-def> </site>
diff --git a/templates/site.xml b/templates/site.xml index 2cfd216..5304968 100644 --- a/templates/site.xml +++ b/templates/site.xml
@@ -6,9 +6,20 @@ <feature url="http://www.eclipse.org/downloads/download.php?file=/technology/actf/0.7/update-site/features/org.eclipse.actf.visualization.sdk_0.7.0.XXXXXXXXXXXXX.jar&r=1" id="org.eclipse.actf.visualization.sdk" version="0.7.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86"> <category name="ACTF Visualizaiton SDK (Incubation)"/> </feature> + <feature url="http://www.eclipse.org/downloads/download.php?file=/technology/actf/0.7/update-site/features/org.eclipse.actf.visualization.ui.pdt_0.7.0.XXXXXXXXXXXXX.jar&r=1" id="org.eclipse.actf.visualization.ui.pdt" version="0.7.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86"> + <category name="ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation)"/> + </feature> + <feature url="http://www.eclipse.org/downloads/download.php?file=/technology/actf/0.7/update-site/features/org.eclipse.actf.visualization.ui.wst_0.7.0.XXXXXXXXXXXXX.jar&r=1" id="org.eclipse.actf.visualization.ui.wst" version="0.7.0.XXXXXXXXXXXXX" os="win32" ws="win32" arch="x86"> + <category name="ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation)"/> + </feature> <category-def name="ACTF Visualizaiton SDK (Incubation)" label="ACTF Visualizaiton SDK (Incubation)"> <description> ACTF Visualizaiton SDK (Incubation) </description> </category-def> + <category-def name="ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation)" label="ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation)"> + <description> + ACTF Visualizaiton UI Extensions for Web Development Environment (Incubation) + </description> + </category-def> </site>