[openrtm-commit:00912] r373 - in trunk/rtmtools/sitetool: . jp.go.aist.rtm.rtcbuilder.feature/META-INF jp.go.aist.rtm.rtcbuilder.nl1.feature/META-INF jp.go.aist.rtm.rtsystemeditor.feature/META-INF jp.go.aist.rtm.rtsystemeditor.nl1.feature/META-INF openrtp_site

[openrtm ＠ openrtm.org]

Author: 
Date: 2012-11-22 23:49:08 +0900 (Thu, 22 Nov 2012)
New Revision: 373

Modified:
   trunk/rtmtools/sitetool/build.xml
   trunk/rtmtools/sitetool/jp.go.aist.rtm.rtcbuilder.feature/META-INF/MANIFEST.MF
   trunk/rtmtools/sitetool/jp.go.aist.rtm.rtcbuilder.nl1.feature/META-INF/MANIFEST.MF
   trunk/rtmtools/sitetool/jp.go.aist.rtm.rtsystemeditor.feature/META-INF/MANIFEST.MF
   trunk/rtmtools/sitetool/jp.go.aist.rtm.rtsystemeditor.nl1.feature/META-INF/MANIFEST.MF
   trunk/rtmtools/sitetool/openrtp_site/site.xml
   trunk/rtmtools/sitetool/run.bat
Log:
Update of the UpdateSiteProject for Eclipse(3.4 or newer).

Modified: trunk/rtmtools/sitetool/build.xml
===================================================================
--- trunk/rtmtools/sitetool/build.xml	2012-11-20 13:22:59 UTC (rev 372)
+++ trunk/rtmtools/sitetool/build.xml	2012-11-22 14:49:08 UTC (rev 373)
@@ -16,7 +16,7 @@
 
 
 	<!-- 更新サイトに関する設定 -->
-	<property name="site_proj.dir" value="openrtp_site" />
+	<property name="site_proj.dir" value="${basedir}/openrtp_site" />
 	<property name="update_site.name" value="OpenRTP Updates" />
 
 	<!-- フィーチャ(RTCBuilder)に関する設定 -->
@@ -550,14 +550,26 @@
 		<echo message="launcher.id=${launcher.id}" />
 		<echo message="launcher.jar=${launcher.jar}" />
 
+		<delete file="${update_site.dir}/artifacts.jar" />
+		<delete file="${update_site.dir}/content.jar" />
 		<java jar="${launcher.jar}" fork="true" failonerror="true" maxmemory="256m">
 			<arg line="org.eclipse.equinox.launcher.Main" />
-			<arg line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator" />
-			<arg line="-updateSite ${update_site.dir}/ -site file:${update_site.dir}/site.xml" />
-			<arg line="-metadataRepository file:${update_site.dir}/ -metadataRepositoryName "${update_site.name}"" />
-			<arg line="-artifactRepository file:${update_site.dir}/ -artifactRepositoryName "${update_site.name}"" />
-			<arg line="-noDefaultIUs -reusePack200Files" />
+			<arg line="-application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher" />
+			<arg line="-source ${update_site.dir}" />
+			<arg line="-metadataRepository file://${update_site.dir}" />
+			<arg line="-artifactRepository file://${update_site.dir}" />
+			<arg line="-publishArtifacts -compress" />
+			
 		</java>
+
+		<java jar="${launcher.jar}" fork="true" failonerror="true" maxmemory="256m">
+			<arg line="org.eclipse.equinox.launcher.Main" />
+			<arg line="-application org.eclipse.equinox.p2.publisher.CategoryPublisher" />
+			<arg line="-metadataRepository file://${update_site.dir}" />
+			<arg line="-categoryDefinition file://${update_site.dir}/site.xml" />
+			<arg line="-compress -categoryQualifier" />
+			
+		</java>
 	</target>
 
 </project>

Modified: trunk/rtmtools/sitetool/jp.go.aist.rtm.rtcbuilder.feature/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/sitetool/jp.go.aist.rtm.rtcbuilder.feature/META-INF/MANIFEST.MF	2012-11-20 13:22:59 UTC (rev 372)
+++ trunk/rtmtools/sitetool/jp.go.aist.rtm.rtcbuilder.feature/META-INF/MANIFEST.MF	2012-11-22 14:49:08 UTC (rev 373)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
+Ant-Version: Apache Ant 1.8.3
 Created-By: 20.6-b01 (Sun Microsystems Inc.)
 

Modified: trunk/rtmtools/sitetool/jp.go.aist.rtm.rtcbuilder.nl1.feature/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/sitetool/jp.go.aist.rtm.rtcbuilder.nl1.feature/META-INF/MANIFEST.MF	2012-11-20 13:22:59 UTC (rev 372)
+++ trunk/rtmtools/sitetool/jp.go.aist.rtm.rtcbuilder.nl1.feature/META-INF/MANIFEST.MF	2012-11-22 14:49:08 UTC (rev 373)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
+Ant-Version: Apache Ant 1.8.3
 Created-By: 20.6-b01 (Sun Microsystems Inc.)
 

Modified: trunk/rtmtools/sitetool/jp.go.aist.rtm.rtsystemeditor.feature/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/sitetool/jp.go.aist.rtm.rtsystemeditor.feature/META-INF/MANIFEST.MF	2012-11-20 13:22:59 UTC (rev 372)
+++ trunk/rtmtools/sitetool/jp.go.aist.rtm.rtsystemeditor.feature/META-INF/MANIFEST.MF	2012-11-22 14:49:08 UTC (rev 373)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
+Ant-Version: Apache Ant 1.8.3
 Created-By: 20.6-b01 (Sun Microsystems Inc.)
 

Modified: trunk/rtmtools/sitetool/jp.go.aist.rtm.rtsystemeditor.nl1.feature/META-INF/MANIFEST.MF
===================================================================
--- trunk/rtmtools/sitetool/jp.go.aist.rtm.rtsystemeditor.nl1.feature/META-INF/MANIFEST.MF	2012-11-20 13:22:59 UTC (rev 372)
+++ trunk/rtmtools/sitetool/jp.go.aist.rtm.rtsystemeditor.nl1.feature/META-INF/MANIFEST.MF	2012-11-22 14:49:08 UTC (rev 373)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.7.0
+Ant-Version: Apache Ant 1.8.3
 Created-By: 20.6-b01 (Sun Microsystems Inc.)
 

Modified: trunk/rtmtools/sitetool/openrtp_site/site.xml
===================================================================
--- trunk/rtmtools/sitetool/openrtp_site/site.xml	2012-11-20 13:22:59 UTC (rev 372)
+++ trunk/rtmtools/sitetool/openrtp_site/site.xml	2012-11-22 14:49:08 UTC (rev 373)
@@ -3,6 +3,9 @@
    <description url="http://www.openrtm.org/pub/OpenRTP/updates/">
       Open RT Platform tools update site.
    </description>
+<feature url="features/jp.go.aist.rtm.rtcbuilder.feature_1.1.0.rc3v20120630.jar" id="jp.go.aist.rtm.rtcbuilder.feature" version="1.1.0.rc3v20120630">
+<category name="OpenRTP 1.1.0"/>
+</feature>
 <feature url="features/jp.go.aist.rtm.rtsystemeditor.nl1.feature_1.1.0.rc3v20120215.jar" id="jp.go.aist.rtm.rtsystemeditor.nl1.feature" version="1.1.0.rc3v20120215">
 <category name="OpenRTP 1.1.0"/>
 </feature>

Modified: trunk/rtmtools/sitetool/run.bat
===================================================================
--- trunk/rtmtools/sitetool/run.bat	2012-11-20 13:22:59 UTC (rev 372)
+++ trunk/rtmtools/sitetool/run.bat	2012-11-22 14:49:08 UTC (rev 373)
@@ -1,7 +1,7 @@
 
 cd %~dp0
 
-set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.7.0.v200803061910
+set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.8.3.v20120321-1730
 set PATH=%PATH%;%ANT_HOME%\bin
 
 call ant -lib lib get.plugins