Use c++14 instead of c++17

Change-Id: I37f61f337e4b9e790785974fdfda15ff4c7e3c7b
Signed-off-by: jh9216.park <jh9216.park@samsung.com>

diff --git a/idlc/CMakeLists.txt b/idlc/CMakeLists.txt
index 415b43b..375f58d 100644 (file)
--- a/idlc/CMakeLists.txt
+++ b/idlc/CMakeLists.txt
@@ -17,7 +17,7 @@ ENDIF(DEFINED BUILD_WIN)
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Werror")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wno-unused-function -Wno-sign-compare")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=c++17")
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -std=c++14")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
 SET(CMAKE_EXE_LINKER_FLAGS "-static-libstdc++ -static-libgcc")
 SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")

diff --git a/idlc/gen_cion/cs_cion_gen_base.cc b/idlc/gen_cion/cs_cion_gen_base.cc
index 42a3ba2..0b6430e 100644 (file)
--- a/idlc/gen_cion/cs_cion_gen_base.cc
+++ b/idlc/gen_cion/cs_cion_gen_base.cc
@@ -632,4 +632,5 @@ void CsCionGeneratorBase::GenVersion(std::ofstream& stream) {
     });
   stream << NLine(1);
 }
+
 }  // namespace tidl

diff --git a/idlc/gen_cion/java_cion_data_gen.cc b/idlc/gen_cion/java_cion_data_gen.cc
index 170d1b4..fa6afb1 100644 (file)
--- a/idlc/gen_cion/java_cion_data_gen.cc
+++ b/idlc/gen_cion/java_cion_data_gen.cc
@@ -21,23 +21,18 @@
 #include <unistd.h>
 
 #include <ctime>
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
 
 JavaCionDataGen::JavaCionDataGen(
-    std::shared_ptr<Document> doc) : Generator(doc) {
+    std::shared_ptr<Document> doc) : JavaCionGeneratorBase(doc) {
 }
 
 void JavaCionDataGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/data";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/data");
+  if (fname.empty())
+    return;
 
   stream.open(fname + "/ReceivedPayloadInfo.java");
   stream << "package org.tizen.gen." << FileName + ".data;" << NLine(2);

diff --git a/idlc/gen_cion/java_cion_data_gen.h b/idlc/gen_cion/java_cion_data_gen.h
index fe8c466..d26d327 100644 (file)
--- a/idlc/gen_cion/java_cion_data_gen.h
+++ b/idlc/gen_cion/java_cion_data_gen.h
@@ -23,11 +23,11 @@
 
 #include "idlc/ast/type.h"
 #include "idlc/ast/structure.h"
-#include "idlc/gen/generator.h"
+#include "idlc/gen_cion/java_cion_gen_base.h"
 
 namespace tidl {
 
-class JavaCionDataGen : public Generator {
+class JavaCionDataGen : public JavaCionGeneratorBase {
  public:
   explicit JavaCionDataGen(std::shared_ptr<Document> doc);
   virtual ~JavaCionDataGen() = default;

diff --git a/idlc/gen_cion/java_cion_gen_base.cc b/idlc/gen_cion/java_cion_gen_base.cc
index b828734..7a528d1 100644 (file)
--- a/idlc/gen_cion/java_cion_gen_base.cc
+++ b/idlc/gen_cion/java_cion_gen_base.cc
@@ -16,6 +16,9 @@
 
 #include "idlc/gen_cion/java_cion_gen_base.h"
 
+#include <sys/stat.h>
+#include <unistd.h>
+
 #include <ctime>
 #include <vector>
 
@@ -207,4 +210,25 @@ std::string JavaCionGeneratorBase::NLine(int cnt) {
   return t;
 }
 
+std::string JavaCionGeneratorBase::MakeDir(const std::string& file_name,
+    const std::string& opt) {
+  std::string fname = "./java/org/tizen/gen/" + file_name + opt;
+  std::string name = "./java/org/tizen/gen/" + file_name;
+  if (access(fname.c_str(), F_OK) != 0) {
+    mkdir("./java", (S_IRWXU | S_IRGRP | S_IXGRP | S_ISGID | S_IROTH | S_IXOTH));
+    mkdir("./java/org", (S_IRWXU | S_IRGRP | S_IXGRP | S_ISGID | S_IROTH | S_IXOTH));
+    mkdir("./java/org/tizen", (S_IRWXU | S_IRGRP | S_IXGRP | S_ISGID | S_IROTH | S_IXOTH));
+    mkdir("./java/org/tizen/gen", (S_IRWXU | S_IRGRP | S_IXGRP | S_ISGID | S_IROTH | S_IXOTH));
+    mkdir(name.c_str(), (S_IRWXU | S_IRGRP | S_IXGRP | S_ISGID | S_IROTH | S_IXOTH));
+    int r = mkdir(fname.c_str(), (S_IRWXU | S_IRGRP | S_IXGRP | S_ISGID | S_IROTH | S_IXOTH));
+
+    if (r < 0) {
+      std::cout << "fail to create folder " << fname << std::endl;
+      return "";
+    }
+  }
+
+  return fname;
+}
+
 }  // namespace tidl

diff --git a/idlc/gen_cion/java_cion_gen_base.h b/idlc/gen_cion/java_cion_gen_base.h
index 3af02f6..c84419b 100644 (file)
--- a/idlc/gen_cion/java_cion_gen_base.h
+++ b/idlc/gen_cion/java_cion_gen_base.h
@@ -47,6 +47,7 @@ class JavaCionGeneratorBase : public Generator {
 
   std::string Tab(int cnt);
   std::string NLine(int cnt);
+  std::string MakeDir(const std::string& file_name, const std::string& opt);
 
  protected:
   const int TAB_SIZE = 4;

diff --git a/idlc/gen_cion/java_cion_interface_gen.cc b/idlc/gen_cion/java_cion_interface_gen.cc
index 139f0b7..6a8cdc4 100644 (file)
--- a/idlc/gen_cion/java_cion_interface_gen.cc
+++ b/idlc/gen_cion/java_cion_interface_gen.cc
@@ -21,7 +21,6 @@
 #include <unistd.h>
 
 #include <ctime>
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
@@ -31,13 +30,9 @@ JavaCionInterfaceGen::JavaCionInterfaceGen(
 }
 
 void JavaCionInterfaceGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/interfaces";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/interfaces");
+  if (fname.empty())
+    return;
 
   stream.open(fname + "/ProxyDelegator.java");
   stream << "package org.tizen.gen." << FileName + ".interfaces;" << NLine(1);

diff --git a/idlc/gen_cion/java_cion_proxy_gen.cc b/idlc/gen_cion/java_cion_proxy_gen.cc
index d6eec47..7d9abc4 100644 (file)
--- a/idlc/gen_cion/java_cion_proxy_gen.cc
+++ b/idlc/gen_cion/java_cion_proxy_gen.cc
@@ -20,7 +20,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
@@ -29,13 +28,9 @@ JavaCionProxyGen::JavaCionProxyGen(std::shared_ptr<Document> doc)
     : JavaCionGeneratorBase(doc) {}
 
 void JavaCionProxyGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/viewmodel";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/viewmodel");
+  if (fname.empty())
+    return;
 
   for (auto& i : GetDocument().GetBlocks()) {
     if (i->GetType() != Block::TYPE_INTERFACE)

diff --git a/idlc/gen_cion/java_cion_proxy_repo_gen.cc b/idlc/gen_cion/java_cion_proxy_repo_gen.cc
index 2b741a3..8a13008 100644 (file)
--- a/idlc/gen_cion/java_cion_proxy_repo_gen.cc
+++ b/idlc/gen_cion/java_cion_proxy_repo_gen.cc
@@ -21,7 +21,6 @@
 #include <unistd.h>
 
 #include <ctime>
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
@@ -31,13 +30,9 @@ JavaCionProxyRepoGen::JavaCionProxyRepoGen(
 }
 
 void JavaCionProxyRepoGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/data";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/data");
+  if (fname.empty())
+    return;
 
   for (auto& i : GetDocument().GetBlocks()) {
     if (i->GetType() != Block::TYPE_INTERFACE)

diff --git a/idlc/gen_cion/java_cion_structure_gen.cc b/idlc/gen_cion/java_cion_structure_gen.cc
index 3609423..ba7be13 100644 (file)
--- a/idlc/gen_cion/java_cion_structure_gen.cc
+++ b/idlc/gen_cion/java_cion_structure_gen.cc
@@ -21,7 +21,6 @@
 #include <unistd.h>
 
 #include <ctime>
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
@@ -31,13 +30,9 @@ JavaCionStructureGen::JavaCionStructureGen(
 }
 
 void JavaCionStructureGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/data";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/data");
+  if (fname.empty())
+    return;
 
   for (auto& i : GetDocument().GetBlocks()) {
     if (i->GetType() != Block::TYPE_STRUCTURE)

diff --git a/idlc/gen_cion/java_cion_stub_base_service_gen.cc b/idlc/gen_cion/java_cion_stub_base_service_gen.cc
index 0c39385..dbdb863 100644 (file)
--- a/idlc/gen_cion/java_cion_stub_base_service_gen.cc
+++ b/idlc/gen_cion/java_cion_stub_base_service_gen.cc
@@ -20,7 +20,6 @@
 #include <unistd.h>
 
 #include <ctime>
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
@@ -30,13 +29,9 @@ JavaCionStubBaseServiceGen::JavaCionStubBaseServiceGen(
 }
 
 void JavaCionStubBaseServiceGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/interfaces";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/interfaces");
+  if (fname.empty())
+    return;
 
   for (auto& i : GetDocument().GetBlocks()) {
     if (i->GetType() != Block::TYPE_INTERFACE)

diff --git a/idlc/gen_cion/java_cion_stub_gen.cc b/idlc/gen_cion/java_cion_stub_gen.cc
index 4c618c5..8949f94 100644 (file)
--- a/idlc/gen_cion/java_cion_stub_gen.cc
+++ b/idlc/gen_cion/java_cion_stub_gen.cc
@@ -20,7 +20,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
@@ -29,13 +28,9 @@ JavaCionStubGen::JavaCionStubGen(std::shared_ptr<Document> doc)
     : JavaCionGeneratorBase(doc) {}
 
 void JavaCionStubGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/viewmodel";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/viewmodel");
+  if (fname.empty())
+    return;
 
   for (auto& i : GetDocument().GetBlocks()) {
     if (i->GetType() != Block::TYPE_INTERFACE)

diff --git a/idlc/gen_cion/java_cion_stub_repo_gen.cc b/idlc/gen_cion/java_cion_stub_repo_gen.cc
index 91e16a9..46fef63 100644 (file)
--- a/idlc/gen_cion/java_cion_stub_repo_gen.cc
+++ b/idlc/gen_cion/java_cion_stub_repo_gen.cc
@@ -21,7 +21,6 @@
 #include <unistd.h>
 
 #include <ctime>
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
@@ -31,13 +30,9 @@ JavaCionStubRepoGen::JavaCionStubRepoGen(
 }
 
 void JavaCionStubRepoGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/data";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/data");
+  if (fname.empty())
+    return;
 
   for (auto& i : GetDocument().GetBlocks()) {
     if (i->GetType() != Block::TYPE_INTERFACE)

diff --git a/idlc/gen_cion/java_cion_utility_gen.cc b/idlc/gen_cion/java_cion_utility_gen.cc
index 52f8bcd..aaeb5eb 100644 (file)
--- a/idlc/gen_cion/java_cion_utility_gen.cc
+++ b/idlc/gen_cion/java_cion_utility_gen.cc
@@ -21,23 +21,18 @@
 #include <unistd.h>
 
 #include <ctime>
-#include <filesystem>
 #include <vector>
 
 namespace tidl {
 
 JavaCionUtilityGen::JavaCionUtilityGen(
-    std::shared_ptr<Document> doc) : Generator(doc) {
+    std::shared_ptr<Document> doc) : JavaCionGeneratorBase(doc) {
 }
 
 void JavaCionUtilityGen::OnInitGen(std::ofstream& stream) {
-  std::string fname = "./java/org/tizen/gen/" + FileName + "/utility";
-  if (access(fname.c_str(), F_OK) != 0) {
-    if (!std::filesystem::create_directories(fname)) {
-      std::cout << "fail to create folder " << fname << std::endl;
-      return;
-    }
-  }
+  std::string fname = MakeDir(FileName, "/utility");
+  if (fname.empty())
+    return;
 
   stream.open(fname + "/Out.java");
   stream << "package org.tizen.gen." << FileName << ".utility;" << NLine(2);

diff --git a/idlc/gen_cion/java_cion_utility_gen.h b/idlc/gen_cion/java_cion_utility_gen.h
index 2bb02cd..9f487a0 100644 (file)
--- a/idlc/gen_cion/java_cion_utility_gen.h
+++ b/idlc/gen_cion/java_cion_utility_gen.h
@@ -23,11 +23,11 @@
 
 #include "idlc/ast/type.h"
 #include "idlc/ast/structure.h"
-#include "idlc/gen/generator.h"
+#include "idlc/gen_cion/java_cion_gen_base.h"
 
 namespace tidl {
 
-class JavaCionUtilityGen : public Generator {
+class JavaCionUtilityGen : public JavaCionGeneratorBase {
  public:
   explicit JavaCionUtilityGen(std::shared_ptr<Document> doc);
   virtual ~JavaCionUtilityGen() = default;