[openrtm-commit:00977] r403 - branches/RELENG_1_1/rtmtools

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-02-04 10:29:53 +0900 (Mon, 04 Feb 2013)
New Revision: 403

Modified:
   branches/RELENG_1_1/rtmtools/
   branches/RELENG_1_1/rtmtools/build_all
   branches/RELENG_1_1/rtmtools/build_features
   branches/RELENG_1_1/rtmtools/build_plugins
   branches/RELENG_1_1/rtmtools/make_packages
Log:
merged r402


Property changes on: branches/RELENG_1_1/rtmtools
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/rtmtools:166-393,395-396,398,400
   + /trunk/rtmtools:166-393,395-396,398,400,402

Modified: branches/RELENG_1_1/rtmtools/build_all
===================================================================
--- branches/RELENG_1_1/rtmtools/build_all	2013-02-01 16:45:47 UTC (rev 402)
+++ branches/RELENG_1_1/rtmtools/build_all	2013-02-04 01:29:53 UTC (rev 403)
@@ -144,6 +144,11 @@
     if test "x$JARDIR" = "x" ; then
         JARDIR=$JARDIR_DEFAULT
     fi
+    if test -f version.txt ; then
+        rm -f version.txt
+    fi
+    echo "VERSION=$VERSION" >> version.txt
+    echo "PROJECT_VERSION=$PROJECT_VERSION" >> version.txt
 }
 
 #------------------------------------------------------------

Modified: branches/RELENG_1_1/rtmtools/build_features
===================================================================
--- branches/RELENG_1_1/rtmtools/build_features	2013-02-01 16:45:47 UTC (rev 402)
+++ branches/RELENG_1_1/rtmtools/build_features	2013-02-04 01:29:53 UTC (rev 403)
@@ -124,7 +124,12 @@
     if test "x$VERSION" = "x" || test "x$PROJECT_VERSION" = "x" ; then
         echo "Environment variable VERSION/PROJECT_VERSION is not set."
         echo "Getting from ./version text."
-        . ./version
+        if test ! -f version.txt ; then
+            echo "version.txt not found. Plugins should be built at first."
+            echo "Aborting."
+            exit 1
+        fi
+        . ./version.txt
     fi
     export VERSION
     export PROJECT_VERSION
@@ -152,7 +157,7 @@
         fi
         echo "ECLIPSE_HOME $ECLIPSE_HOME does not exist."
     fi
-    echo "Environment variable ECLIPSE_HOME is not set. Seaching..."
+    echo "Environment variable ECLIPSE_HOME is not set. Searching..."
     for d in $ECLIPSE_DIRS ; do
         tmp=`find -L $d -name .eclipseproduct`
         if test "x$tmp" = "x" ; then

Modified: branches/RELENG_1_1/rtmtools/build_plugins
===================================================================
--- branches/RELENG_1_1/rtmtools/build_plugins	2013-02-01 16:45:47 UTC (rev 402)
+++ branches/RELENG_1_1/rtmtools/build_plugins	2013-02-04 01:29:53 UTC (rev 403)
@@ -136,11 +136,16 @@
     export PROJECT_VERSION
 
     if test "x$DISTDIR" = "x" ; then
-        DISTDIR=openrtp-$VERSION
+        DISTDIR=openrtp-$PROJECT_VERSION
     fi
     if test "x$JARDIR" = "x" ; then
         JARDIR=$JARDIR_DEFAULT
     fi
+    if test -f version.txt ; then
+        rm -f version.txt
+    fi
+    echo "VERSION=$VERSION" >> version.txt
+    echo "PROJECT_VERSION=$PROJECT_VERSION" >> version.txt
 }
 
 #------------------------------------------------------------

Modified: branches/RELENG_1_1/rtmtools/make_packages
===================================================================
--- branches/RELENG_1_1/rtmtools/make_packages	2013-02-01 16:45:47 UTC (rev 402)
+++ branches/RELENG_1_1/rtmtools/make_packages	2013-02-04 01:29:53 UTC (rev 403)
@@ -153,14 +153,14 @@
 # ------------------------------------------------------------
 get_version()
 {
-    if test ! -f ./version ; then
-        echo "version file not found. Aborting."
+    if test ! -f ./version.txt ; then
+        echo "version.txt file not found. Aborting."
         exit 1
     fi
     if test "x$VERSION" = "x" || test "x$PROJECT_VERSION" = "x" ; then
         echo "Environment variable VERSION/PROJECT_VERSION is not set."
         echo "Getting from ./version text."
-        . ./version
+        . ./version.txt
     fi
     ver=`echo $PROJECT_VERSION | sed -e 's/\.//g'`
     # openrtp package name
@@ -550,4 +550,20 @@
 # ** Eclipse s Client Agent name
 #  Jakarta Commons-HttpClient/3.1
 #
+# ** Mirroring eclipse site
+#
+# *** Mirroring metadata
+#
+# java -jar ~/eclipse-3.8/plugins/org.eclipse.equinox.launcher_<ver>.jar
+#      -application org.eclipse.equinox.p2.metadata.repository.mirrorApplication
+#      -source Insert Source URL
+#      -destination <mirror directory>
+#
+# *** Mirroring artifact
+#
+# java -jar ~/eclipse-3.8/plugins/org.eclipse.equinox.launcher_<ver>.jar
+#      -application org.eclipse.equinox.p2.metadata.repository.mirrorApplication
+#      -source Insert Source URL
+#      -destination <mirror directory>
+#
 #------------------------------------------------------------