Flush after every std::cerr and update Dockerfile

Author: glokta1

compiled_starters/cpp/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 
 project(shell-starter-cpp)
 
-file(GLOB_RECURSE SOURCE_FILES src/*.cpp)
+file(GLOB_RECURSE SOURCE_FILES src/*.cpp src/*.hpp)
 
 set(CMAKE_CXX_STANDARD 23) # Enable the C++23 standard
 

compiled_starters/cpp/src/main.cpp

@@ -1,12 +1,15 @@
 #include <iostream>
 
 int main() {
+  // Flush after every std::cout / std:cerr
+  std::cout << std::unitbuf;
+  std::cerr << std::unitbuf;
+
   // You can use print statements as follows for debugging, they'll be visible when running tests.
   std::cout << "Logs from your program will appear here!\n";
 
   // Uncomment this block to pass the first stage
   // std::cout << "$ ";
-  // std::cout.flush();
   //
   // std::string input;
   // std::getline(std::cin, input);

dockerfiles/cpp-23.Dockerfile

@@ -18,15 +18,15 @@ ENV CMAKE_BIN="/cmake/bin"
 ENV PATH="${CMAKE_BIN}:$PATH"
 
 RUN git clone https://github.com/microsoft/vcpkg.git && \
-    ./vcpkg/bootstrap-vcpkg.sh
+    ./vcpkg/bootstrap-vcpkg.sh -disableMetrics
 
 ENV VCPKG_ROOT="/vcpkg"
 ENV PATH="${VCPKG_ROOT}:$PATH"
 
 WORKDIR /app
 
-COPY vcpkg.json ./
-COPY vcpkg-configuration.json ./
+# .git & README.md are unique per-repository. We ignore them on first copy to prevent cache misses
+COPY --exclude=.git --exclude=README.md . /app
 
 RUN vcpkg install --no-print-usage
 RUN sed -i '1s/^/set(VCPKG_INSTALL_OPTIONS --no-print-usage)\n/' ${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake
@@ -36,4 +36,7 @@ RUN if [ -d "/app/build" ]; then mv /app/build /app-cached; fi
 RUN if [ -d "/app/vcpkg_installed" ]; then mv /app/vcpkg_installed /app-cached/build; fi
 
 RUN echo "cd \${CODECRAFTERS_SUBMISSION_DIR} && cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake && cmake --build ./build && sed -i '/^cmake/ s/^/# /' ./your_shell.sh" > /codecrafters-precompile.sh
-RUN chmod +x /codecrafters-precompile.sh
+RUN chmod +x /codecrafters-precompile.sh
+
+# Once the heavy steps are done, we can copy all files back
+COPY . /app

solutions/cpp/01-oo8/code/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 
 project(shell-starter-cpp)
 
-file(GLOB_RECURSE SOURCE_FILES src/*.cpp)
+file(GLOB_RECURSE SOURCE_FILES src/*.cpp src/*.hpp)
 
 set(CMAKE_CXX_STANDARD 23) # Enable the C++23 standard
 

solutions/cpp/01-oo8/code/src/main.cpp

@@ -1,8 +1,11 @@
 #include <iostream>
 
 int main() {
+  // Flush after every std::cout / std:cerr
+  std::cout << std::unitbuf;
+  std::cerr << std::unitbuf;
+
   std::cout << "$ ";
-  std::cout.flush();
 
   std::string input;
   std::getline(std::cin, input);

solutions/cpp/01-oo8/diff/src/main.cpp.diff

@@ -1,15 +1,17 @@
-@@ -1,13 +1,9 @@
+@@ -1,16 +1,12 @@
  #include <iostream>
 
  int main() {
+   // Flush after every std::cout / std:cerr
+   std::cout << std::unitbuf;
+   std::cerr << std::unitbuf;
+
 -  // You can use print statements as follows for debugging, they'll be visible when running tests.
 -  std::cout << "Logs from your program will appear here!\n";
 +  std::cout << "$ ";
-+  std::cout.flush();
 
 -  // Uncomment this block to pass the first stage
 -  // std::cout << "$ ";
--  // std::cout.flush();
 -  //
 -  // std::string input;
 -  // std::getline(std::cin, input);

solutions/cpp/01-oo8/explanation.md

@@ -5,7 +5,6 @@ Study and uncomment the relevant code:
 ```cpp
 // Uncomment this block to pass the first stage
 std::cout << "$ ";
-std::cout.flush();
 
 std::string input;
 std::getline(std::cin, input);

starter_templates/cpp/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13)
 
 project(shell-starter-cpp)
 
-file(GLOB_RECURSE SOURCE_FILES src/*.cpp)
+file(GLOB_RECURSE SOURCE_FILES src/*.cpp src/*.hpp)
 
 set(CMAKE_CXX_STANDARD 23) # Enable the C++23 standard
 

starter_templates/cpp/src/main.cpp

@@ -1,12 +1,15 @@
 #include <iostream>
 
 int main() {
+  // Flush after every std::cout / std:cerr
+  std::cout << std::unitbuf;
+  std::cerr << std::unitbuf;
+
   // You can use print statements as follows for debugging, they'll be visible when running tests.
   std::cout << "Logs from your program will appear here!\n";
 
   // Uncomment this block to pass the first stage
   // std::cout << "$ ";
-  // std::cout.flush();
   //
   // std::string input;
   // std::getline(std::cin, input);