X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=NativeLauncher%2Ftool%2Fnitool.cc;h=943852e50df41aad9b89b1025e9657135bde538f;hb=496e6363ac6bd4bdc9bf4cd9f4313d87aa5b6acf;hp=bbed3f255af8d3efa23ac8b4fc8425bfc32f424e;hpb=d98697009f2a75f0e9d92f13c5916c8916dbb587;p=platform%2Fcore%2Fdotnet%2Flauncher.git

diff --git a/NativeLauncher/tool/nitool.cc b/NativeLauncher/tool/nitool.cc
index bbed3f2..943852e 100644
--- a/NativeLauncher/tool/nitool.cc
+++ b/NativeLauncher/tool/nitool.cc
@@ -49,7 +49,6 @@ static void help(const char *argv0)
 
 int main(int argc, char* argv[])
 {
-	DWORD flags = 0;
 	bool pkgMode = false;
 	bool dllMode = false;
 	bool rmPkgMode = false;
@@ -58,18 +57,15 @@ int main(int argc, char* argv[])
 		return -1;
 	}
 
-	// Parse optional switches first.
-	if (cmdOptionExists(argv, argv+argc, "--r2r")) {
-		flags |= NI_FLAGS_ENABLER2R;
-	}
-	if (cmdOptionExists(argv, argv+argc, "--compatibility")) {
-		flags |= NI_FLAGS_COMPATIBILITY;
-	}
-	if (cmdOptionExists(argv, argv+argc, "--instrument")) {
-		flags |= NI_FLAGS_INSTRUMENT;
+	NIOption* opt = getNIOption();
+	if (opt == nullptr) {
+		_SERR("Fail to create option structure.");
+		return -1;
 	}
+
+	// Parse optional switches first.
 	if (cmdOptionExists(argv, argv+argc, "--verbose")) {
-		flags |= NI_FLAGS_VERBOSE;
+		opt->flags |= NI_FLAGS_VERBOSE;
 	}
 
 	// The following commands are mutually exclusive.
@@ -77,7 +73,7 @@ int main(int argc, char* argv[])
 		help(argv[0]);
 		return 0;
 	} else if (cmdOptionExists(argv, argv+argc, "--system")) {
-		createNIPlatform(flags);
+		createNIPlatform("", opt->flags);
 		return 0;
 	} else if (cmdOptionExists(argv, argv+argc, "--dll")) {
 		dllMode = true;
@@ -89,7 +85,7 @@ int main(int argc, char* argv[])
 	} else if (cmdOptionExists(argv, argv+argc, "--reset-pkg")) {
 		rmPkgMode = true;
 	} else if (cmdOptionExists(argv, argv+argc, "--regen-all-app")) {
-		regenerateAppNI(flags);
+		regenerateAppNI(opt->flags);
 		return 0;
 	} else {
 		help(argv[0]);
@@ -110,7 +106,7 @@ int main(int argc, char* argv[])
 	if (pkgMode) {
 		for (const std::string pkg : args) {
 			// if there is AOTed dlls under package root, that is skiped.
-			int ret = createNIUnderPkgRoot(pkg, flags);
+			int ret = createNIUnderPkgRoot(pkg, opt->flags);
 			if (ret == NI_ERROR_INVALID_PACKAGE) {
 				_SERR("Failed to get root path from [%s]", pkg.c_str());
 				return -1;
@@ -134,7 +130,7 @@ int main(int argc, char* argv[])
 		// donot return error code for generation failure.
 		// we have to run crossgen for all input dlls.
 		for (const std::string dll : args) {
-			int ret = createNIDll(dll, flags);
+			int ret = createNIDll(dll, opt->flags);
 			if (ret == NI_ERROR_ALREADY_EXIST) {
 				// skip for already exist case
 			} else if (ret != NI_ERROR_NONE) {