[openrtm-commit:00993] r418 - in branches/RELENG_1_1/rtmtools: . jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2013年 2月 7日 (木) 00:38:14 JST
Author: n-ando
Date: 2013-02-07 00:38:14 +0900 (Thu, 07 Feb 2013)
New Revision: 418
Added:
branches/RELENG_1_1/rtmtools/pleiades-config.xml.patch
Modified:
branches/RELENG_1_1/rtmtools/
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java
branches/RELENG_1_1/rtmtools/make_packages
Log:
merged r413-417
Property changes on: branches/RELENG_1_1/rtmtools
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411
+ /trunk/rtmtools:166-393,395-396,398,400,402,404,406-407,409-411,413-417
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2013-02-06 15:35:06 UTC (rev 417)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.rtcbuilder/src/jp/go/aist/rtm/rtcbuilder/template/cmake/src/SrcCMakeLists.txt.vsl 2013-02-06 15:38:14 UTC (rev 418)
@@ -15,20 +15,21 @@
link_directories(${dol}{OPENRTM_LIBRARY_DIRS})
link_directories(${dol}{OMNIORB_LIBRARY_DIRS})
-add_library(${dol}{PROJECT_NAME_LOWER} ${dol}{LIB_TYPE} ${dol}{comp_srcs} ${dol}{comp_headers} ${dol}{ALL_IDL_SRCS})
+add_library(${dol}{PROJECT_NAME} ${dol}{LIB_TYPE} ${dol}{comp_srcs} ${dol}{comp_headers} ${dol}{ALL_IDL_SRCS})
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
set_source_files_properties(${dol}{ALL_IDL_SRCS} PROPERTIES GENERATED 1)
-add_dependencies(${dol}{PROJECT_NAME_LOWER} ALL_IDL_TGT)
-target_link_libraries(${dol}{PROJECT_NAME_LOWER} ${dol}{OPENRTM_LIBRARIES})
+add_dependencies(${dol}{PROJECT_NAME} ALL_IDL_TGT)
+target_link_libraries(${dol}{PROJECT_NAME} ${dol}{OPENRTM_LIBRARIES})
-add_executable(${dol}{PROJECT_NAME_LOWER}comp ${dol}{standalone_srcs})
-target_link_libraries(${dol}{PROJECT_NAME_LOWER}comp ${dol}{PROJECT_NAME_LOWER})
+add_executable(${dol}{PROJECT_NAME}Comp ${dol}{standalone_srcs})
+target_link_libraries(${dol}{PROJECT_NAME}Comp ${dol}{PROJECT_NAME})
-install(TARGETS ${dol}{PROJECT_NAME_LOWER} ${dol}{PROJECT_NAME_LOWER}comp
- EXPORT ${dol}{PROJECT_NAME_LOWER}
+install(TARGETS ${dol}{PROJECT_NAME} ${dol}{PROJECT_NAME}Comp
+ EXPORT ${dol}{PROJECT_NAME}
RUNTIME DESTINATION ${dol}{BIN_INSTALL_DIR} COMPONENT component
LIBRARY DESTINATION ${dol}{LIB_INSTALL_DIR} COMPONENT component
ARCHIVE DESTINATION ${dol}{LIB_INSTALL_DIR} COMPONENT component)
-install(EXPORT ${dol}{PROJECT_NAME_LOWER}
- DESTINATION ${dol}{LIB_INSTALL_DIR}/${dol}{PROJECT_NAME_LOWER}
- FILE ${dol}{PROJECT_NAME_LOWER}Depends.cmake)
+install(EXPORT ${dol}{PROJECT_NAME}
+ DESTINATION ${dol}{LIB_INSTALL_DIR}/${dol}{PROJECT_NAME}
+ FILE ${dol}{PROJECT_NAME}Depends.cmake)
\ No newline at end of file
Modified: branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java
===================================================================
--- branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java 2013-02-06 15:35:06 UTC (rev 417)
+++ branches/RELENG_1_1/rtmtools/jp.go.aist.rtm.systemeditor/src/jp/go/aist/rtm/systemeditor/ui/dialog/ConfigurationDialog.java 2013-02-06 15:38:14 UTC (rev 418)
@@ -95,7 +95,7 @@
}
this.isValueModified = false;
this.isApply = true;
- this.copiedConfig = view.getComponentConfig().clone();
+ this.copiedConfig = view.getComponentConfig();
this.view = view;
this.firstApply = true;
}
Modified: branches/RELENG_1_1/rtmtools/make_packages
===================================================================
--- branches/RELENG_1_1/rtmtools/make_packages 2013-02-06 15:35:06 UTC (rev 417)
+++ branches/RELENG_1_1/rtmtools/make_packages 2013-02-06 15:38:14 UTC (rev 418)
@@ -108,11 +108,11 @@
org.eclipse.xsd.sdk.feature.group"
# Language package information
-# true ${LANGPACK_URL:="http://sourceforge.jp/projects/mergedoc/svn/view/trunk/Pleiades/build/pleiades.zip?view=co&root=mergedoc"}
-true ${LANGPACK_URL:="http://jaist.dl.sourceforge.jp/blancofw/56316/NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
-# true ${LANGPACK_FILE_NAME:="pleiades.zip"}
-true ${LANGPACK_FILE_NAME:="NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
-#true ${PLEIADES:="YES"}
+true ${LANGPACK_URL:="http://sourceforge.jp/projects/mergedoc/svn/view/trunk/Pleiades/build/pleiades.zip?view=co&root=mergedoc"}
+#true ${LANGPACK_URL:="http://jaist.dl.sourceforge.jp/blancofw/56316/NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
+true ${LANGPACK_FILE_NAME:="pleiades.zip"}
+#true ${LANGPACK_FILE_NAME:="NLpackja-eclipse-SDK-3.8.0-blancofw20120628.zip"}
+true ${PLEIADES:="YES"}
# openrtp tool information
HERE=`pwd`
true ${OPENRTP_SITE:="file:${HERE}/sitetool/openrtp_site"}
@@ -293,6 +293,16 @@
cmd="java -jar $EQUINOX_LAUNCHER"
app_opt="-application org.eclipse.equinox.p2.director"
dest_opt="-destination $WORK_DIR/eclipse"
+
+ scheme=`echo $REPOSITORY | egrep '^(http|https|ftp|file):\/\/'`
+ if test "x$scheme" = "x" ; then
+ # is local file?
+ is_abs=`echo $REPOSITORY | grep '^\/'`
+ if test "x$is_abs" = "x" ; then
+ REPOSITORY=`pwd`/$REPOSITORY
+ fi
+ REPOSITORY="file://$REPOSITORY"
+ fi
repo_opt="-repository $REPOSITORY"
for p in $PLUGINS ; do
@@ -432,6 +442,7 @@
echo "Unzipping $LANGPACK_FILE_NAME failed. Aborting."
exit 1
fi
+
echo "Applying langpack: Activating pleiades plugin."
pleiades_jar="plugins/jp.sourceforge.mergedoc.pleiades/pleiades.jar"
if test "x$OS" = "xMACOS" ; then
@@ -441,12 +452,20 @@
echo "-javaagent:$pleiades_jar" \
>> $WORK_DIR/eclipse/eclipse.ini
fi
+
echo "Applying langpack: Modifying pleiades exclude properties."
pleiades_pkg="jp.sourceforge.mergedoc.pleiades"
pleiades_conf="${WORK_DIR}/eclipse/plugins/${pleiades_pkg}/conf"
exclude_prop="${pleiades_conf}/translation-exclude-package.properties"
echo "default=jp.go.aist.rtm.systemeditor
" >> $exclude_prop
+
+ echo "Applying patch for pleiades-config.xml"
+ patch $pleiades_conf/pleiades-config.xml pleiades-config.xml.patch
+ if test $? -ne 0 ; then
+ echo "Patching failed. Aborting."
+ exit 1
+ fi
else
unzip -o $WORK_DIR/$LANGPACK_FILE_NAME -d $WORK_DIR
if test $? -ne 0 ; then
Copied: branches/RELENG_1_1/rtmtools/pleiades-config.xml.patch (from rev 417, trunk/rtmtools/pleiades-config.xml.patch)
===================================================================
--- branches/RELENG_1_1/rtmtools/pleiades-config.xml.patch (rev 0)
+++ branches/RELENG_1_1/rtmtools/pleiades-config.xml.patch 2013-02-06 15:38:14 UTC (rev 418)
@@ -0,0 +1,50 @@
+--- pleiades-config.xml.org 2013-02-06 17:48:38.444142000 +0900
++++ pleiades-config.xml 2013-02-06 22:56:00.168388045 +0900
+@@ -346,7 +346,23 @@
+ <!-- 呼び出し元による除外 DBViewer 2009.01.08 -->
+ <excludeWhere
+ className="zigen.plugin"/>
++
++ <excludeWhere
++ className="jp.go.aist.rtm."/>
++
++ </jointPoint>
+
++ <!-- SWT TabItem for RTSystemEditor/RTCBuilder. moved from execution/before -->
++ <jointPoint className="org.eclipse.swt.widgets.TabItem" methodName="setText">
++ <excludeWhere className="jp.go.aist.rtm."/>
++ </jointPoint>
++ <!-- SWT Group for RTSystemEditor/RTCBuilder. moved from execution/before -->
++ <jointPoint className="org.eclipse.swt.widgets.Group" methodName="setText">
++ <excludeWhere className="jp.go.aist.rtm."/>
++ </jointPoint>
++ <!-- SWT Group for RTSystemEditor/RTCBuilder. moved from execution/before -->
++ <jointPoint className="org.eclipse.swt.widgets.Button" methodName="setText">
++ <excludeWhere className="jp.go.aist.rtm."/>
+ </jointPoint>
+
+ <!-- ハイパーリンク (Mylyn 初期値設定ウィザード) 2009.04.22 -->
+@@ -680,6 +696,9 @@
+ <!-- 呼び出し元による除外（EMecha の新規作成ウィザード) 2009.01.03 -->
+ <excludeWhere
+ className="org.seasar.dbflute.emecha"/>
++
++ <excludeWhere
++ className="jp.go.aist.rtm."/>
+
+ </jointPoint>
+
+@@ -832,11 +851,11 @@
+ OS によりシグネチャが異なる複数のメソッドがある場合があることに注意。例えば
+ Linux GTK では ToolItem#setToolTipText に引数が 1 つのものと 2 つのものが存在する。
+ -->
+- <jointPoint className="org.eclipse.swt.widgets.Group" methodName="setText"/>
++ <!--jointPoint className="org.eclipse.swt.widgets.Group" methodName="setText"/-->
+ <jointPoint className="org.eclipse.swt.widgets.Decorations" methodName="setText"/>
+ <jointPoint className="org.eclipse.swt.widgets.ToolItem" methodName="setText"/>
+ <jointPoint className="org.eclipse.swt.widgets.ToolItem" methodName="setToolTipText" descriptor="(Ljava/lang/String;)V"/>
+- <jointPoint className="org.eclipse.swt.widgets.TabItem" methodName="setText"/>
++ <!--jointPoint className="org.eclipse.swt.widgets.TabItem" methodName="setText"/-->
+ <jointPoint className="org.eclipse.swt.widgets.TabItem" methodName="setToolTipText"/>
+ <jointPoint className="org.eclipse.swt.widgets.Control" methodName="setToolTipText" descriptor="(Ljava/lang/String;)V"/>
+ <jointPoint className="org.eclipse.swt.widgets.DirectoryDialog" methodName="setMessage"/>
More information about the openrtm-commit
mailing list