diff options
author | Adam Mitz <mitza@objectcomputing.com> | 2021-01-23 09:42:32 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-23 09:42:32 -0600 |
commit | fd04311ac4bdf96341aba7a5a22cf8634206e1d7 (patch) | |
tree | 88110cbef33b6ccd3741c32f1ac3f618f2603f7a | |
parent | 85e0ff46cd14eb3a547564bdaacf58e6e769957c (diff) | |
parent | 805804a536cf581c371209928bcefb2f885a58f0 (diff) | |
download | ATCD-fd04311ac4bdf96341aba7a5a22cf8634206e1d7.tar.gz |
Merge pull request #1421 from mitza-oci/taoidl-tao3
TAO_IDL: drv_preproc fixed logging and quoting, update the Define_Custom to run from a path with spaces
-rw-r--r-- | TAO/MPC/config/taobaseidldefaults.mpb | 4 | ||||
-rw-r--r-- | TAO/TAO_IDL/driver/drv_preproc.cpp | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb index 391e6e6644f..d24379f56dc 100644 --- a/TAO/MPC/config/taobaseidldefaults.mpb +++ b/TAO/MPC/config/taobaseidldefaults.mpb @@ -2,10 +2,10 @@ project: build_files { // Set the idl compiler and flags as template values specific { - tao_idl = $(ACE_ROOT)/bin/tao_idl + tao_idl = <%quote%>$(ACE_ROOT)/bin/tao_idl<%quote%> tao_idl_dep = $(ACE_ROOT)/bin/tao_idl tao_idlflags = -Wb,pre_include=ace/pre.h \ - -Wb,post_include=ace/post.h -I$(TAO_ROOT) + -Wb,post_include=ace/post.h -I<%quote%>$(TAO_ROOT)<%quote%> } Define_Custom(IDL) { diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp index 3e02a5c4ac1..1943bbdf9d3 100644 --- a/TAO/TAO_IDL/driver/drv_preproc.cpp +++ b/TAO/TAO_IDL/driver/drv_preproc.cpp @@ -138,7 +138,7 @@ DRV_cpp_putarg (const char *str) throw Bailout (); } - if (str && ACE_OS::strchr (str, ' ')) + if (str && ACE_OS::strchr (str, ' ') && !ACE_OS::strchr (str, '"')) { ACE_TCHAR *buf = nullptr; ACE_NEW_NORETURN (buf, ACE_TCHAR[ACE_OS::strlen (str) + 3]); @@ -962,7 +962,7 @@ DRV_copy_input (FILE *fin, if (f == nullptr) { ACE_ERROR ((LM_ERROR, - "%C: cannot open temp file \"%C\" for copying from \"%C\": %p\n", + "%C: cannot open temp file \"%C\" for copying from \"%C\": %m\n", idl_global->prog_name (), fn, orig_filename)); @@ -1095,7 +1095,7 @@ DRV_pre_proc (const char *myfile) if (ti_fd == ACE_INVALID_HANDLE) { ACE_ERROR ((LM_ERROR, - "%C: Unable to create temporary file \"%C\": %p\n", + "%C: Unable to create temporary file \"%C\": %m\n", idl_global->prog_name (), tmp_ifile)); @@ -1107,7 +1107,7 @@ DRV_pre_proc (const char *myfile) if (tf_fd == ACE_INVALID_HANDLE) { ACE_ERROR ((LM_ERROR, - "%C: Unable to create temporary file \"%C\": %p\n", + "%C: Unable to create temporary file \"%C\": %m\n", idl_global->prog_name (), tmp_file)); @@ -1137,7 +1137,7 @@ DRV_pre_proc (const char *myfile) if (file == nullptr) { ACE_ERROR ((LM_ERROR, - "%C: ERROR: Unable to open file : %p\n", + "%C: ERROR: Unable to open file : %m\n", idl_global->prog_name (), myfile)); @@ -1236,7 +1236,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Unable to rename temporary " - "file \"%C\" to \"%C\": %p\n", + "file \"%C\" to \"%C\": %m\n", idl_global->prog_name (), tmp_file, t_file)); @@ -1251,7 +1251,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Unable to rename temporary " - "file \"%C\" to \"%C\": %p\n", + "file \"%C\" to \"%C\": %m\n", idl_global->prog_name (), tmp_ifile, t_ifile)); @@ -1287,7 +1287,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: cannot open temp file" - " \"%C\" for writing: %p\n", + " \"%C\" for writing: %m\n", idl_global->prog_name (), t_file)); @@ -1298,7 +1298,7 @@ DRV_pre_proc (const char *myfile) if (cpp_options.set_handles (ACE_INVALID_HANDLE, fd) == -1) { - ACE_ERROR ((LM_ERROR, "%C: cannot set stdout for child process: %p\n", + ACE_ERROR ((LM_ERROR, "%C: cannot set stdout for child process: %m\n", idl_global->prog_name ())); throw Bailout (); @@ -1331,7 +1331,7 @@ DRV_pre_proc (const char *myfile) if (ACE_OS::close (fd) == -1) { ACE_ERROR ((LM_ERROR, - "%C: cannot close temp file \"%C\" on parent: %p\n", + "%C: cannot close temp file \"%C\" on parent: %m\n", idl_global->prog_name (), t_file)); @@ -1410,7 +1410,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Could not open cpp " - "output file \"%C\": %p\n", + "output file \"%C\": %m\n", idl_global->prog_name (), t_file)); @@ -1431,7 +1431,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Could not open cpp " - "output file \"$C\": %p\n", + "output file \"%C\": %m\n", idl_global->prog_name (), t_file)); @@ -1467,7 +1467,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Could not remove cpp " - "input file \"%C\": %p\n", + "input file \"%C\": %m\n", idl_global->prog_name (), t_ifile)); @@ -1478,7 +1478,7 @@ DRV_pre_proc (const char *myfile) { ACE_ERROR ((LM_ERROR, "%C: Could not remove cpp " - "output file \"%C\": %p\n", + "output file \"%C\": %m\n", idl_global->prog_name (), t_file)); |