[openrtm-commit:00819] r305 - trunk/rtmtools
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2012年 5月 22日 (火) 12:44:42 JST
Author: sakamoto
Date: 2012-05-22 12:44:42 +0900 (Tue, 22 May 2012)
New Revision: 305
Modified:
trunk/rtmtools/buildall.bat
trunk/rtmtools/buildall.sh
trunk/rtmtools/buildrtcbuilder.bat
trunk/rtmtools/buildrtcbuilder.sh
trunk/rtmtools/buildsystemeditor.bat
trunk/rtmtools/buildsystemeditor.sh
Log:
for Update Site
Modified: trunk/rtmtools/buildall.bat
===================================================================
--- trunk/rtmtools/buildall.bat 2012-05-22 03:42:23 UTC (rev 304)
+++ trunk/rtmtools/buildall.bat 2012-05-22 03:44:42 UTC (rev 305)
@@ -1,17 +1,12 @@
@echo off
rem ---------------------------------------------------------------------------
rem ---------------------------------------------------------------------------
- at set DUMMY=%ANT_HOME%
- at set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.6.5\
+ at set JARDIR=openrtp_1.1.0
+ at set LIBS=-lib ..\lib -lib %ECLIPSE_HOME%\plugins
+
rem ---------------------------------------------------------------------------
rem
rem ---------------------------------------------------------------------------
-
- at set ANT4ECLIPSE=%ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
- at set JUNIT=%ECLIPSE_HOME%\plugins\org.junit_3.8.1\
- at set JARDIR=openrtp_1.1.0
-
-
set TARGETS=^
jp.go.aist.rtm.toolscommon.profiles ^
jp.go.aist.rtm.toolscommon.profiles.nl1 ^
@@ -39,7 +34,7 @@
@set target=%%p
echo %%p
cd %%p
- call ant buildAll -lib %ANT4ECLIPSE% -lib %JUNIT%
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
copy jar\*aist*.jar ..\%JARDIR%
cd ..
@@ -50,7 +45,6 @@
:FAIL
cd ..
- at set ANT_HOME=%DUMMY%
echo "Build failed" %TARGET%
:END
Modified: trunk/rtmtools/buildall.sh
===================================================================
--- trunk/rtmtools/buildall.sh 2012-05-22 03:42:23 UTC (rev 304)
+++ trunk/rtmtools/buildall.sh 2012-05-22 03:44:42 UTC (rev 305)
@@ -10,14 +10,11 @@
# 以下にビルドに必要な環境とインストール方法を簡単に示します。
# Eclipse SDK
# ant
-# ant4eclipse
# jdk
#
# 環境変数
# ビルドに必要な環境変数を以下に示します。
-# ECLIPSE_HOME Eclipse SDK 3.2.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-# ECLIPSE33_HOME Eclipse SDK 3.3.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-# ANT_HOME ant のディレクトリを指定します。
+# ECLIPSE_HOME Eclipse SDK 3.2.x の実行ファイルがあるディレクトリを指定
# JAVA_HOME jdkのディレクトリを指定します。
#
#===========================================================================
@@ -26,16 +23,9 @@
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
-
-DUMMY=$ANT_HOME
-export ANT_HOME=$ECLIPSE_HOME/plugins/org.apache.ant_1.7.0.v200803061910/
-
-# ECLIPSE_HOME=/usr/users/n-ando/work/rtmtools/eclipse/
-
-ANT4ECLIPSE=$ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/
-JUNIT=$ECLIPSE_HOME/plugins/org.junit_3.8.2.v20080602-1318/
JARDIR=openrtp_1.1.0
-LIBS="-lib $ANT4ECLIPSE -lib $ANT_HOME -lib $JUNIT -lib $ECLIPSE_HOME/plugins"
+LIBS="-lib ../lib -lib $ECLIPSE_HOME/plugins"
+
projects="jp.go.aist.rtm.toolscommon.profiles
jp.go.aist.rtm.toolscommon.profiles.nl1
jp.go.aist.rtm.toolscommon
@@ -70,7 +60,6 @@
if test $? -ne 0; then
echo "build failed: " $project
- export ANT_HOME=$DUMMY
exit 1
fi
mv jar/*aist*.jar ../$JARDIR
@@ -85,6 +74,4 @@
fi
zip $JARDIR.zip -r ./$JARDIR
-export ANT_HOME=$DUMMY
-
Modified: trunk/rtmtools/buildrtcbuilder.bat
===================================================================
--- trunk/rtmtools/buildrtcbuilder.bat 2012-05-22 03:42:23 UTC (rev 304)
+++ trunk/rtmtools/buildrtcbuilder.bat 2012-05-22 03:44:42 UTC (rev 305)
@@ -1,24 +1,25 @@
@echo off
rem ---------------------------------------------------------------------------
rem ---------------------------------------------------------------------------
- at set DUMMY=%ANT_HOME%
- at set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.6.5\
+ at set JARDIR=rtcbuilder_1.1.0
+ at set LIBS=-lib ..\lib -lib %ECLIPSE_HOME%\plugins
+
rem ---------------------------------------------------------------------------
rem
rem ---------------------------------------------------------------------------
- at if exist rtcbuilder_1.1.0 (
- rd /S /Q rtcbuilder_1.1.0
+ at if exist %JARDIR% (
+ rd /S /Q %JARDIR%
)
-mkdir rtcbuilder_1.1.0
+mkdir %JARDIR%
rem ---------------------------------------------------------------------------
rem
rem ---------------------------------------------------------------------------
@if exist jp.go.aist.rtm.toolscommon.profiles (
echo -jp.go.aist.rtm.toolscommon.profiles
cd jp.go.aist.rtm.toolscommon.profiles
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.toolscommon.profiles doesn't exist.
@@ -30,9 +31,9 @@
@if exist jp.go.aist.rtm.toolscommon.profiles.nl1 (
echo -jp.go.aist.rtm.toolscommon.profiles.nl1
cd jp.go.aist.rtm.toolscommon.profiles.nl1
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.toolscommon.profilesi.nl1 doesn't exist.
@@ -44,9 +45,9 @@
@if exist jp.go.aist.rtm.toolscommon (
echo -jp.go.aist.rtm.toolscommon
cd jp.go.aist.rtm.toolscommon
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.toolscommon doesn't exist.
@@ -58,9 +59,9 @@
@if exist jp.go.aist.rtm.toolscommon.nl1 (
echo -jp.go.aist.rtm.toolscommon.nl1
cd jp.go.aist.rtm.toolscommon.nl1
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.toolscommon.nl1 doesn't exist.
@@ -72,9 +73,9 @@
@if exist jp.go.aist.rtm.rtcbuilder (
echo -jp.go.aist.rtm.rtcbuilder
cd jp.go.aist.rtm.rtcbuilder
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.rtcbuilder doesn't exist.
@@ -86,9 +87,9 @@
@if exist jp.go.aist.rtm.rtcbuilder.nl1 (
echo -jp.go.aist.rtm.rtcbuilder.nl1
cd jp.go.aist.rtm.rtcbuilder.nl1
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.rtcbuilder.nl1 doesn't exist.
@@ -100,9 +101,9 @@
@if exist jp.go.aist.rtm.rtcbuilder.java (
echo -jp.go.aist.rtm.rtcbuilder.java
cd jp.go.aist.rtm.rtcbuilder.java
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.rtcbuilder.java doesn't exist.
@@ -114,9 +115,9 @@
@if exist jp.go.aist.rtm.rtcbuilder.python (
echo -jp.go.aist.rtm.rtcbuilder.python
cd jp.go.aist.rtm.rtcbuilder.python
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.rtcbuilder.python doesn't exist.
@@ -128,9 +129,9 @@
@if exist jp.go.aist.rtm.rtcbuilder.vbdotnet (
echo -jp.go.aist.rtm.rtcbuilder.vbdotnet
cd jp.go.aist.rtm.rtcbuilder.vbdotnet
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.rtcbuilder.vbdotnet doesn't exist.
@@ -142,10 +143,10 @@
@if exist jp.go.aist.rtm.rtcbuilder.csharp (
echo -jp.go.aist.rtm.rtcbuilder.csharp
cd jp.go.aist.rtm.rtcbuilder.csharp
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
echo --
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtcbuilder_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.rtcbuilder.csharp doesn't exist.
@@ -155,15 +156,13 @@
rem
rem ---------------------------------------------------------------------------
@if exist zip.vbs (
- del rtcbuilder_1.1.0.zip
- CScript.exe .\zip.vbs\MakeZIP.VBS rtcbuilder_1.1.0.zip rtcbuilder_1.1.0
- rd /S /Q rtcbuilder_1.1.0
+ del %JARDIR%.zip
+ CScript.exe .\zip.vbs\MakeZIP.VBS %JARDIR%.zip %JARDIR%
+ rd /S /Q %JARDIR%
)
- at set ANT_HOME=%DUMMY%
@goto END
:FAIL
cd..
- at set ANT_HOME=%DUMMY%
:END
Modified: trunk/rtmtools/buildrtcbuilder.sh
===================================================================
--- trunk/rtmtools/buildrtcbuilder.sh 2012-05-22 03:42:23 UTC (rev 304)
+++ trunk/rtmtools/buildrtcbuilder.sh 2012-05-22 03:44:42 UTC (rev 305)
@@ -10,22 +10,20 @@
# 以下にビルドに必要な環境とインストール方法を簡単に示します。
# Eclipse SDK
# ant
-# ant4eclipse
# jdk
#
# 環境変数
# ビルドに必要な環境変数を以下に示します。
-# ECLIPSE_HOME Eclipse SDK 3.2.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-# ECLIPSE33_HOME Eclipse SDK 3.3.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-# ANT_HOME ant のディレクトリを指定します。
+# ECLIPSE_HOME Eclipse SDK 3.2.x の実行ファイルがあるディレクトリを指定
# JAVA_HOME jdkのディレクトリを指定します。
#
#===========================================================================
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
-set DUMMY=$ANT_HOME
-export ANT_HOME=$ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/
+JARDIR=rtcbuilder_1.1.0
+LIBS="-lib ../lib -lib $ECLIPSE_HOME/plugins"
+
#---------------------------------------------------------------------------
#
#---------------------------------------------------------------------------
@@ -54,10 +52,9 @@
then
echo "-" ${build_tbl[ic]}
cd ${build_tbl[ic]}
- ant buildAll -lib $ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/ -lib $ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ -lib $ECLIPSE_HOME/plugins/org.junit_3.8.1/ -lib $ECLIPSE_HOME/plugins
+ ant buildAll ${LIBS}
if [ $? -ne 0 ];
then
- set ANT_HOME=$DUMMY
exit 1
fi
cd ..
@@ -72,23 +69,18 @@
#
#
#---------------------------------------------------------------------------
-mkdir ./rtcbuilder_1.1.0
+mkdir ./${JARDIR}
ic=0
declare name
while [ $ic -lt $num ]
do
- name=${build_tbl[ic]}"_1.1.0.jar"
- cp -p ${build_tbl[ic]}/jar/$name ./rtcbuilder_1.1.0
+ name=${build_tbl[ic]}"_*.jar"
+ cp -p ${build_tbl[ic]}/jar/$name ./${JARDIR}
ic=ic+1
done
-rm rtcbuilder_1.1.0.zip
-zip rtcbuilder_1.1.0.zip -r ./rtcbuilder_1.1.0/
+rm ${JARDIR}.zip
+zip ${JARDIR}.zip -r ./${JARDIR}/
-rm -rf ./rtcbuilder_1.1.0
+rm -rf ./${JARDIR}
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-set ANT_HOME=$DUMMY
-
-
Modified: trunk/rtmtools/buildsystemeditor.bat
===================================================================
--- trunk/rtmtools/buildsystemeditor.bat 2012-05-22 03:42:23 UTC (rev 304)
+++ trunk/rtmtools/buildsystemeditor.bat 2012-05-22 03:44:42 UTC (rev 305)
@@ -1,24 +1,25 @@
@echo off
rem ---------------------------------------------------------------------------
rem ---------------------------------------------------------------------------
- at set DUMMY=%ANT_HOME%
- at set ANT_HOME=%ECLIPSE_HOME%\plugins\org.apache.ant_1.6.5\
+ at set JARDIR=rtsystemeditor_1.1.0
+ at set LIBS=-lib ..\lib -lib %ECLIPSE_HOME%\plugins
+
rem ---------------------------------------------------------------------------
rem
rem ---------------------------------------------------------------------------
- at if exist rtsystemeditor_1.1.0 (
- rd /S /Q rtsystemeditor_1.1.0
+ at if exist %JARDIR% (
+ rd /S /Q %JARDIR%
)
-mkdir rtsystemeditor_1.1.0
+mkdir %JARDIR%
rem ---------------------------------------------------------------------------
rem
rem ---------------------------------------------------------------------------
@if exist jp.go.aist.rtm.toolscommon (
echo -jp.go.aist.rtm.toolscommon
cd jp.go.aist.rtm.toolscommon
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.toolscommon doesn't exist.
@@ -30,9 +31,9 @@
@if exist jp.go.aist.rtm.toolscommon.nl1 (
echo -jp.go.aist.rtm.toolscommon.nl1
cd jp.go.aist.rtm.toolscommon.nl1
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.toolscommon.nl1 doesn't exist.
@@ -44,9 +45,9 @@
@if exist jp.go.aist.rtm.toolscommon.profiles (
echo -jp.go.aist.rtm.toolscommon.profiles
cd jp.go.aist.rtm.toolscommon.profiles
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.toolscommon.profiles doesn't exist.
@@ -58,9 +59,9 @@
@if exist jp.go.aist.rtm.toolscommon.profiles.nl1 (
echo -jp.go.aist.rtm.toolscommon.profiles.nl1
cd jp.go.aist.rtm.toolscommon.profiles.nl1
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.toolscommon.profiles.nl1 doesn't exist.
@@ -72,9 +73,9 @@
@if exist jp.go.aist.rtm.repositoryView (
echo -jp.go.aist.rtm.repositoryView
cd jp.go.aist.rtm.repositoryView
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.repositoryView doesn't exist.
@@ -86,9 +87,9 @@
@if exist jp.go.aist.rtm.repositoryView.nl1 (
echo -jp.go.aist.rtm.repositoryView.nl1
cd jp.go.aist.rtm.repositoryView.nl1
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\ -lib %ECLIPSE_HOME%\plugins\org.junit_3.8.1\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.repositoryView.nl1 doesn't exist.
@@ -100,9 +101,9 @@
@if exist jp.go.aist.rtm.nameserviceview (
echo -jp.go.aist.rtm.nameserviceview
cd jp.go.aist.rtm.nameserviceview
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.nameserviceview doesn't exist.
@@ -114,9 +115,9 @@
@if exist jp.go.aist.rtm.nameserviceview.nl1 (
echo -jp.go.aist.rtm.nameserviceview.nl1
cd jp.go.aist.rtm.nameserviceview.nl1
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
+ call ant buildAll %LIBS%
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.nameserviceview.nl1 doesn't exist.
@@ -128,10 +129,10 @@
@if exist jp.go.aist.rtm.systemeditor (
echo -jp.go.aist.rtm.systemeditor
cd jp.go.aist.rtm.systemeditor
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
+ call ant buildAll %LIBS%
echo --
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.systemeditor doesn't exist.
@@ -143,10 +144,10 @@
@if exist jp.go.aist.rtm.systemeditor.nl1 (
echo -jp.go.aist.rtm.systemeditor.nl1
cd jp.go.aist.rtm.systemeditor.nl1
- call ant buildAll -lib %ECLIPSE_HOME%\plugins\net.sf.ant4eclipse.plugin_0.5.0.rc1\lib\
+ call ant buildAll %LIBS%
echo --
if ERRORLEVEL 1 goto FAIL
- copy jar\*aist*.jar ..\rtsystemeditor_1.1.0
+ copy jar\*aist*.jar ..\%JARDIR%
cd ..
) else (
echo -jp.go.aist.rtm.systemeditor.nl1 doesn't exist.
@@ -156,16 +157,14 @@
rem
rem ---------------------------------------------------------------------------
@if exist zip.vbs (
- del rtsystemeditor_1.1.0.zip
- CScript.exe .\zip.vbs\MakeZIP.VBS rtsystemeditor_1.1.0.zip rtsystemeditor_1.1.0
- rd /S /Q rtsystemeditor_1.1.0
+ del %JARDIR%.zip
+ CScript.exe .\zip.vbs\MakeZIP.VBS %JARDIR%.zip %JARDIR%
+ rd /S /Q %JARDIR%
)
- at set ANT_HOME=%DUMMY%
@goto END
:FAIL
cd ..
- at set ANT_HOME=%DUMMY%
:END
Modified: trunk/rtmtools/buildsystemeditor.sh
===================================================================
--- trunk/rtmtools/buildsystemeditor.sh 2012-05-22 03:42:23 UTC (rev 304)
+++ trunk/rtmtools/buildsystemeditor.sh 2012-05-22 03:44:42 UTC (rev 305)
@@ -10,14 +10,11 @@
# 以下にビルドに必要な環境とインストール方法を簡単に示します。
# Eclipse SDK
# ant
-# ant4eclipse
# jdk
#
# 環境変数
# ビルドに必要な環境変数を以下に示します。
-# ECLIPSE_HOME Eclipse SDK 3.2.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-# ECLIPSE33_HOME Eclipse SDK 3.3.x ¤Î¼Â¹Ô¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò»ØÄê£
-# ANT_HOME ant のディレクトリを指定します。
+# ECLIPSE_HOME Eclipse SDK 3.2.x の実行ファイルがあるディレクトリを指定
# JAVA_HOME jdkのディレクトリを指定します。
#
#===========================================================================
@@ -26,8 +23,9 @@
#---------------------------------------------------------------------------
#---------------------------------------------------------------------------
-set DUMMY=$ANT_HOME
-export ANT_HOME=$ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/
+JARDIR=rtcbuilder_1.1.0
+LIBS="-lib ../lib -lib $ECLIPSE_HOME/plugins"
+
#---------------------------------------------------------------------------
#
#---------------------------------------------------------------------------
@@ -56,10 +54,9 @@
then
echo "-" ${build_tbl[ic]}
cd ${build_tbl[ic]}
- ant buildAll -lib $ECLIPSE_HOME/plugins/net.sf.ant4eclipse.plugin_0.5.0.rc1/lib/ -lib $ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ -lib $ECLIPSE_HOME/plugins/org.junit_3.8.1/ -lib $ECLIPSE_HOME/plugins
+ ant buildAll ${LIBS}
if [ $? -ne 0 ];
then
- set ANT_HOME=$DUMMY
exit 1
fi
cd ..
@@ -74,25 +71,19 @@
#
#
#---------------------------------------------------------------------------
-mkdir ./rtsystemeditor_1.1.0
+mkdir ./${JARDIR}
#find ./ -name '*aist*.jar' -exec cp -p {} . \;
ic=0
declare name
while [ $ic -lt $num ]
do
- name=${build_tbl[ic]}"_1.1.0.jar"
- cp -p ${build_tbl[ic]}/jar/$name ./rtsystemeditor_1.1.0
+ name=${build_tbl[ic]}"_*.jar"
+ cp -p ${build_tbl[ic]}/jar/$name ./${JARDIR}
ic=ic+1
done
-rm rtsystemeditor_1.1.0.zip
-zip rtsystemeditor_1.1.0.zip -r ./rtsystemeditor_1.1.0
+rm ${JARDIR}.zip
+zip ${JARDIR}.zip -r ./${JARDIR}
-rm -rf ./rtsystemeditor_1.1.0
+rm -rf ./${JARDIR}
-
-#---------------------------------------------------------------------------
-#---------------------------------------------------------------------------
-set ANT_HOME=$DUMMY
-
-
More information about the openrtm-commit
mailing list