Adding support for global metadata. Removing the --package option in

    slice2java. Using global metadata to define packaging in slice2java,
    slice2freezej.

1 files changed, 1 insertions, 20 deletions

diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 4dc5f78fd0c..0d36fa3dcec 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -31,7 +31,6 @@ usage(const char* n)
         "-UNAME                  Remove any definition for NAME.\n"
         "-IDIR                   Put DIR in the include file search path.\n"
         "--output-dir DIR        Create files in the directory DIR.\n"
-        "--package PKG           Generate everything in package PKG.\n"
         "--tie                   Generate TIE classes.\n"
         "--impl                  Generate sample implementations.\n"
         "--impl-tie              Generate sample TIE implementations.\n"
@@ -48,7 +47,6 @@ main(int argc, char* argv[])
     string cppArgs;
     vector<string> includePaths;
     string output;
-    string package;
     bool tie = false;
     bool impl = false;
     bool implTie = false;
@@ -146,23 +144,6 @@ main(int argc, char* argv[])
             }
             argc -= 2;
         }
-        else if(strcmp(argv[idx], "--package") == 0)
-        {
-            if(idx + 1 >= argc)
-            {
-                cerr << argv[0] << ": argument expected for`" << argv[idx]
-                     << "'" << endl;
-                usage(argv[0]);
-                return EXIT_FAILURE;
-            }
-
-            package = argv[idx + 1];
-            for(int i = idx ; i + 2 < argc ; ++i)
-            {
-                argv[i] = argv[i + 2];
-            }
-            argc -= 2;
-        }
         else if(strcmp(argv[idx], "--tie") == 0)
         {
             tie = true;
@@ -259,7 +240,7 @@ main(int argc, char* argv[])
 	    }
 	    else
 	    {
-		Gen gen(argv[0], icecpp.getBaseName(), includePaths, package, output);
+		Gen gen(argv[0], icecpp.getBaseName(), includePaths, output);
 		if(!gen)
 		{
 		    p->destroy();