Use primitives.sw.main.

egorpugin · egorpugin · commit f4857157d192 · 2019-01-14T00:32:41.000+03:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -149,6 +149,7 @@ cppan_add_package(
         pvt.egorpugin.primitives.pack-master
         pvt.egorpugin.primitives.yaml-master
         pvt.egorpugin.primitives.win32helpers-master
+        pvt.egorpugin.primitives.sw.main-master
 
         pvt.egorpugin.primitives.tools.embedder-master
 
diff --git a/cppan.yml b/cppan.yml
@@ -8,6 +8,9 @@ local_settings:
 
 root_project: pvt.cppan.client
 
+add_directories:
+    - d:/dev/primitives
+
 common_settings:
     c++: 17
 
@@ -180,5 +183,8 @@ projects:
 
         dependencies:
             - common
+            - name: pvt.egorpugin.primitives.sw.main
+              version: master
+              local: primitives.sw.main
             - pvt.cppan.demo.boost.program_options: 1
             - pvt.cppan.demo.yhirose.cpp_linenoise: master
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
@@ -10,6 +10,7 @@ file(GLOB cppan_src "*.cpp" "*.h" "*.rc")
 
 add_executable(client ${cppan_src})
 target_link_libraries(client common
+    pvt.egorpugin.primitives.sw.main
     pvt.cppan.demo.boost.program_options
     pvt.cppan.demo.yhirose.cpp_linenoise
 )
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -39,6 +39,7 @@
 #include <primitives/templates.h>
 #include <primitives/executor.h>
 #include <primitives/win32helpers.h>
+#include <primitives/sw/main.h>
 
 #include <iostream>
 #include <thread>
@@ -63,8 +64,7 @@ void self_upgrade_copy(const path &dst);
 optional<int> internal(const Strings &args);
 void command_init(const Strings &args);
 
-int main1(int argc, char *argv[])
-try
+int main(int argc, char *argv[])
 {
     Strings args;
     for (auto i = 0; i < argc; i++)
@@ -470,24 +470,6 @@ try
 
     return 0;
 }
-catch (const std::exception &e)
-{
-    std::cerr << e.what() << "\n";
-    //if (auto st = boost::get_error_info<traced_exception>(e))
-        //std::cerr << *st << '\n';
-    return 1;
-}
-catch (...)
-{
-    std::cerr << "Unhandled unknown exception" << "\n";
-    return 1;
-}
-
-int main(int argc, char *argv[])
-{
-    auto r = main1(argc, argv);
-    return r;
-}
 
 void check_spec_file()
 {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ file(GLOB cppan_src ".cpp" ".h" "*.rc")`
`10`	`10`
`11`	`11`	`add_executable(client ${cppan_src})`
`12`	`12`	`target_link_libraries(client common`
	`13`	`+ pvt.egorpugin.primitives.sw.main`
`13`	`14`	`pvt.cppan.demo.boost.program_options`
`14`	`15`	`pvt.cppan.demo.yhirose.cpp_linenoise`
`15`	`16`	`)`