completed exercise2 -read a sample text, clean the data, count the nu…

…mber of words and write to file

Jenkins/buildscript.py

@@ -19,7 +19,7 @@
 try:
     WORKSPACE = os.environ["WORKSPACE"]
 except KeyError:
-    print("WORKSPACE environment variable not found.\nThe build script assumes that a WORKSPACE environment variable points at the root of the source directory.")
+    print("WORKSPACE environment variable not found.\nThe builds script assumes that a WORKSPACE environment variable points at the root of the source directory.")
     sys.exit(1)
 
 PROJECTS_ROOT = os.path.abspath(os.path.join(WORKSPACE, "exercises-cpp"))
@@ -98,7 +98,7 @@ def build(build_root):
     Build the code in the build_root directory
     """
     if is_windows():
-        cmd = ["cmake", "--build", build_root, "--", "/nologo",
+        cmd = ["cmake", "--builds", build_root, "--", "/nologo",
                "/verbosity:minimal", "/p:Configuration=Release"]
     else:
         cmd = make_scl_command(["make", "-C", build_root])
@@ -113,12 +113,12 @@ def check_build_is_sane():
     generate_project(src_dir, dest_dir)
     print("Checking a sample project can be built")
     if build(dest_dir) != 0:
-        raise RuntimeError("Cannot build sample project")
+        raise RuntimeError("Cannot builds sample project")
 
 ################### Main #########################################################
 
 
-# Always perform a clean build
+# Always perform a clean builds
 if os.path.exists(BUILDS_ROOT):
     print(f"Removing {BUILDS_ROOT}")
     shutil.rmtree(BUILDS_ROOT)
@@ -132,7 +132,7 @@ def check_build_is_sane():
 check_build_is_sane()
 
 if len(dirnames) == 0:
-    raise RuntimeError("No projects found to build")
+    raise RuntimeError("No projects found to builds")
 
 statuses = []
 for dirname in dirnames:

exercises-cpp/jimoh_yusuf/CMakeLists.txt

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 cmake_minimum_required ( VERSION 3.5 )
+=======
+cmake_minimum_required ( VERSION 3.14 )
+>>>>>>> e139231 (completed exercise2 -read a sample text, clean the data, count the number of words and write to file)
 
 project(newstarter)
 

exercises-cpp/jimoh_yusuf/ex01_basics/CMakeLists.txt

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 cmake_minimum_required ( VERSION 3.5)
+=======
+cmake_minimum_required ( VERSION 2.8.5 )
+>>>>>>> e139231 (completed exercise2 -read a sample text, clean the data, count the number of words and write to file)
 
 ###############################################################################
 # Setup
@@ -7,24 +11,42 @@ cmake_minimum_required ( VERSION 3.5)
 project ( WordCounter )
 
 # Find custom cmake modules
+<<<<<<< HEAD
 set ( CMAKE_MODULE_PATH "../../../CMake")
 
 # Common setup
 
+=======
+set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../CMake")
+
+# Common setup
+include ( CommonSetup )
+>>>>>>> e139231 (completed exercise2 -read a sample text, clean the data, count the number of words and write to file)
 
 ###############################################################################
 # Executable
 ###############################################################################
 
 set ( SRC_FILES
+<<<<<<< HEAD
         src/main.cpp
+=======
+  src/main.cpp
+>>>>>>> e139231 (completed exercise2 -read a sample text, clean the data, count the number of words and write to file)
   # add any additional source files here
 )
 
 set ( HDR_FILES
+<<<<<<< HEAD
 
 
         # add any additional header files here
 )
 
 add_executable ( WordCounter ${SRC_FILES} ${HDR_FILES})
+=======
+  # add any additional header files here
+)
+
+add_executable ( WordCounter ${SRC_FILES} ${HDR_FILES} )
+>>>>>>> e139231 (completed exercise2 -read a sample text, clean the data, count the number of words and write to file)