summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2009-03-19 16:06:56 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2009-03-19 16:06:56 +0000
commit7635d80091700873b7814577104c753d3d58bef5 (patch)
tree20e01520e88f1e2f8e4fd515a73961ebadb15043
parent8b32ac334bb90ba9be35311e27049248c66ea967 (diff)
downloadATCD-7635d80091700873b7814577104c753d3d58bef5.tar.gz
Thu Mar 19 16:07:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/config/acedefaults.mpb: * bin/MakeProjectCreator/config/svc_conf_files.mpb: Add all .conf and .conf.xml files to a Svc Conf Files group and use it for all ace/tao projects. That way any service config file is part of the generated visual studio solution which makes it easier to edit these files
-rw-r--r--ACE/ChangeLog11
-rw-r--r--ACE/bin/MakeProjectCreator/config/acedefaults.mpb2
-rw-r--r--ACE/bin/MakeProjectCreator/config/svc_conf_files.mpb7
3 files changed, 18 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index a485a8c2a44..cbc8d197416 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,7 +1,16 @@
+Thu Mar 19 16:07:22 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * bin/MakeProjectCreator/config/acedefaults.mpb:
+ * bin/MakeProjectCreator/config/svc_conf_files.mpb:
+ Add all .conf and .conf.xml files to a Svc Conf Files group
+ and use it for all ace/tao projects. That way any service
+ config file is part of the generated visual studio solution
+ which makes it easier to edit these files
+
Thu Mar 19 12:42:07 UTC 2009 Phil Mesnier <mesnier_p@ociweb.com>
* ace/OS_NS_unistd.inl:
-
+
Further clean up to maintain style consistency in new dup()
impl.
diff --git a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
index c6e9a9fb756..228c6e6c40a 100644
--- a/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acedefaults.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project: ipv6, vc_warnings, build_files, test_files {
+project: ipv6, vc_warnings, build_files, test_files, svc_conf_files {
staticflags += ACE_AS_STATIC_LIBS
includes += $(ACE_ROOT)
libpaths += $(ACE_ROOT)/lib
diff --git a/ACE/bin/MakeProjectCreator/config/svc_conf_files.mpb b/ACE/bin/MakeProjectCreator/config/svc_conf_files.mpb
new file mode 100644
index 00000000000..dccc17de3dc
--- /dev/null
+++ b/ACE/bin/MakeProjectCreator/config/svc_conf_files.mpb
@@ -0,0 +1,7 @@
+// $Id$
+project {
+ Define_Custom(Svc_Conf) {
+ inputext = .conf, .conf.xml
+ }
+}
+