[asterisk-scf-commits] asterisk-scf/release/ice.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  0860537db39fb7057e1b5bbeb5778ea448313afa (commit)
       via  340a4be2438591d50fe168c761448ceb6f627214 (commit)
      from  a7038ce14d0a40e776d6027924588233c602f219 (commit)

Summary of changes:
 cpp/src/slice2cpp/Main.cpp |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 0860537db39fb7057e1b5bbeb5778ea448313afa
Merge: a7038ce 340a4be
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Mar 28 15:54:28 2011 -0700

    Merge branch 'slice2cpp-include-header-in-dependencies'


commit 340a4be2438591d50fe168c761448ceb6f627214
Author: Kevin P. Fleming <kpfleming at digium.com>
Date:   Mon Mar 28 15:53:29 2011 -0700

    Add a '--depend-header' option to slice2cpp so that it will include both
    the generated header file and source file in the Makefile dependencies
    when requested.

diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 0ca754b..6d10331 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -74,6 +74,7 @@ usage(const char* n)
         "--dll-export SYMBOL      Use SYMBOL for DLL exports.\n"
         "--impl                   Generate sample implementations.\n"
         "--depend                 Generate Makefile dependencies.\n"
+        "--depend-header	  Include generated header file in Makefile dependencies.\n"
         "-d, --debug              Print debug messages.\n"
         "--ice                    Permit `Ice' prefix (for building Ice source code only).\n"
         "--underscore             Permit underscores in Slice identifiers.\n"
@@ -100,6 +101,7 @@ compile(int argc, char* argv[])
     opts.addOpt("", "dll-export", IceUtilInternal::Options::NeedArg);
     opts.addOpt("", "impl");
     opts.addOpt("", "depend");
+    opts.addOpt("", "depend-header");
     opts.addOpt("d", "debug");
     opts.addOpt("", "ice");
     opts.addOpt("", "underscore");
@@ -166,7 +168,8 @@ compile(int argc, char* argv[])
 
     bool impl = opts.isSet("impl");
 
-    bool depend = opts.isSet("depend");
+    bool depend = opts.isSet("depend") || opts.isSet("depend-header");
+    bool dependHeader = opts.isSet("depend-header");
 
     bool debug = opts.isSet("debug");
 
@@ -220,6 +223,14 @@ compile(int argc, char* argv[])
                 return EXIT_FAILURE;
             }
 
+            if(dependHeader)
+            {
+                if(!icecpp->printMakefileDependencies(Preprocessor::CPlusPlus, includePaths, headerExtension))
+                {
+                    return EXIT_FAILURE;
+                }
+            }
+
             if(!icecpp->printMakefileDependencies(Preprocessor::CPlusPlus, includePaths, sourceExtension))
             {
                 return EXIT_FAILURE;

-----------------------------------------------------------------------


-- 
asterisk-scf/release/ice.git