Release preparation

.gitignore

@@ -20,3 +20,4 @@ test_logs/
 AyonCppApi_CiCd/
 AyonCppApi_cicd/
 __pycache__
+.env*

AyonBuild.py

@@ -11,23 +11,41 @@
 AyonCppApiPrj.add_pip_package("uvicorn[standard]==0.25.0")
 AyonCppApiPrj.add_pip_package("requests")
 
-AyonCppApiPrj.setVar("AYON_CPP_API_ENALBE_GBENCH", "OFF")
-AyonCppApiPrj.setVar("AYON_CPP_API_ENALBE_GTEST", "OFF")
+AyonCppApiPrj.setVar("AYON_CPP_API_ENABLE_GBENCH", "OFF")
+AyonCppApiPrj.setVar("AYON_CPP_API_ENABLE_GTEST", "OFF")
 AyonCppApiPrj.setVar("JTRACE", "0")
 AyonCppApiPrj.setVar("ReleaseType", "Release")
 
 AyonCppApiPrj.setup_prj()
 
 
+SetDefaultVars = Project.Stage("SetDefaultVars")
+SetDefaultVars.add_funcs(
+    Project.Func("", AyonCppApiPrj.setVar, "AYON_CPP_API_ENABLE_GBENCH", "OFF"),
+    Project.Func("", AyonCppApiPrj.setVar, "AYON_CPP_API_ENABLE_GTEST", "OFF"),
+    Project.Func("", AyonCppApiPrj.setVar, "JTRACE", "0"),
+    Project.Func("", AyonCppApiPrj.setVar, "ReleaseType", "Release"),
+)
+AyonCppApiPrj.add_stage(SetDefaultVars)
+
 SetTestVars = Project.Stage("SetTestVars")
 SetTestVars.add_funcs(
-    Project.Func("", AyonCppApiPrj.setVar, "AYON_CPP_API_ENALBE_GBENCH", "ON"),
-    Project.Func("", AyonCppApiPrj.setVar, "AYON_CPP_API_ENALBE_GTEST", "ON"),
+    Project.Func("", AyonCppApiPrj.setVar, "AYON_CPP_API_ENABLE_GBENCH", "ON"),
+    Project.Func("", AyonCppApiPrj.setVar, "AYON_CPP_API_ENABLE_GTEST", "ON"),
     Project.Func("", AyonCppApiPrj.setVar, "JTRACE", "1"),
     Project.Func("", AyonCppApiPrj.setVar, "ReleaseType", "Release"),
 )
 AyonCppApiPrj.add_stage(SetTestVars)
 
+SetDefaultVars = Project.Stage("SetDefaultVars")
+SetDefaultVars.add_funcs(
+    Project.Func("", AyonCppApiPrj.setVar, "AYON_CPP_API_ENABLE_GBENCH", "OFF"),
+    Project.Func("", AyonCppApiPrj.setVar, "AYON_CPP_API_ENABLE_GTEST", "OFF"),
+    Project.Func("", AyonCppApiPrj.setVar, "JTRACE", "0"),
+    Project.Func("", AyonCppApiPrj.setVar, "ReleaseType", "Release"),
+)
+AyonCppApiPrj.add_stage(SetDefaultVars)
+
 CleanUpStage = Project.Stage("Cleanup")
 binFoulder = os.path.join(os.getcwd(), "bin")
 buildFoulder = os.path.join(os.getcwd(), "build")
@@ -59,8 +77,8 @@
         ".",
         "-B",
         "build",
-        lambda: f"-DAYON_CPP_API_ENALBE_GBENCH={AyonCppApiPrj.getVar('AYON_CPP_API_ENALBE_GBENCH')}",
-        lambda: f"-DAYON_CPP_API_ENALBE_GTEST={AyonCppApiPrj.getVar('AYON_CPP_API_ENALBE_GTEST')}",
+        lambda: f"-DAYON_CPP_API_ENABLE_GBENCH={AyonCppApiPrj.getVar('AYON_CPP_API_ENABLE_GBENCH')}",
+        lambda: f"-DAYON_CPP_API_ENABLE_GTEST={AyonCppApiPrj.getVar('AYON_CPP_API_ENABLE_GTEST')}",
         lambda: f"-DJTRACE={AyonCppApiPrj.getVar('JTRACE')}",
         lambda: f"-DCMAKE_BUILD_TYPE={AyonCppApiPrj.getVar('ReleaseType')}",
     ),
@@ -151,13 +169,15 @@ def startTestServer():
 
 def CheckTestServer():
     import requests
-
     response = requests.get("http://localhost:8003/")
     print("Test Respone", response.text)
 
 
 def stopTestServer():
-    ServerPocVar.kill()
+    if sys.platform == "win32":
+        ServerPocVar.join(timeout=2)
+    else:
+        ServerPocVar.kill()
 
 
 SetupTestServer = Project.Stage("SetupTestServer")
@@ -195,11 +215,13 @@ def stopTestServer():
 AyonCppApiPrj.creat_stage_group(
     "CleanBuild",
     CleanUpStage,
+    SetDefaultVars,
     BuildStage,
 )
 AyonCppApiPrj.creat_stage_group(
     "CleanBuildAndDocs",
     CleanUpStage,
+    SetDefaultVars,
     BuildStage,
     DoxyGenStage,
 )
@@ -222,15 +244,15 @@ def stopTestServer():
 )
 
 AyonCppApiPrj.creat_stage_group(
-    "BuildAndBnech",
+    "BuildAndBench",
     SetTestVars,
     BuildStage,
     SetupTestServer,
     BenchStage,
     StopTestServer,
 )
 AyonCppApiPrj.creat_stage_group(
-    "CleanBuildAndBnech",
+    "CleanBuildAndBench",
     CleanUpStage,
     SetTestVars,
     BuildStage,
@@ -239,7 +261,7 @@ def stopTestServer():
     StopTestServer,
 )
 AyonCppApiPrj.creat_stage_group(
-    "CleanBuildAndBnechPlusTest",
+    "CleanBuildAndBenchPlusTest",
     CleanUpStage,
     SetTestVars,
     BuildStage,

CMakeLists.txt

@@ -9,6 +9,9 @@ set(AR_PROJECT_NAME AyonCppApi)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+if(NOT DEFINED JTRACE)
+  set(JTRACE 0)
+endif()
 add_compile_definitions(JTRACE=${JTRACE})
 
 option(BUILD_TEST "Build the test application" OFF)
@@ -35,23 +38,22 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}/ext/json/include")
 
 set(AYON_CPPTOOLS_BUILD_LOGGER 1)
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/ayon-cpp-dev-tools")
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/ext/ayon-cpp-dev-tools/src/")
-
 
 project(${AR_PROJECT_NAME} VERSION 1.0.0 LANGUAGES CXX)
 
-if(AYON_CPP_API_ENALBE_GTEST)
+if(AYON_CPP_API_ENABLE_GTEST)
   add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/googletest")
 endif()
-if(AYON_CPP_API_ENALBE_GBENCH)
+if(AYON_CPP_API_ENABLE_GBENCH)
   add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/ext/benchmark")
 endif()
 
-if(AYON_CPP_API_ENALBE_GTEST OR AYON_CPP_API_ENALBE_GBENCH)
+if(AYON_CPP_API_ENABLE_GTEST OR AYON_CPP_API_ENABLE_GBENCH)
   add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/test")  
 endif()
 
 
 add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/src/AyonCppApi")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/src/AyonCppApi")
 
+target_link_libraries(AyonCppApi PUBLIC AyonCppDevToolsLib)