[openrtm-commit:02157] r2809 - in trunk/OpenRTM-aist: . src/lib/coil/win32/coil src/lib/rtc/corba/idl src/lib/rtm src/lib/rtm/ext src/lib/rtm/idl utils/rtcd utils/rtcprof win32/OpenRTM-aist win32/OpenRTM-aist/bin win32/OpenRTM-aist/cmake win32/OpenRTM-aist/docs win32/OpenRTM-aist/etc win32/OpenRTM-aist/examples win32/OpenRTM-aist/ext/ec win32/OpenRTM-aist/ext/local_service win32/OpenRTM-aist/ext/sdo win32/OpenRTM-aist/utils/rtc-template
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2016年 12月 6日 (火) 17:33:15 JST
Author: kawauchi
Date: 2016-12-06 17:33:15 +0900 (Tue, 06 Dec 2016)
New Revision: 2809
Removed:
trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
trunk/OpenRTM-aist/win32/OpenRTM-aist/installer/
Modified:
trunk/OpenRTM-aist/configure.ac
trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
trunk/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/ext/Makefile.am
trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
trunk/OpenRTM-aist/utils/rtcd/Makefile.am
trunk/OpenRTM-aist/utils/rtcprof/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/bin/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/docs/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/utils/rtc-template/Makefile.am
Log:
[compat,->RELENG_1_2] Installer creation process has been deleted. refs #3436
Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/configure.ac 2016-12-06 08:33:15 UTC (rev 2809)
@@ -1712,8 +1712,6 @@
win32/OpenRTM-aist/rtm/ext/Makefile
win32/OpenRTM-aist/rtm/idl/Makefile
win32/OpenRTM-aist/rtm/idl/device_interfaces/Makefile
- win32/OpenRTM-aist/installer/Makefile
- win32/OpenRTM-aist/installer/Bitmaps/Makefile
])
Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -169,15 +169,6 @@
--header $(COIL_H)
qkc -O- -sm $(win32_builddir)/libcoil_vc14.vcxproj
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/../../../build/makewxs.py flist \
- -c COILs \
- -o $(top_srcdir)/../../../win32/OpenRTM-aist/installer/coils.yaml \
- -p ..\\coil \
- $(COIL_H) $(COIL_SRC)
-dist-hook: lst vcproj wxs
+dist-hook: lst vcproj
Modified: trunk/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/src/lib/rtc/corba/idl/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -189,17 +189,8 @@
--header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc10.vcproj
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLs \
- -o $(win32_builddir)installer/idls.yaml \
- -p ..\\rtm\\idl \
- $(IDL_SOURCES) $(ALL_SRC)
-dist-hook: lst vcproj wxs
+dist-hook: lst vcproj
# Cleanup
clean-local:
Modified: trunk/OpenRTM-aist/src/lib/rtm/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/src/lib/rtm/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -248,20 +248,9 @@
--header $(rtmheader_HEADERS)
qkc -O- -sm $(win32_builddir)/rtm/libRTC_vc14.vcxproj
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Headers \
- -o $(win32_builddir)installer/headers.yaml \
- -p ..\\rtm \
- *.h version.txt
+dist-hook: lst vcproj
-
-dist-hook: lst vcproj wxs
-
clean-local:
rm -f config_rtc.h.org
rm -f *~ Makefile.old *core
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -285,18 +285,8 @@
qkc -O- -sm $(win32_builddir)/rtm/ext/librtmCamera_vc14.vcxproj
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLs \
- -o $(win32_builddir)installer/idls.yaml \
- -p ..\\rtm\\idl \
- $(IDL_SOURCES) $(ALL_SRC)
+dist-hook: lst vcproj
-dist-hook: lst vcproj wxs
-
# Cleanup
clean-local:
rm -f $(ALL_SRC) *~ *.core *.lst Makefile.old *.h *.c
Modified: trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/src/lib/rtm/idl/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -285,18 +285,10 @@
--source $(SKEL_CPP) \
--header $(SKEL_H)
qkc -O- -sm $(win32_builddir)/rtm/idl/libRTCSkel_vc14.vcxproj
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLs \
- -o $(win32_builddir)installer/idls.yaml \
- -p ..\\rtm\\idl \
- $(IDL_SOURCES) $(ALL_SRC)
-dist-hook: lst vcproj wxs
+dist-hook: lst vcproj
+
# Cleanup
clean-local:
rm -f $(ALL_SRC) *~ *.core *.lst Makefile.old *.h *.c
Modified: trunk/OpenRTM-aist/utils/rtcd/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtcd/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/utils/rtcd/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -93,17 +93,8 @@
--yaml rtcd.yaml \
--source $(rtcd_SOURCES)
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Rtcd \
- -o $(win32_builddir)installer/rtcd.yaml \
- -p ..\\bin \
- $(bin_PROGRAMS).exe
-dist-hook: lst vcproj wxs
+dist-hook: lst vcproj
clean-local:
rm -rf rtcd
Modified: trunk/OpenRTM-aist/utils/rtcprof/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/utils/rtcprof/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/utils/rtcprof/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -93,17 +93,8 @@
--yaml rtcprof.yaml \
--source $(rtcprof_SOURCES)
-#------------------------------------------------------------
-# for wxs file
-#------------------------------------------------------------
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Rtcprof \
- -o $(win32_builddir)installer/rtcprof.yaml \
- -p ..\\bin \
- $(bin_PROGRAMS).exe
-dist-hook: lst vcproj wxs
+dist-hook: lst vcproj
clean-local:
rm -rf rtcprof *.o *~ *core .libs *.lst
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -4,7 +4,7 @@
##
## $Id$
##---------------------------------------------------------------------------
-SUBDIRS = bin etc cmake build docs examples ext utils coil rtm installer .
+SUBDIRS = bin etc cmake build docs examples ext utils coil rtm .
clean-local:
@@ -103,9 +103,6 @@
EXTRA_DIST = \
OpenRTM-aist.sln.dep \
- autobuild_vc8.bat \
- autobuild_vc9.bat \
- autobuild_vc10.bat \
coil_distbuild.vsprops \
coil_config.vsprops \
rtm_distbuild.vsprops \
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc10.bat 2016-12-06 08:33:15 UTC (rev 2809)
@@ -1,73 +0,0 @@
- at rem
- at rem @brief Visual Studio automatic build script
- at rem @date $Date: 2008-03-06 06:55:42 $
- at rem @author Norkai Ando <n-ando at aist.go.jp>
- at rem
- at rem Copyright (C) 2008-2010
- at rem Noriaki Ando
- at rem Task-intelligence Research Group,
- at rem Intelligent Systems Research Institute,
- at rem National Institute of
- at rem Advanced Industrial Science and Technology (AIST), Japan
- at rem All rights reserved.
- at rem
- at rem $Id: autobuild_vc10.bat 726 2008-05-14 03:05:42Z n-ando $
- at rem
-
- at rem ------------------------------------------------------------
- at rem Notice:
- at rem omniORB should be under the following OMNI_ROOT directory.
- at rem RTSE should be under the following OMNI_ROOT directory.
- at rem ------------------------------------------------------------
- at set RTM_ROOT=%~dp0
- at set PATH="C:\Program Files\Microsoft Visual Studio 10.0\Common7\IDE\";"C:\Program Files\Microsoft Visual Studio 10.0\VC\BIN";"c:\WINDOWS\Microsoft.NET\Framework\v4.0.30319";"C:\Program Files\Microsoft Visual Studio 10.0\VC\vcpackages";%PATH%
- at set OMNI_ROOT=C:\distribution\omniORB-4.1.5_vc10
- at set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
- at set VC_VERSION=Visual C++ 2010
- at set OPENCV_ROOT=C:\distribution\OpenCV2.3
- at set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
- at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
-
- at rem ============================================================
- at rem copy property sheet
- at rem ============================================================
-copy etc\rtm_config_omni415.vsprops rtm_config.vsprops
-copy etc\rtm_config_omni415.props rtm_config.props
-copy etc\rtm_config_omni415.props examples\USBCamera\rtm_config.props
-copy coil_config.props examples\USBCamera\coil_config.props
-
- at rem ============================================================
- at rem convert property sheet to cmake
- at rem ============================================================
-set TMP_PYTHONPATH=%PYTHONPATH%
-set PYTHONPATH=./bin;%PYTHONPATH%
-
-echo Generating rtm_config.cmake file
-build\vsprops2cmake.py rtm_config.vsprops
-move rtm_config.cmake cmake
-
-echo Generating OpenRTMConfig.cmake file
-build\cmakeconfgen.py rtm_config.vsprops
-move OpenRTMConfig.cmake cmake
-
-set PYTHONPATH=%TMP_PYTHONPATH%
-
- at rem ============================================================
- at rem build OpenRTM-aist
- at rem ============================================================
-
-msbuild /M:2 /t:rebuild /p:configuration=debug OpenRTM-aist_vc10.sln
-msbuild /M:2 /t:rebuild /p:configuration=release OpenRTM-aist_vc10.sln
-
- at rem ============================================================
- at rem build OpenCV-RTC
- at rem ============================================================
-
-cd %OPENCV_RTC_ROOT%
-call build_vc10.bat
-cd %RTM_ROOT%
-
-cd installer
-call autowix_vc10.cmd
-cd ..
-
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc8.bat 2016-12-06 08:33:15 UTC (rev 2809)
@@ -1,69 +0,0 @@
- at rem
- at rem @brief Visual Studio automatic build script
- at rem @date $Date: 2008-03-06 06:55:42 $
- at rem @author Norkai Ando <n-ando at aist.go.jp>
- at rem
- at rem Copyright (C) 2008-2010
- at rem Noriaki Ando
- at rem Task-intelligence Research Group,
- at rem Intelligent Systems Research Institute,
- at rem National Institute of
- at rem Advanced Industrial Science and Technology (AIST), Japan
- at rem All rights reserved.
- at rem
- at rem $Id$
- at rem
-
- at rem ------------------------------------------------------------
- at rem Notice:
- at rem omniORB should be under the following OMNI_ROOT directory.
- at rem RTSE should be under the following OMNI_ROOT directory.
- at rem ------------------------------------------------------------
- at set RTM_ROOT=%~dp0
- at set PATH="C:\Program Files\Microsoft Visual Studio 8\VC\vcpackages";%PATH%
- at set OMNI_ROOT=C:\distribution\omniORB-4.1.4_vc8
- at set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
- at set VC_VERSION=Visual C++ 2005
- at set OPENCV_ROOT=C:\distribution\OpenCV2.1
- at set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
- at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
-
- at rem ============================================================
- at rem copy property sheet
- at rem ============================================================
-copy etc\rtm_config_omni414.vsprops rtm_config.vsprops
-
- at rem ============================================================
- at rem convert property sheet to cmake
- at rem ============================================================
-set TMP_PYTHONPATH=%PYTHONPATH%
-set PYTHONPATH=./bin;%PYTHONPATH%
-
-echo Generating rtm_config.cmake file
-build\vsprops2cmake.py rtm_config.vsprops
-move rtm_config.cmake cmake
-
-echo Generating OpenRTMConfig.cmake file
-build\cmakeconfgen.py rtm_config.vsprops
-move OpenRTMConfig.cmake cmake
-
-set PYTHONPATH=%TMP_PYTHONPATH%
-
- at rem ============================================================
- at rem build OpenRTM-aist
- at rem ============================================================
-
-vcbuild /M2 /rebuild OpenRTM-aist_vc8.sln
-
- at rem ============================================================
- at rem build OpenCV-RTC
- at rem ============================================================
-
-cd %OPENCV_RTC_ROOT%
-call copyprops.bat
-vcbuild /M2 /rebuild OpenCV-RTC_vc8.sln
-cd %RTM_ROOT%
-
-cd installer
-call autowix.cmd
-cd ..
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/autobuild_vc9.bat 2016-12-06 08:33:15 UTC (rev 2809)
@@ -1,70 +0,0 @@
- at rem
- at rem @brief Visual Studio automatic build script
- at rem @date $Date: 2008-03-06 06:55:42 $
- at rem @author Norkai Ando <n-ando at aist.go.jp>
- at rem
- at rem Copyright (C) 2008-2010
- at rem Noriaki Ando
- at rem Task-intelligence Research Group,
- at rem Intelligent Systems Research Institute,
- at rem National Institute of
- at rem Advanced Industrial Science and Technology (AIST), Japan
- at rem All rights reserved.
- at rem
- at rem $Id: autobuild_vc8.bat 726 2008-05-14 03:05:42Z n-ando $
- at rem
-
- at rem ------------------------------------------------------------
- at rem Notice:
- at rem omniORB should be under the following OMNI_ROOT directory.
- at rem RTSE should be under the following OMNI_ROOT directory.
- at rem ------------------------------------------------------------
- at set RTM_ROOT=%~dp0
- at set PATH="C:\Program Files\Microsoft Visual Studio 9.0\VC\vcpackages";%PATH%
- at set OMNI_ROOT=C:\distribution\omniORB-4.1.4
- at set RTSE_ROOT=C:\distribution\OpenRTP\RTSystemEditor
- at set VC_VERSION=Visual C++ 2008
- at set OPENCV_ROOT=C:\distribution\OpenCV2.1
- at set OPENCV_RTC_ROOT=C:\distribution\ImageProcessing\opencv
- at set BOOST_ROOT=C:\Program Files\boost\boost_1_47
-
- at rem ============================================================
- at rem copy property sheet
- at rem ============================================================
-copy etc\rtm_config_omni414.vsprops rtm_config.vsprops
-
- at rem ============================================================
- at rem convert property sheet to cmake
- at rem ============================================================
-set TMP_PYTHONPATH=%PYTHONPATH%
-set PYTHONPATH=./bin;%PYTHONPATH%
-
-echo Generating rtm_config.cmake file
-build\vsprops2cmake.py rtm_config.vsprops
-move rtm_config.cmake cmake
-
-echo Generating OpenRTMConfig.cmake file
-build\cmakeconfgen.py rtm_config.vsprops
-move OpenRTMConfig.cmake cmake
-
-set PYTHONPATH=%TMP_PYTHONPATH%
-
- at rem ============================================================
- at rem build OpenRTM-aist
- at rem ============================================================
-
-vcbuild /M2 /rebuild OpenRTM-aist_vc9.sln
-
- at rem ============================================================
- at rem build OpenCV-RTC
- at rem ============================================================
-
-cd %OPENCV_RTC_ROOT%
-call copyprops.bat
-vcbuild /M2 /rebuild OpenCV-RTC_vc9.sln
-cd %RTM_ROOT%
-
-cd installer
-call autowix.cmd
-cd ..
-
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/bin/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/bin/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/bin/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -6,16 +6,6 @@
##---------------------------------------------------------------------------
VER = $(RTM_SHORT_VERSION)
-WINLIBS = libRTCSkel.lib \
- libRTCSkeld.lib \
- RTC$(VER).l\ib \
- RTC$(VER)d.lib \
- RTC$(VER).dll \
- RTC$(VER)d.dll \
- coil$(VER).lib \
- coil$(VER)d.lib \
- coil$(VER).dll \
- coil$(VER)d.dll
clean-local:
rm -f *~ *.dll *.lib *.exe
@@ -25,19 +15,8 @@
cp -p $(top_srcdir)/build/*.py .
cp -p $(top_srcdir)/utils/rtm-skelwrapper/*.py .
cp -p $(top_srcdir)/utils/rtm-skelwrapper/rtm-skelwrapper rtm-skelwrapper.py
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Libs \
- -o ../installer/libs.yaml \
- -p ..\\bin \
- $(WINLIBS)
- $(top_srcdir)/build/makewxs.py flist \
- -c Bin \
- -o ../installer/bin.yaml \
- -p ..\\bin \
- *.py *.bat rtc.conf $(WINLIBS)
-dist-hook: clean-local copy_scripts wxs
+dist-hook: clean-local copy_scripts
EXTRA_DIST = \
rtm-naming.bat \
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/cmake/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -71,13 +71,10 @@
rm -f OpenRTMConfig.cmake FindOpenRTM.cmake
rm -rf *~
-wxs:
- cp -p cmake.yaml ../installer/cmake.yaml
-
FindOpenRTM.cmake:
cp $(top_srcdir)/utils/cmake/FindOpenRTM.cmake .
-dist-hook: clean-local FindOpenRTM.cmake wxs
+dist-hook: clean-local FindOpenRTM.cmake
EXTRA_DIST = \
FindOpenRTM.cmake \
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/docs/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/docs/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/docs/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -17,29 +17,7 @@
IDLReference-en:
cp -p -r $(top_srcdir)/docs/IDLReference-en .
-wxs:
- $(top_srcdir)/build/makewxs.py flist \
- -c Classref_jp \
- -o ../installer/classref_jp.yaml \
- -p ..\\docs\\ClassReference\\html \
- ./ClassReference/html/*
- $(top_srcdir)/build/makewxs.py flist \
- -c Classref_en \
- -o ../installer/classref_en.yaml \
- -p ..\\docs\\ClassReference-en\\html \
- ./ClassReference-en/html/*
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLref_jp \
- -o ../installer/idlref_jp.yaml \
- -p ..\\docs\\IDLReference\\html \
- ./IDLReference/html/*
- $(top_srcdir)/build/makewxs.py flist \
- -c IDLref_en \
- -o ../installer/idlref_en.yaml \
- -p ..\\docs\\IDLReference-en\\html \
- ./IDLReference-en/html/*
-
clean-local:
rm -rf *~ ClassReference ClassReference-en IDLReference IDLReference-en
-dist-hook: clean-local ClassReference ClassReference-en IDLReference IDLReference-en wxs
+dist-hook: clean-local ClassReference ClassReference-en IDLReference IDLReference-en
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -11,11 +11,8 @@
rtc.conf.sample:
cp -p $(top_srcdir)/etc/rtc.conf.sample .
-wxs:
- cp -p etc.yaml ../installer/etc.yaml
+dist-hook: clean-local rtc.conf.sample
-dist-hook: clean-local rtc.conf.sample wxs
-
EXTRA_DIST = \
rtc.conf.sample \
etc.yaml
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/examples/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -6,12 +6,9 @@
##---------------------------------------------------------------------------
SUBDIRS = Composite ConfigSample ExtTrigger LTTSample SimpleIO SeqIO SimpleService USBCamera .
-wxs:
- cp -p *.yaml ../installer/
-
clean-local:
rm -f *~
-dist-hook: clean-local wxs
+dist-hook: clean-local
EXTRA_DIST = example.yaml lttsample.yaml
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/ec/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -6,13 +6,10 @@
##---------------------------------------------------------------------------
SUBDIRS = logical_time .
-wxs:
- cp -p logical_time.yaml ../../installer
-
clean-local:
rm -f *~
-dist-hook: clean-local wxs
+dist-hook: clean-local
EXTRA_DIST = logical_time.yaml
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/local_service/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -9,12 +9,9 @@
SUBDIRS = nameservice_file
-wxs:
- cp -p nameservice_file.yaml ../../installer/
-
clean-local:
rm -f *~
-dist-hook: clean-local wxs
+dist-hook: clean-local
-EXTRA_DIST = nameservice_file.yaml
\ No newline at end of file
+EXTRA_DIST = nameservice_file.yaml
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/ext/sdo/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -6,12 +6,9 @@
##---------------------------------------------------------------------------
SUBDIRS = observer .
-wxs:
- cp -p sdo.yaml ../../installer/
-
clean-local:
rm -f *~
-dist-hook: clean-local wxs
+dist-hook: clean-local
EXTRA_DIST = sdo.yaml
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/utils/rtc-template/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/utils/rtc-template/Makefile.am 2016-12-05 01:58:17 UTC (rev 2808)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/utils/rtc-template/Makefile.am 2016-12-06 08:33:15 UTC (rev 2809)
@@ -12,11 +12,4 @@
cp -p $(top_srcdir)/utils/rtc-template/rtc-template rtc-template.py
cp -p $(top_srcdir)/utils/rtc-template/*.py .
-wxs: src
- $(top_srcdir)/build/makewxs.py flist \
- -c RtcTemplate \
- -o ../../installer/rtctemplate.yaml \
- -p ..\\utils\\rtc-template \
- *.py
-
-dist-hook: clean-local src wxs
+dist-hook: clean-local src
More information about the openrtm-commit
mailing list