[openrtm-commit:01352] r2530 - in trunk/OpenRTM-aist/win32/OpenRTM-aist: . etc
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2014年 3月 15日 (土) 01:29:23 JST
Author: n-ando
Date: 2014-03-15 01:29:23 +0900 (Sat, 15 Mar 2014)
New Revision: 2530
Added:
trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Removed:
trunk/OpenRTM-aist/win32/OpenRTM-aist/RunAtFirst.py
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni407.vsprops
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni412.vsprops
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni407.vsprops
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni412.vsprops
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops
Modified:
trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.props
trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.vsprops
Log:
[compat,build,->RELENG_1_1] Build batch-file has been updated, Property sheets updated and unused them have been deleted. refs #3042
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/Makefile.am 2014-03-14 16:29:23 UTC (rev 2530)
@@ -16,14 +16,14 @@
rm -f coil_config.props
-sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln
+sln: OpenRTM-aist_vc8.sln OpenRTM-aist_vc9.sln OpenRTM-aist_vc10.sln OpenRTM-aist_vc11.sln OpenRTM-aist_vc12.sln
OpenRTM-aist_vc8.sln: OpenRTM-aist.sln.dep
$(top_srcdir)/build/slntool.py \
--vcversion VC8 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc8.sln \
- `find ./ -name '*_vc8.vcproj' \! -name 'USB*.vcproj'`
+ `find ./ -name '*_vc8.vcproj' \! -name 'USB*.vcproj' \! -name 'LTT*.vcproj' \! -name 'LogicalTime*.vcproj' \! -name 'FileName*.vcproj'`
qkc -ms OpenRTM-aist_vc8.sln
OpenRTM-aist_vc9.sln:
@@ -31,7 +31,7 @@
--vcversion VC9 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc9.sln \
- `find ./ -name '*_vc9.vcproj' \! -name 'USB*.vcproj'`
+ `find ./ -name '*_vc9.vcproj' \! -name 'USB*.vcproj' \! -name 'LTT*.vcproj' \! -name 'LogicalTime*.vcproj' \! -name 'FileName*.vcproj'`
qkc -ms OpenRTM-aist_vc9.sln
OpenRTM-aist_vc10.sln:
@@ -39,9 +39,25 @@
--vcversion VC10 \
--dep OpenRTM-aist.sln.dep \
--out OpenRTM-aist_vc10.sln \
- `find ./ -name '*_vc10.vcxproj' \! -name 'USB*.vcxproj'`
+ `find ./ -name '*_vc10.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
qkc -ms OpenRTM-aist_vc10.sln
+OpenRTM-aist_vc11.sln:
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC11 \
+ --dep OpenRTM-aist.sln.dep \
+ --out OpenRTM-aist_vc11.sln \
+ `find ./ -name '*_vc11.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ qkc -ms OpenRTM-aist_vc11.sln
+
+OpenRTM-aist_vc12.sln:
+ $(top_srcdir)/build/slntool.py \
+ --vcversion VC12 \
+ --dep OpenRTM-aist.sln.dep \
+ --out OpenRTM-aist_vc12.sln \
+ `find ./ -name '*_vc12.vcxproj' \! -name 'USB*.vcxproj' \! -name 'LTT*.vcxproj' \! -name 'LogicalTime*.vcxproj' \! -name 'FileName*.vcxproj'`
+ qkc -ms OpenRTM-aist_vc12.sln
+
vsprops: coil_distbuild.vsprops coil_config.vsprops coil_distbuild.props coil_config.props
@@ -59,14 +75,18 @@
dist-hook: clean-local sln vsprops
-EXTRA_DIST = \
+EXTRA_DIST = \
OpenRTM-aist.sln.dep \
- RunAtFirst.py \
autobuild_vc8.bat \
autobuild_vc9.bat \
autobuild_vc10.bat \
+ coil_distbuild.vsprops \
+ coil_config.vsprops \
rtm_distbuild.vsprops \
- coil_distbuild.vsprops \
- coil_config.vsprops
+ rtm_config.vsprops \
+ coil_distbuild.props \
+ coil_config.props \
+ rtm_distbuild.props \
+ rtm_config.props
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/RunAtFirst.py
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/RunAtFirst.py 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/RunAtFirst.py 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,486 +0,0 @@
-#!/usr/bin/env python
-
-from Tkinter import *
-from tkFont import *
-import tkMessageBox, os.path, string
-import tkSimpleDialog
-import tkCommonDialog
-import time
-import re
-import thread
-import sys
-
-default_searchdir="C:\\Program Files"
-
-property_sheet=os.path.dirname(sys.argv[0]) + "\\OpenRTM-aist.vsprops"
-
-widlist = ["ace_root", "ace_inc", "ace_lib",
- "omni_root", "omni_bin", "omni_inc", "omni_lib"]
-
-jwin_title = "OpenRTM-aist-win32 ƒrƒ‹ƒhŠÂ‹«Ý’è"
-win_title = "OpenRTM-aist-win32 Build Environment Setting"
-
-jexplain = """OpenRTM-aist‚ðƒrƒ‹ƒh‚·‚邽‚ß‚É•K—v‚Ȋ‹«‚ðݒ肵‚Ü‚·B‰º‹L‚Ì€–Ú‚É•K—v‚Èî•ñ‚ð“ü—Í‚µ‚ÄAƒvƒƒpƒeƒBƒV[ƒg¶¬ƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B"""
-
-explain = """Setting up OpenRTM-aist build environment. Please input information to the following forms, and push Generate button to generate property sheet"""
-
-jsearch_expln = """Ž©“®“I‚ÉŒŸõ‚·‚邱‚Æ‚à‚Å‚«‚Ü‚·BŒŸõ‚·‚éƒfƒBƒŒƒNƒgƒŠ‚ð“ü—Í‚µ‚ÄuŒŸõvƒ{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B
-ŒŸõ‚É‚Í”•ª‚©‚©‚邱‚Æ‚ª‚ ‚è‚Ü‚·B"""
-search_expln = """Automatic search. Input search directory and push [Search] button.
-It may take a few minutes."""
-
-jsearch_dir = "ŒŸõƒfƒBƒŒƒNƒgƒŠ"
-search_dir = "Search Directory"
-
-jsbutton="ŒŸõ"
-sbutton="Search"
-
-jdirname_error="ƒfƒBƒŒƒNƒgƒŠ‚ªŒ©‚‚©‚è‚Ü‚¹‚ñB"
-dirname_error="DIrectory not found."
-
-
-entries = {
- "ace_root" : \
- {"label": "ACE directory",
- "expln": "The ACE_wrapper directory a.k.a ACE_ROOT directory."},
- "ace_inc" : \
- {"label": "ACE include directory",
- "expln": "The directory in which ace/ACE.h exists."},
- "ace_lib" : \
- {"label": "ACE lib directory",
- "expln": "The directory in which ACE.LIB exists."},
- "omni_root": \
- {"label": "omniORB directory",
- "expln": "The omniORB directory in which bin, include, lib dirs exist."},
- "omni_bin" : \
- {"label": "omniORB bin directory",
- "expln": "The directory in which omniidl exists."},
- "omni_inc" : \
- {"label": "omniORB include directory",
- "expln": "The directory in which omniORB4/CORBA.h exists"},
- "omni_lib" : \
- {"label": "omniORB lib directory",
- "expln": "The directory in wihch omniORB407_rt.lib exists."}
- }
-
-jentries = {
- "ace_root" : \
- {"label": "ACEƒfƒBƒŒƒNƒgƒŠ",
- "expln": "’Êí‚ÍACE_wrapperƒfƒBƒŒƒNƒgƒŠ‚̈ʒu‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "ace_inc" : \
- {"label": "ACE include ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "ace/ACE.h‚ª‚ ‚éƒfƒBƒŒƒNƒgƒŠ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "ace_lib" : \
- {"label": "ACE lib ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "ACE.LIB‚ª‚ ‚éꊂðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "omni_root": \
- {"label": "omniORBƒfƒBƒŒƒNƒgƒŠ",
- "expln": "omniORB‚̃fƒBƒŒƒNƒgƒŠ(‰º‚Ébin, include, lib‚ª‚ ‚é)‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "omni_bin" : \
- {"label": "omniORB bin ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "omniidl‚ª‚ ‚éƒfƒBƒŒƒNƒgƒŠ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "omni_inc" : \
- {"label": "omniORB include ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "omniORB4/CORBA.h‚ª‚ ‚éƒfƒBƒŒƒNƒgƒŠ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"},
- "omni_lib" : \
- {"label": "omniORB lib ƒfƒBƒŒƒNƒgƒŠ",
- "expln": "omniORB407_rt.lib‚È‚Ç‚ª‚ ‚éƒfƒBƒŒƒNƒgƒŠ‚ðŽw’肵‚Ä‚‚¾‚³‚¢B"}
- }
-
-
-jgbutton="¶¬"
-gbutton="Generate"
-
-jgen_label="ƒvƒƒpƒeƒBƒV[ƒg:"
-gen_label="Property Sheet:"
-
-jgen_expln = """OpenRTM-aistƒ\[ƒXƒfƒBƒŒƒNƒgƒŠ‚̉º‚ÉOpenRTM-aist.vsprops‚Æ‚¢‚¤ƒtƒ@ƒCƒ‹–¼‚ŃvƒƒpƒeƒBƒV[ƒg‚𶬂·‚é•K—v‚ª‚ ‚è‚Ü‚·BACE‚âomniORB‚ÌŠeŽíƒpƒX‚¨‚æ‚уvƒƒpƒeƒBƒV[ƒg‚̃fƒBƒŒƒNƒgƒŠ‚ª³‚µ‚¯‚ê‚欃{ƒ^ƒ“‚ð‰Ÿ‚µ‚Ä‚‚¾‚³‚¢B"""
-
-gen_expln = """Property sheet named OpenRTM-aist.vsprops should exist under OpenRTM-aist source directory. Please confirm directories of ACE, omniORB and property sheet and push Generate button."""
-
-prop_sheet = """<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-0.4"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=""$(SolutionDir)";"$(SolutionDir)\\rtm\idl";"$(ace_include)";"$(omni_include)";.;..\..;..;..\..\.."
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories=""$(SolutionDir)\\bin";"$(ace_libdir)";"$(omni_libdir)""
- />
- <UserMacro
- Name="ace_root"
- Value="%s"
- />
- <UserMacro
- Name="omni_root"
- Value="%s"
- />
- <UserMacro
- Name="rtm_root"
- Value="$(SolutionDir)"
- />
- <UserMacro
- Name="ace_include"
- Value="%s"
- />
- <UserMacro
- Name="ace_libdir"
- Value="%s"
- />
- <UserMacro
- Name="omni_include"
- Value="%s"
- />
- <UserMacro
- Name="omni_libdir"
- Value="%s"
- />
- <UserMacro
- Name="omni_bin"
- Value="%s"
- />
- <UserMacro
- Name="rtm_includes"
- Value="$(SolutionDir);$(SolutionDir)\\rtm\idl;$(ace_include);$(omni_include);.;..\..\\"
- />
- <UserMacro
- Name="rtm_libdir"
- Value="$(SolutionDir)\\bin;$(ace_libdir);$(omni_libdir);."
- />
- <UserMacro
- Name="rtm_path"
- Value="$(SolutionDir)\\bin;$(SolutionDir)\\build;"$(omni_bin)""
- />
-</VisualStudioPropertySheet>
-"""
-
-jisdir_error = "“¯–¼‚̃fƒBƒŒƒNƒgƒŠ‚ª‘¶Ý‚µ‚Ü‚·B "
-isdir_error = "The Directory of a same name exists. "
-
-jfile_exists = "ƒtƒ@ƒCƒ‹‚ª‘¶Ý‚µ‚Ü‚·Bã‘‚«‚µ‚Ü‚·‚©H "
-file_exists = "The file already exists. Overwrite? "
-
-jfile_gened = "ƒtƒ@ƒCƒ‹‚𶬂µ‚Ü‚µ‚½B"
-file_gened = "File generated."
-
-
-def search(path, fnames, results):
- try:
- flist = os.listdir(path)
- except:
- return
-
- mp = []
- for fn in fnames:
- mp.append(re.compile(fn))
-
- for f in flist:
- fullpath = path + "/" + f
- if os.path.isfile(fullpath):
-# for fname in fnames:
-# if f == fname:
-# results[fname] = fullpath
- i = 0
- for m in mp:
- if m.match(f):
- results[fnames[i]] = fullpath
- i += 1
- elif os.path.isdir(fullpath):
- res = search(fullpath, fnames, results)
- return
-
-
-def j(str, encoding="cp932"):
- return unicode(str, encoding).encode("utf8")
-
-
-
-class App(Frame):
- def init(self):
- self.setlang()
- self.width=512
-
- self.f8 = Font(weight=NORMAL, family="", size=8)
- self.f9 = Font(weight=NORMAL, family="", size=9)
- self.f10 = Font(weight=NORMAL, family="", size=10)
- self.f11 = Font(weight=NORMAL, family="", size=11)
-
- self.master.title(self.win_title)
-
- f = Frame()
-
- # à–¾
- self.expw = Label(f, text=self.explain, font=self.f11, \
- justify=LEFT, wraplength=self.width)
- self.expw.pack(side=TOP, anchor=W, padx=3, pady=3)
-
- self.search_frame(f)
- self.entries_frame(f)
- self.gen_frame(f)
- f.pack(side=TOP, anchor=E, pady=5)
-
- def setlang(self):
- if time.tzname[0].find("“Œ‹ž") or time.tzname[0].find("JST"):
- self.ent = jentries
- self.win_title = j(jwin_title)
- self.explain = j(jexplain)
- self.search_expln = j(jsearch_expln)
- self.search_dir = j(jsearch_dir)
- self.search_button = j(jsbutton)
- self.gen_button = j(jgbutton)
- self.dirname_error=j(jdirname_error)
- self.gen_label = j(jgen_label)
- self.gen_expln = j(jgen_expln)
- self.isdir_error = j(jisdir_error)
- self.file_exists = j(jfile_exists)
- self.file_gened = j(jfile_gened)
- else:
- self.ent = entries
- self.win_title = win_title
- self.explain = explain
- self.search_expln = search_expln
- self.search_dir = search_dir
- self.search_button = sbutton
- self.gen_button = gbutton
- self.dirname_error=dirname_error
- self.gen_label = gen_label
- self.gen_expln = gen_expln
- self.isdir_error = isdir_error
- self.file_exists = file_exists
- self.file_gened = file_gened
-
- def search_frame(self, f):
- frame = Frame(f, relief=Tkinter.GROOVE, bd=2)
- dummyw = Frame(frame, width=self.width)
- dummyw.pack(side=TOP)
- frame.pack(side=TOP)
- # Ž©“®ŒŸõ‚Ìà–¾
- self.search_explnw = Label(frame, text=self.search_expln, \
- wraplength=self.width, justify=LEFT,\
- font=self.f11)
- self.search_explnw.pack(side=TOP, anchor=W, padx=0)
-
- f1 = Frame(frame, width=self.width)
- f1.pack(side=TOP)
-
- self.search_labelw = Label(f1, text=self.search_dir, font=self.f11)
- self.search_labelw.pack(side=LEFT, anchor=W)
- self.search_dirw = Entry(f1, width=40, font=self.f11)
- self.search_dirw.delete(0)
- self.search_dirw.insert(0, default_searchdir)
- self.search_dirw.pack(side=LEFT, anchor=W, padx=5, pady=5)
- self.search_button = Button(f1, text=self.search_button,
- command=self.search, font=self.f10)
- self.search_button.pack(side=LEFT, anchor=W, padx=10, pady=5)
- f1.pack(side=TOP, anchor=W)
-
- def entries_frame(self, f):
- frame = Frame(f, relief=GROOVE, bd=2)
- dummyw = Frame(frame, width=self.width)
- dummyw.pack(side=TOP)
- frame.pack(side=TOP)
- for w in widlist:
- self.ent[w]["wid"] = Label(frame, text=j(self.ent[w]["label"]), \
- font=self.f11, wraplength='10c')
- self.ent[w]["wid"].pack(side=TOP, anchor=W, padx=10)
- self.ent[w]["wid"] = Label(frame, text=j(self.ent[w]["expln"]), \
- font=self.f9, wraplength='10c')
- self.ent[w]["wid"].pack(side=TOP, anchor=W, padx=10)
- self.ent[w]["wid"] = Entry(frame, width=80, font=self.f9)
- self.ent[w]["wid"].pack(side=TOP, anchor=NW, padx=10, pady=5)
-
- def gen_frame(self, f):
- frame = Frame(f, relief=Tkinter.GROOVE, bd=2)
- dummyw = Frame(frame, width=self.width)
- dummyw.pack(side=TOP)
- frame.pack(side=TOP)
-
- self.gen_expw = Label(frame, text=self.gen_expln, \
- wraplength=self.width, justify=LEFT,\
- font=self.f11)
- self.gen_expw.pack(side=TOP, anchor=W, padx=0)
-
- f1 = Frame(frame)
- self.gen_labelw = Label(f1, text=self.gen_label, font=self.f11)
- self.gen_labelw.pack(side=LEFT, anchor=W, padx=3, pady=3)
- self.gen_entryw = Entry(f1, width=40, \
- text="OpenRTM-aist.vsprops", font=self.f11)
- self.gen_entryw.insert(0, property_sheet)
- self.gen_entryw.pack(side=LEFT, anchor=W, padx=5, pady=5)
- self.gbuttonw = Button(f1, text=self.gen_button, font=self.f10,
- command=self.generate)
- self.gbuttonw.pack(side=LEFT, anchor=W, padx=3, pady=3)
- f1.pack(side=TOP, anchor=W)
-
-
- def quit(self):
- self.master.destroy()
-
- def generate(self):
- ace_inc = self.ent["ace_inc"]["wid"].get()
- ace_lib = self.ent["ace_lib"]["wid"].get()
- ace_dirs = [ace_inc, ace_lib]
-
- omni_bin = self.ent["omni_bin"]["wid"].get()
- omni_inc = self.ent["omni_inc"]["wid"].get()
- omni_lib = self.ent["omni_lib"]["wid"].get()
- omni_dirs = [omni_bin, omni_inc, omni_lib]
-
- ace_root, ace_paths = self.common_path(ace_dirs)
- omni_root, omni_paths = self.common_path(omni_dirs)
-
- print ace_paths
- print ace_root
- print ace_inc
- if ace_paths[0] == "/" and ace_paths[1] == "/lib/":
- ace_inc = "$(ace_root)"
- ace_lib = "$(ace_root)/lib"
-
- if omni_paths[0] == "/bin/x86_win32/" and \
- omni_paths[1] == "/include/" and \
- omni_paths[2] == "/lib/x86_win32/" :
- omni_bin = "$(omni_root)/bin/x86_win32"
- omni_inc = "$(omni_root)/include"
- omni_lib = "$(omni_root)/lib/x86_win32"
-
- ace_root = re.sub("/", "\\\\", ace_root)
- omni_root = re.sub("/", "\\\\", omni_root)
- ace_inc = re.sub("/", "\\\\", ace_inc)
- ace_lib = re.sub("/", "\\\\", ace_lib)
- omni_bin = re.sub("/", "\\\\", omni_bin)
- omni_inc = re.sub("/", "\\\\", omni_inc)
- omni_lib = re.sub("/", "\\\\", omni_lib)
-
- fname = self.gen_entryw.get()
-
- if os.path.isdir(fname):
- tkMessageBox.showerror(title=self.isdir_error,
- message=self.isdir_error + fname)
- return
-
- if os.path.isfile(fname):
- if not tkMessageBox.askyesno(title=self.file_exists,
- message=self.file_exists + fname):
- return
-
- f = open(fname, "w")
- f.write(prop_sheet % \
- (ace_root, omni_root, \
- ace_inc, ace_lib, \
- omni_inc, omni_lib, omni_bin))
- f.close()
- tkMessageBox.showinfo(title=self.file_gened,
- message=self.file_gened + fname)
- return
-
- def search(self):
- w = {
- "ACE.h" : ["ace_inc", "ace/ACE.h"],
- "ACE.lib" : ["ace_lib", "ACE.lib"],
- "omniidl.exe" : ["omni_bin", "omniidl.exe"],
- "omniORB.h" : ["omni_inc", "omniORB4/omniORB.h"],
- "omniORB[0-9]+_rt.lib": ["omni_lib", "omniORB[0-9]+_rt.lib"]
- }
- res = {}
- dirname = self.search_dirw.get()
- if os.path.isdir(dirname):
-# th = thread.start_new_thread(search, (dirname, w.keys(), res))
- search(dirname, w.keys(), res)
- else:
- tkMessageBox.showerror(title=self.dirname_error,
- message=self.dirname_error + dirname)
- return
-
- # ŒŸõŒ‹‰Ê‚ðEntry‚ɃZƒbƒg
- for f in w.keys():
- if res.has_key(f):
- l = len(self.ent[w[f][0]]["wid"].get())
- self.ent[w[f][0]]["wid"].delete(0, l)
- t = re.sub(re.compile(w[f][1]), "", res[f])
- self.ent[w[f][0]]["wid"].insert(0, t)
-
- # ŒŸõŒ‹‰Ê‚ðŽæ“¾
- ace_dirs = [
- self.ent["ace_inc"]["wid"].get(),
- self.ent["ace_lib"]["wid"].get()
- ]
-
- omni_dirs = [
- self.ent["omni_bin"]["wid"].get(),
- self.ent["omni_inc"]["wid"].get(),
- self.ent["omni_lib"]["wid"].get()
- ]
-
- # ‹¤’ʃpƒX‚ðŽæ“¾
- ace_root = ""
- if ace_dirs[0] != "" or ace_dirs[1] != "":
- ace_root, ace_paths = self.common_path(ace_dirs)
-
- omni_root = ""
- if omni_dirs[0] != "" or \
- omni_dirs[1] != "" or \
- omni_dirs[2] != "":
- omni_root, omni_paths = self.common_path(omni_dirs)
-
-
- if omni_root != "":
- l = len(self.ent["omni_root"]["wid"].get())
- self.ent["omni_root"]["wid"].delete(0, l)
- self.ent["omni_root"]["wid"].insert(0, omni_root)
-
- # ACE_ROOT, OMNI_ROOT‚ðEntry‚ɃZƒbƒg
- if ace_root != "":
- l = len(self.ent["ace_root"]["wid"].get())
- self.ent["ace_root"]["wid"].delete(0, l)
- self.ent["ace_root"]["wid"].insert(0, ace_root)
-
- return
-
-
- def common_path_len(self, plist):
- for i in range(len(plist[0])): # ƒfƒBƒŒƒNƒgƒŠ–¼‚ð”äŠr
- dirname = plist[0][i]
- for j in range(1, len(plist)):
- if dirname != plist[j][i]:
- return i
- return
-
- def common_path_split(self, paths):
- plist = []
- for p in paths:
- plist.append(p.split("/"))
- return plist
-
- def common_path(self, paths):
- plist = self.common_path_split(paths)
- comlen = self.common_path_len(plist)
-
- compath=""
- for i in range(comlen):
- compath += plist[0][i]
- if i != comlen - 1:
- compath += "/"
-
- diff_paths = [""] * len(paths)
- for i in range(len(paths)):
- diff_paths[i] = ""
- for j in range(comlen, len(plist[i])):
- diff_paths[i] += "/" + plist[i][j]
-
- return compath, diff_paths
-
-
-
- def __init__(self, master=None):
- Frame.__init__(self, master)
- self.pack(); self.init()
-
-
-if __name__ == "__main__": app = App(); app.mainloop()
-# end.
-
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/build.bat 2014-03-14 16:29:23 UTC (rev 2530)
@@ -0,0 +1,125 @@
+ at echo off
+ at rem ============================================================
+ at rem OpenRTM-aist for Windows build batch
+ at rem
+ at rem @author Noriaki Ando <n-ando at aist.go.jp>
+ at rem Copyright (C) 2014 n-ando All Rights Reserved
+ at rem
+ at rem In order to compile omniORB on Windows, this batch file can be
+ at rem used with the following prerequisite tools and environments.
+ at rem
+ at rem 0. 64bit Windows 7 or later
+ at rem If you want to compile both 32 bit and 64 bit binaries on one OS,
+ at rem 64 bit OS is required. Because the omniidl which is built as
+ at rem target architecture executable in midstream is required to
+ at rem compile omniORB itself. OS have to execute both (32 bit /64 bit)
+ at rem executable.
+ at rem
+ at rem 1. Cygwin
+ at rem cygwin-lite distributed from omniORB is not recommended.
+ at rem The following command should be installed on Cygwin
+ at rem wget, make, zip, svn
+ at rem
+ at rem 2. Visual C++
+ at rem Currently VC2008, 2010, 2012, 2013 are supported.
+ at rem Different versions in the same machine are not recommended.
+ at rem
+ at rem Environment vairables required
+ at rem
+ at rem OMNIORB_SRC: URL to download omniORB source code tar-ball
+ at rem ARCH: x86 or x86_64
+ at rem VC_VERSION: 9(=VC2008), 10(=VC2010), 11(=VC2012), 12(=VC2013),....
+ at rem PYTHON_DIR: /cygdrive/c/Python27
+ at rem
+ at rem ============================================================
+
+set PATH=%PATH%;C:\cygwin\bin;C:\cygwin64\bin
+set RTM_ROOT=%~dp0
+set COIL_ROOT=%RTM_ROOT%\coil
+set OMNI_ROOT=%RTM_ROOT%\..\omniORB
+ at rem set VC_VERSION=10
+ at rem set ARCH=x86_64
+set PATH=%OMNI_ROOT%\bin\x86_win32;%PATH%
+
+if %ARCH% == x86 set DLL_ARCH=
+if %ARCH% == x86_64 set DLL_ARCH=_x64
+
+set COIL_DLLVER=111_vc%VC_VERSION%%DLL_ARCH%
+set COIL_VERSION=1.1.1
+set COIL_SHORTVER=1.1
+
+set RTM_DLLVER=111_vc%VC_VERSION%%DLL_ARCH%
+set RTM_VERSION=1.1.1
+set RTM_SHORTVER=1.1
+
+set OMNI_DLLVER=417
+set OMNI_VERSION=4.1.7
+set OMNI_SHORTVER=4.1
+set OMNITHREAD_DLLVER=34
+set OMNITHREAD_VERSION=3.4
+
+ at rem ------------------------------------------------------------
+ at rem Printing env variables
+echo Environment variables:
+echo ARCH : %ARCH%
+echo VC_VERSION : %VC_VERSION%
+echo PYTHON_DIR : %PYTHON_DIR%
+
+ at rem ============================================================
+ at rem switching to x86 or x86_64
+ at rem ============================================================
+echo ARCH %ARCH%
+if %ARCH% == x86 goto x86
+if %ARCH% == x86_64 goto x86_64
+goto end
+
+
+ at rem ============================================================
+ at rem Compiling 32bit binaries
+ at rem ============================================================
+:x86
+echo Compiling 32bit binaries
+
+ at rem ------------------------------------------------------------
+ at rem Setting up Visual C++ environment
+echo Setting up Visual C++ environment.
+if %VC_VERSION% == 9 (call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86)
+if %VC_VERSION% == 10 (call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat%" x86)
+if %VC_VERSION% == 11 (call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x86)
+if %VC_VERSION% == 12 (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86)
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+
+ at rem ------------------------------------------------------------
+ at rem Build
+ 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
+
+goto end
+
+ at rem ============================================================
+ at rem Compiling 64bit binaries
+ at rem ============================================================
+:x86_64
+echo Compiling 64bit binaries
+
+ at rem ------------------------------------------------------------
+ at rem Setting up Visual C++ environment
+if /i %VC_VERSION% == 9 (call "C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x64)
+if /i %VC_VERSION% == 10 (call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x64)
+if /i %VC_VERSION% == 11 (call "C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\vcvarsall.bat" x64)
+if /i %VC_VERSION% == 12 (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64)
+echo Visual Studio Dir: %VSINSTALLDIR%
+echo LIB: %LIB%
+
+ at rem ------------------------------------------------------------
+ at rem Build
+ at rem ------------------------------------------------------------
+set VC_VERSION=10_x64
+ at rem msbuild /M:4 /t:build /fileLogger /flp:logfile=debug.log /v:diag /p:configuration=debug /p:platform=x64 OpenRTM-aist_vc10.sln
+msbuild /M:4 /t:build /fileLogger /flp:logfile=release.log /v:diag /p:configuration=release /p:platform=x64 OpenRTM-aist_vc10.sln
+
+goto end
+
+:end
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/Makefile.am 2014-03-14 16:29:23 UTC (rev 2530)
@@ -16,10 +16,6 @@
dist-hook: clean-local rtc.conf.sample wxs
-EXTRA_DIST = \
+EXTRA_DIST = \
rtc.conf.sample \
- etc.yaml \
- rtm_config_omni407.vsprops \
- rtm_config_omni412.vsprops \
- rtm_config_omni414.vsprops \
- rtm_config_omni414.props
+ etc.yaml
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni407.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni407.vsprops 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni407.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.0"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(ace_includes);$(omni_includes);$(rtm_includes)"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(ace_libdir);$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="ace_root"
- Value="%ACE_ROOT%"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="407"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="32"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="coil_dllver"
- Value="100"
- />
- <UserMacro
- Name="coil_version"
- Value="1.0.0"
- />
- <!-- ACE macros -->
- <UserMacro
- Name="ace_includes"
- Value=""$(ace_root)""
- />
- <UserMacro
- Name="ace_libdir"
- Value="$(ace_root)\lib"
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="ACEd.lib RTC$(rtm_dllver)d.lib $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="ACE.lib RTC$(rtm_dllver).lib $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf"
- />
-</VisualStudioPropertySheet>
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni412.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni412.vsprops 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/coil_config_omni412.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.0"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(ace_includes);$(omni_includes);$(rtm_includes)"
- PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(ace_libdir);$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="ace_root"
- Value="%ACE_ROOT%"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="412"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="33"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="coil_dllver"
- Value="100"
- />
- <UserMacro
- Name="coil_version"
- Value="1.0.0"
- />
- <!-- ACE macros -->
- <UserMacro
- Name="ace_includes"
- Value=""$(ace_root)""
- />
- <UserMacro
- Name="ace_libdir"
- Value="$(ace_root)\lib"
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="ACEd.lib RTC$(rtm_dllver)d.lib $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="ACE.lib RTC$(rtm_dllver).lib $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf"
- />
-</VisualStudioPropertySheet>
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni407.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni407.vsprops 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni407.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.0"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes);."
- PreprocessorDefinitions="_WIN32_WINNT=0x0500"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="407"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="32"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="rtm_dllver"
- Value="110"
- />
- <UserMacro
- Name="rtm_version"
- Value="1.1.0"
- />
- <UserMacro
- Name="coil_dllver"
- Value=""
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf"
- />
- <!-- coil macros -->
- <UserMacro
- Name="coil_lib"
- Value="coil$(coil_dllver).lib"
- />
- <UserMacro
- Name="coil_libd"
- Value="coil$(coil_dllver)d.lib"
- />
-
-</VisualStudioPropertySheet>
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni412.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni412.vsprops 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni412.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.0"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes);."
- PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="412"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="33"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="rtm_dllver"
- Value="110"
- />
- <UserMacro
- Name="rtm_version"
- Value="1.1.0"
- />
- <UserMacro
- Name="coil_dllver"
- Value=""
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf"
- />
- <!-- coil macros -->
- <UserMacro
- Name="coil_lib"
- Value="coil$(coil_dllver).lib"
- />
- <UserMacro
- Name="coil_libd"
- Value="coil$(coil_dllver)d.lib"
- />
-
-</VisualStudioPropertySheet>
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.props 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Label="UserMacros">
- <omni_dllver>414</omni_dllver>
- <omnithread_dllver>34</omnithread_dllver>
- <rtm_dllver>110</rtm_dllver>
- <rtm_version>1.1.0</rtm_version>
- <coil_dllver>110</coil_dllver>
- <coil_lib>coil$(coil_dllver).lib</coil_lib>
- <coil_libd>coil$(coil_dllver)d.lib</coil_libd>
- <omni_includes>$(omni_root)\include</omni_includes>
- <omni_libdir>$(omni_root)\lib\x86_win32</omni_libdir>
- <omni_bin>$(omni_root)\bin\x86_win32</omni_bin>
- <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib</omni_lib>
- <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
- <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl</rtm_includes>
- <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
- <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
- <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>
- <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
- <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
- <rtm_idlc>omniidl</rtm_idlc>
- <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>OpenRTM-aist-1.0</_PropertySheetDisplayName>
- </PropertyGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <AdditionalIncludeDirectories>$(omni_includes);$(rtm_includes);.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <AdditionalLibraryDirectories>$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <BuildMacro Include="omni_root">
- <Value>$(omni_root)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_dllver">
- <Value>$(omni_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="omnithread_dllver">
- <Value>$(omnithread_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_root">
- <Value>$(rtm_root)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_dllver">
- <Value>$(rtm_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_version">
- <Value>$(rtm_version)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_dllver">
- <Value>$(coil_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_includes">
- <Value>$(omni_includes)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_libdir">
- <Value>$(omni_libdir)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_bin">
- <Value>$(omni_bin)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_lib">
- <Value>$(omni_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_libd">
- <Value>$(omni_libd)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_includes">
- <Value>$(rtm_includes)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_libdir">
- <Value>$(rtm_libdir)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_bin">
- <Value>$(rtm_bin)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_path">
- <Value>$(rtm_path)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_libd">
- <Value>$(rtm_libd)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_lib">
- <Value>$(rtm_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_idlc">
- <Value>$(rtm_idlc)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_idlflags">
- <Value>$(rtm_idlflags)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_lib">
- <Value>$(coil_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_libd">
- <Value>$(coil_libd)</Value>
- </BuildMacro>
- </ItemGroup>
-</Project>
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni414.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.1"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes);."
- PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="414"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="34"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="rtm_dllver"
- Value="110"
- />
- <UserMacro
- Name="rtm_version"
- Value="1.1.0"
- />
- <UserMacro
- Name="coil_dllver"
- Value="110"
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
- />
- <!-- coil macros -->
- <UserMacro
- Name="coil_lib"
- Value="coil$(coil_dllver).lib"
- />
- <UserMacro
- Name="coil_libd"
- Value="coil$(coil_dllver)d.lib"
- />
-
-</VisualStudioPropertySheet>
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.props 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Label="UserMacros">
- <omni_dllver>415</omni_dllver>
- <omnithread_dllver>34</omnithread_dllver>
- <rtm_dllver>110</rtm_dllver>
- <rtm_version>1.1.0</rtm_version>
- <coil_dllver>110</coil_dllver>
- <coil_lib>coil$(coil_dllver).lib</coil_lib>
- <coil_libd>coil$(coil_dllver)d.lib</coil_libd>
- <omni_includes>$(omni_root)\include</omni_includes>
- <omni_libdir>$(omni_root)\lib\x86_win32</omni_libdir>
- <omni_bin>$(omni_root)\bin\x86_win32</omni_bin>
- <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib</omni_lib>
- <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
- <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl</rtm_includes>
- <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
- <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
- <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>
- <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
- <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
- <rtm_idlc>omniidl</rtm_idlc>
- <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
- </PropertyGroup>
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>OpenRTM-aist-1.0</_PropertySheetDisplayName>
- </PropertyGroup>
- <ItemDefinitionGroup>
- <ClCompile>
- <AdditionalIncludeDirectories>$(omni_includes);$(rtm_includes);.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- <Link>
- <AdditionalLibraryDirectories>$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <BuildMacro Include="omni_root">
- <Value>$(omni_root)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_dllver">
- <Value>$(omni_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="omnithread_dllver">
- <Value>$(omnithread_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_root">
- <Value>$(rtm_root)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_dllver">
- <Value>$(rtm_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_version">
- <Value>$(rtm_version)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_dllver">
- <Value>$(coil_dllver)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_includes">
- <Value>$(omni_includes)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_libdir">
- <Value>$(omni_libdir)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_bin">
- <Value>$(omni_bin)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_lib">
- <Value>$(omni_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="omni_libd">
- <Value>$(omni_libd)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_includes">
- <Value>$(rtm_includes)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_libdir">
- <Value>$(rtm_libdir)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_bin">
- <Value>$(rtm_bin)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_path">
- <Value>$(rtm_path)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_libd">
- <Value>$(rtm_libd)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_lib">
- <Value>$(rtm_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_idlc">
- <Value>$(rtm_idlc)</Value>
- </BuildMacro>
- <BuildMacro Include="rtm_idlflags">
- <Value>$(rtm_idlflags)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_lib">
- <Value>$(coil_lib)</Value>
- </BuildMacro>
- <BuildMacro Include="coil_libd">
- <Value>$(coil_libd)</Value>
- </BuildMacro>
- </ItemGroup>
-</Project>
Deleted: trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/etc/rtm_config_omni415.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="OpenRTM-aist-1.1"
- >
- <Tool
- Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes);."
- PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
- />
- <UserMacro
- Name="omni_root"
- Value="%OMNI_ROOT%"
- />
- <UserMacro
- Name="omni_dllver"
- Value="415"
- />
- <UserMacro
- Name="omnithread_dllver"
- Value="34"
- />
- <UserMacro
- Name="rtm_root"
- Value="%RTM_ROOT%"
- />
- <UserMacro
- Name="rtm_dllver"
- Value="110"
- />
- <UserMacro
- Name="rtm_version"
- Value="1.1.0"
- />
- <UserMacro
- Name="coil_dllver"
- Value="110"
- />
- <!-- omniORB macros -->
- <UserMacro
- Name="omni_includes"
- Value=""$(omni_root)\include""
- />
- <UserMacro
- Name="omni_libdir"
- Value=""$(omni_root)\lib\x86_win32""
- />
- <UserMacro
- Name="omni_bin"
- Value=""$(omni_root)\bin\x86_win32""
- />
- <UserMacro
- Name="omni_lib"
- Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
- />
- <UserMacro
- Name="omni_libd"
- Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
- />
- <!-- OpenRTM-aist macros -->
- <UserMacro
- Name="rtm_includes"
- Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
- />
- <UserMacro
- Name="rtm_libdir"
- Value=""$(rtm_root)\bin""
- />
- <UserMacro
- Name="rtm_bin"
- Value=""$(rtm_root)\bin";"$(rtm_root)\build""
- />
- <UserMacro
- Name="rtm_path"
- Value="$(rtm_bin);$(omni_bin)"
- />
- <UserMacro
- Name="rtm_libd"
- Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
- />
- <UserMacro
- Name="rtm_lib"
- Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
- />
- <UserMacro
- Name="rtm_idlc"
- Value="omniidl"
- />
- <UserMacro
- Name="rtm_idlflags"
- Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
- />
- <!-- coil macros -->
- <UserMacro
- Name="coil_lib"
- Value="coil$(coil_dllver).lib"
- />
- <UserMacro
- Name="coil_libd"
- Value="coil$(coil_dllver)d.lib"
- />
-
-</VisualStudioPropertySheet>
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props 2014-03-14 16:29:23 UTC (rev 2530)
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup Label="UserMacros">
+ <omni_dllver>$(OMNI_DLLVER)</omni_dllver>
+ <omnithread_dllver>$(OMNITHREAD_DLLVER)</omnithread_dllver>
+ <rtm_dllver>$(RTM_DLLVER)</rtm_dllver>
+ <rtm_version>$(RTM_VERSION)</rtm_version>
+ <coil_dllver>$(COIL_DLLVER)</coil_dllver>
+ <coil_lib>coil$(coil_dllver).lib</coil_lib>
+ <coil_libd>coil$(coil_dllver)d.lib</coil_libd>
+ <omni_includes>$(omni_root)\include</omni_includes>
+ <omni_libdir>$(omni_root)\lib\x86_win32</omni_libdir>
+ <omni_bin>$(omni_root)\bin\x86_win32</omni_bin>
+ <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib</omni_lib>
+ <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
+ <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl</rtm_includes>
+ <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
+ <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
+ <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>
+ <rtm_libd>RTC$(rtm_dllver)d.lib;$(coil_libd);$(omni_libd);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_libd)</rtm_libd>
+ <rtm_lib>RTC$(rtm_dllver).lib;$(coil_lib);$(omni_lib);advapi32.lib;ws2_32.lib;mswsock.lib;$(user_lib)</rtm_lib>
+ <rtm_idlc>omniidl</rtm_idlc>
+ <rtm_idlflags>-bcxx -Wba -nf -I $(SolutionDir)\rtm\idl</rtm_idlflags>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <_PropertySheetDisplayName>OpenRTM-aist-$(RTM_SHORTVER)</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(omni_includes);$(rtm_includes);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories>$(omni_libdir);$(rtm_libdir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="omni_root">
+ <Value>$(omni_root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_dllver">
+ <Value>$(omni_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omnithread_dllver">
+ <Value>$(omnithread_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_root">
+ <Value>$(rtm_root)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_dllver">
+ <Value>$(rtm_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_version">
+ <Value>$(rtm_version)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_dllver">
+ <Value>$(coil_dllver)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_includes">
+ <Value>$(omni_includes)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_libdir">
+ <Value>$(omni_libdir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_bin">
+ <Value>$(omni_bin)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_lib">
+ <Value>$(omni_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="omni_libd">
+ <Value>$(omni_libd)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_includes">
+ <Value>$(rtm_includes)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_libdir">
+ <Value>$(rtm_libdir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_bin">
+ <Value>$(rtm_bin)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_path">
+ <Value>$(rtm_path)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_libd">
+ <Value>$(rtm_libd)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_lib">
+ <Value>$(rtm_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_idlc">
+ <Value>$(rtm_idlc)</Value>
+ </BuildMacro>
+ <BuildMacro Include="rtm_idlflags">
+ <Value>$(rtm_idlflags)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_lib">
+ <Value>$(coil_lib)</Value>
+ </BuildMacro>
+ <BuildMacro Include="coil_libd">
+ <Value>$(coil_libd)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
Added: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops (rev 0)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="shift_jis"?>
+<VisualStudioPropertySheet
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="OpenRTM-aist-%RTM_SHORTVER%"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="$(omni_includes);$(rtm_includes)"
+ PreprocessorDefinitions="RTC_CORBA_CXXMAPPING11;_WIN32_WINNT=0x0500"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalLibraryDirectories="$(omni_libdir);$(rtm_libdir)"
+ />
+ <UserMacro
+ Name="omni_root"
+ Value="%OMNI_ROOT%"
+ />
+ <UserMacro
+ Name="omni_dllver"
+ Value="%OMNI_DLLVER%"
+ />
+ <UserMacro
+ Name="omnithread_dllver"
+ Value="%OMNITHREAD_DLLVER%"
+ />
+ <UserMacro
+ Name="rtm_root"
+ Value="%RTM_ROOT%"
+ />
+ <UserMacro
+ Name="rtm_dllver"
+ Value="%RTM_DLLVER%"
+ />
+ <UserMacro
+ Name="rtm_version"
+ Value="%RTM_VERSION%"
+ />
+ <UserMacro
+ Name="coil_dllver"
+ Value="%COIL_DLLVER%"
+ />
+ <!-- omniORB macros -->
+ <UserMacro
+ Name="omni_includes"
+ Value=""$(omni_root)\include""
+ />
+ <UserMacro
+ Name="omni_libdir"
+ Value=""$(omni_root)\lib\x86_win32""
+ />
+ <UserMacro
+ Name="omni_bin"
+ Value=""$(omni_root)\bin\x86_win32""
+ />
+ <UserMacro
+ Name="omni_lib"
+ Value="omniORB$(omni_dllver)_rt.lib omniDynamic$(omni_dllver)_rt.lib omnithread$(omnithread_dllver)_rt.lib"
+ />
+ <UserMacro
+ Name="omni_libd"
+ Value="omniORB$(omni_dllver)_rtd.lib omniDynamic$(omni_dllver)_rtd.lib omnithread$(omnithread_dllver)_rtd.lib"
+ />
+ <!-- OpenRTM-aist macros -->
+ <UserMacro
+ Name="rtm_includes"
+ Value=""$(rtm_root)";"$(rtm_root)\rtm\idl""
+ />
+ <UserMacro
+ Name="rtm_libdir"
+ Value=""$(rtm_root)\bin""
+ />
+ <UserMacro
+ Name="rtm_bin"
+ Value=""$(rtm_root)\bin";"$(rtm_root)\build""
+ />
+ <UserMacro
+ Name="rtm_path"
+ Value="$(rtm_bin);$(omni_bin)"
+ />
+ <UserMacro
+ Name="rtm_libd"
+ Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+ />
+ <UserMacro
+ Name="rtm_lib"
+ Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+ />
+ <UserMacro
+ Name="rtm_idlc"
+ Value="omniidl"
+ />
+ <UserMacro
+ Name="rtm_idlflags"
+ Value="-bcxx -Wba -nf -I"$(SolutionDir)\rtm\idl""
+ />
+ <!-- coil macros -->
+ <UserMacro
+ Name="coil_lib"
+ Value="coil$(coil_dllver).lib"
+ />
+ <UserMacro
+ Name="coil_libd"
+ Value="coil$(coil_dllver)d.lib"
+ />
+
+</VisualStudioPropertySheet>
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.props
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.props 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.props 2014-03-14 16:29:23 UTC (rev 2530)
@@ -7,7 +7,7 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <_PropertySheetDisplayName>OpenRTM-aist-1.0</_PropertySheetDisplayName>
+ <_PropertySheetDisplayName>OpenRTM-aist-%RTM_SHORTVER%</_PropertySheetDisplayName>
</PropertyGroup>
<ItemGroup>
<BuildMacro Include="rtm_root">
Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.vsprops 2014-03-14 16:25:20 UTC (rev 2529)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_distbuild.vsprops 2014-03-14 16:29:23 UTC (rev 2530)
@@ -2,7 +2,7 @@
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
- Name="OpenRTM-aist-1.0"
+ Name="OpenRTM-aist-$(RTM_SHORTVER)"
>
<UserMacro
Name="rtm_root"
More information about the openrtm-commit
mailing list