summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2005-04-14 14:22:05 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2005-04-14 14:22:05 +0000
commit538ddafbf8527b1224eb929bd10e7e58871ee6b4 (patch)
treef13514ccce306a8d8e30d78cb7ed849827725db6
parentb332714fd887b2af63354b8aca9415d88fb5ca44 (diff)
downloadATCD-538ddafbf8527b1224eb929bd10e7e58871ee6b4.tar.gz
ChangeLogTag: Thu Apr 14 09:21:14 2005 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog6
-rw-r--r--bin/MakeProjectCreator/config/taoidldefaults.mpb31
2 files changed, 29 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b710944598..6f926ba6265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 14 09:21:14 2005 Chad Elliott <elliott_c@ociweb.com>
+
+ * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+
+ Added support for the -SS, -Sci and -Ssi options.
+
Thu Apr 14 10:27:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-cygwin32.h:
diff --git a/bin/MakeProjectCreator/config/taoidldefaults.mpb b/bin/MakeProjectCreator/config/taoidldefaults.mpb
index c00a576b4de..e70706357d4 100644
--- a/bin/MakeProjectCreator/config/taoidldefaults.mpb
+++ b/bin/MakeProjectCreator/config/taoidldefaults.mpb
@@ -16,25 +16,40 @@ project {
command = $(TAO_IDL)
libpath = $(ACE_ROOT)/lib
inputext = .idl
- source_pre_extension = C, S
+ source_pre_extension = C
header_pre_extension = C, S
- inline_pre_extension = C, S
source_outputext = .cpp, .cxx, .cc, .C
header_outputext = .h, .hpp, .hxx, .hh
- inline_outputext = .inl, .i
keyword idlflags = commandflags
+ // Inline related options
+ optional(inline_outputext) {
+ commandflags(!-SS && !-Ssi || !-Sci || !-Sc) += .inl, .i
+ }
+ optional(inline_pre_extension) {
+ commandflags(!-SS && !-Ssi) += S
+ }
+ optional(inline_pre_extension) {
+ commandflags(!-Sci) += C
+ }
+ optional(inline_pre_extension) {
+ commandflags(!-Sc && !-SS) += S_T
+ }
+
+ // Source related options
+ optional(source_pre_extension) {
+ commandflags(!-SS) += S
+ }
optional(source_pre_extension) {
commandflags(-GA) += A
}
+
+ // Other
optional(template_outputext) {
- commandflags(!-Sc) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C
+ commandflags(!-Sc && !-SS) += S_T.cpp, S_T.cxx, S_T.cc, S_T.C
}
optional(header_pre_extension) {
- commandflags(!-Sc) += S_T
- }
- optional(inline_pre_extension) {
- commandflags(!-Sc) += S_T
+ commandflags(!-Sc && !-SS) += S_T
}
}