Debugged the .ci.cmake script for prebuilt binaries on my own computer, this time ought to surely work, I hope.

3 files changed, 39 insertions, 74 deletions

diff --git a/.ci.cmake b/.ci.cmake
index bff3123c..efe1f94a 100644
--- a/.ci.cmake
+++ b/.ci.cmake
@@ -11,7 +11,7 @@ include(FindGit)
 set(CTEST_GIT_COMMAND "${GIT_EXECUTABLE}")
 
 ctest_start("Experimental")
-ctest_update()
+#ctest_update()
 message(STATUS "NOTE: CTEST_CONFIGURE_OPTIONS are '${CTEST_CONFIGURE_OPTIONS}'")
 ctest_configure(OPTIONS "${CTEST_CONFIGURE_OPTIONS}")
 ctest_build(TARGET _hl)
@@ -35,12 +35,18 @@ if(NOT CTEST_DISABLE_TESTING)
 endif()
 if(WIN32)
   if(EXISTS "prebuilt/bin/Release/llfio_dl-2.0-Windows-AMD64-Release.dll")
+    file(DOWNLOAD "https://github.com/ned14/outcome/tarball/better_optimisation" "${CMAKE_CURRENT_LIST_DIR}/outcome.tgz")
+    file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "${CMAKE_CURRENT_LIST_DIR}/quickcpplib.tgz")
+    checked_execute_process("Tarring up binaries 0"
+      COMMAND "${CMAKE_COMMAND}" -E tar xfz "outcome.tgz"
+      COMMAND "${CMAKE_COMMAND}" -E tar xfz "quickcpplib.tgz"
+    )
     checked_execute_process("Tarring up binaries 1"
       COMMAND "${CMAKE_COMMAND}" -E make_directory llfio/prebuilt/bin/Release
       COMMAND "${CMAKE_COMMAND}" -E make_directory llfio/prebuilt/lib/Release
-      COMMAND "${CMAKE_COMMAND}" -E copy_directory doc llfio/
-      COMMAND "${CMAKE_COMMAND}" -E copy_directory example llfio/
-      COMMAND "${CMAKE_COMMAND}" -E copy_directory include llfio/
+      COMMAND "${CMAKE_COMMAND}" -E copy_directory doc llfio/doc/
+      COMMAND "${CMAKE_COMMAND}" -E copy_directory example llfio/example/
+      COMMAND "${CMAKE_COMMAND}" -E copy_directory include llfio/include/
     )
     checked_execute_process("Tarring up binaries 2"
       COMMAND "${CMAKE_COMMAND}" -E copy Build.md llfio/
@@ -69,13 +75,9 @@ if(WIN32)
         COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/bin/Release/ntkernel-error-category_dl-1.0-Windows-AMD64-Release.dll llfio/prebuilt/bin/Release/
       )
     endif()
-    file(DOWNLOAD "https://github.com/ned14/outcome/tarball/better_optimisation" "outcome.tgz")
-    file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "quickcpplib.tgz")
     checked_execute_process("Tarring up binaries 9"
-      COMMAND "${CMAKE_COMMAND}" -E tar xfz "outcome.tgz" "llfio/include/"
-      COMMAND "${CMAKE_COMMAND}" -E tar xfz "quickcpplib.tgz" "llfio/include/"
-      COMMAND bash -c "mv llfio/include/ned14-outcome* llfio/include/outcome"
-      COMMAND bash -c "mv llfio/include/ned14-quickcpplib* llfio/include/quickcpplib"
+      COMMAND bash -c "mv ned14-outcome* llfio/include/outcome"
+      COMMAND bash -c "mv ned14-quickcpplib* llfio/include/quickcpplib"
     )
     checked_execute_process("Tarring up binaries final"
       COMMAND "${CMAKE_COMMAND}" -E tar cfv llfio-v2.0-binaries-win64.zip --format=zip llfio/
@@ -84,6 +86,12 @@ if(WIN32)
   endif()
 else()
   if(EXISTS "prebuilt/lib/libllfio_dl-2.0-Linux-x86_64-Release.so")
+    file(DOWNLOAD "https://github.com/ned14/outcome/tarball/better_optimisation" "${CMAKE_CURRENT_LIST_DIR}/outcome.tgz")
+    file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "${CMAKE_CURRENT_LIST_DIR}/quickcpplib.tgz")
+    checked_execute_process("Tarring up binaries 0"
+      COMMAND "${CMAKE_COMMAND}" -E tar xfz "outcome.tgz"
+      COMMAND "${CMAKE_COMMAND}" -E tar xfz "quickcpplib.tgz"
+    )
     checked_execute_process("Tarring up binaries 1"
       COMMAND mkdir llfio
       COMMAND cp -a doc llfio/
@@ -97,13 +105,9 @@ else()
       COMMAND cp -a --parents prebuilt/lib/libllfio_sl-2.0-Linux-x86_64-Release.a llfio/
       COMMAND cp -a --parents prebuilt/lib/libllfio_dl-2.0-Linux-x86_64-Release.so llfio/
     )
-    file(DOWNLOAD "https://github.com/ned14/outcome/tarball/better_optimisation" "outcome.tgz")
-    file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "quickcpplib.tgz")
     checked_execute_process("Tarring up binaries 2"
-      COMMAND "${CMAKE_COMMAND}" -E tar xfz "outcome.tgz" "llfio/include/"
-      COMMAND "${CMAKE_COMMAND}" -E tar xfz "quickcpplib.tgz" "llfio/include/"
-      COMMAND bash -c "mv llfio/include/ned14-outcome* llfio/include/outcome"
-      COMMAND bash -c "mv llfio/include/ned14-quickcpplib* llfio/include/quickcpplib"
+      COMMAND bash -c "mv ned14-outcome* llfio/include/outcome"
+      COMMAND bash -c "mv ned14-quickcpplib* llfio/include/quickcpplib"
     )
     checked_execute_process("Tarring up binaries 3"
       COMMAND "${CMAKE_COMMAND}" -E tar cfz llfio-v2.0-binaries-linux-x64.tgz llfio
@@ -111,6 +115,12 @@ else()
     get_filename_component(toupload llfio-v2.0-binaries-linux-x64.tgz ABSOLUTE)
   endif()
   if(EXISTS "prebuilt/lib/libllfio_dl-2.0-Linux-armhf-Release.so")
+    file(DOWNLOAD "https://github.com/ned14/outcome/tarball/better_optimisation" "${CMAKE_CURRENT_LIST_DIR}/outcome.tgz")
+    file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "${CMAKE_CURRENT_LIST_DIR}/quickcpplib.tgz")
+    checked_execute_process("Tarring up binaries 0"
+      COMMAND "${CMAKE_COMMAND}" -E tar xfz "outcome.tgz"
+      COMMAND "${CMAKE_COMMAND}" -E tar xfz "quickcpplib.tgz"
+    )
     checked_execute_process("Tarring up binaries 1"
       COMMAND mkdir llfio
       COMMAND cp -a doc llfio/
@@ -124,13 +134,9 @@ else()
       COMMAND cp -a --parents prebuilt/lib/libllfio_sl-2.0-Linux-armhf-Release.a llfio/
       COMMAND cp -a --parents prebuilt/lib/libllfio_dl-2.0-Linux-armhf-Release.so llfio/
     )
-    file(DOWNLOAD "https://github.com/ned14/outcome/tarball/better_optimisation" "outcome.tgz")
-    file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "quickcpplib.tgz")
     checked_execute_process("Tarring up binaries 2"
-      COMMAND "${CMAKE_COMMAND}" -E tar xfz "outcome.tgz" "llfio/include/"
-      COMMAND "${CMAKE_COMMAND}" -E tar xfz "quickcpplib.tgz" "llfio/include/"
-      COMMAND bash -c "mv llfio/include/ned14-outcome* llfio/include/outcome"
-      COMMAND bash -c "mv llfio/include/ned14-quickcpplib* llfio/include/quickcpplib"
+      COMMAND bash -c "mv ned14-outcome* llfio/include/outcome"
+      COMMAND bash -c "mv ned14-quickcpplib* llfio/include/quickcpplib"
     )
     checked_execute_process("Tarring up binaries 3"
       COMMAND "${CMAKE_COMMAND}" -E tar cfz llfio-v2.0-binaries-linux-armhf.tgz llfio
@@ -138,6 +144,12 @@ else()
     get_filename_component(toupload llfio-v2.0-binaries-linux-armhf.tgz ABSOLUTE)
   endif()
   if(EXISTS "prebuilt/lib/libllfio_dl-2.0-Darwin-x86_64-Release.dylib")
+    file(DOWNLOAD "https://github.com/ned14/outcome/tarball/better_optimisation" "${CMAKE_CURRENT_LIST_DIR}/outcome.tgz")
+    file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "${CMAKE_CURRENT_LIST_DIR}/quickcpplib.tgz")
+    checked_execute_process("Tarring up binaries 0"
+      COMMAND "${CMAKE_COMMAND}" -E tar xfz "outcome.tgz"
+      COMMAND "${CMAKE_COMMAND}" -E tar xfz "quickcpplib.tgz"
+    )
     checked_execute_process("Tarring up binaries 1"
       COMMAND mkdir llfio
       COMMAND cp -a doc llfio/
@@ -152,13 +164,9 @@ else()
       COMMAND cp -a prebuilt/lib/libllfio_sl-2.0-Darwin-x86_64-Release.a llfio/prebuilt/lib/
       COMMAND cp -a prebuilt/lib/libllfio_dl-2.0-Darwin-x86_64-Release.dylib llfio/prebuilt/lib/
     )
-    file(DOWNLOAD "https://github.com/ned14/outcome/tarball/better_optimisation" "outcome.tgz")
-    file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "quickcpplib.tgz")
     checked_execute_process("Tarring up binaries 2"
-      COMMAND "${CMAKE_COMMAND}" -E tar xfz "outcome.tgz" "llfio/include/"
-      COMMAND "${CMAKE_COMMAND}" -E tar xfz "quickcpplib.tgz" "llfio/include/"
-      COMMAND bash -c "mv llfio/include/ned14-outcome* llfio/include/outcome"
-      COMMAND bash -c "mv llfio/include/ned14-quickcpplib* llfio/include/quickcpplib"
+      COMMAND bash -c "mv ned14-outcome* llfio/include/outcome"
+      COMMAND bash -c "mv ned14-quickcpplib* llfio/include/quickcpplib"
     )
     checked_execute_process("Tarring up binaries 3"
       COMMAND "${CMAKE_COMMAND}" -E tar cfz llfio-v2.0-binaries-darwin-x64.tgz llfio
diff --git a/example/single-header.cpp.disabled b/example/single-header.cpp.disabled
deleted file mode 100644
index 5160ed99..00000000
--- a/example/single-header.cpp.disabled
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Sanity check on the single file edition
-(C) 2018 Niall Douglas <http://www.nedproductions.biz/> (2 commits)
-File Created: Jun 2018
-
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License in the accompanying file
-Licence.txt or at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-Distributed under the Boost Software License, Version 1.0.
-    (See accompanying file Licence.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-#if __has_include("../single-header/llfio-win.hpp") && (_HAS_CXX17 || __cplusplus >= 201700)
-#ifdef _WIN32
-#include "../single-header/llfio-win.hpp"
-#else
-#include "../single-header/llfio-posix.hpp"
-#endif
-
-int main()
-{
-  LLFIO_V2_NAMESPACE::mapped_file_handle v;
-  (void) v;
-  return 0;
-}
-#else
-int main()
-{
-  return 0;
-}
-#endif
diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp
index 2bfed716..6e590e9d 100644
--- a/include/llfio/revision.hpp
+++ b/include/llfio/revision.hpp
@@ -1,4 +1,4 @@
 // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
-#define LLFIO_PREVIOUS_COMMIT_REF    6c384945a87cc4f20ce6012e74f94936c7356201
-#define LLFIO_PREVIOUS_COMMIT_DATE   "2020-11-24 14:00:49 +00:00"
-#define LLFIO_PREVIOUS_COMMIT_UNIQUE 6c384945
+#define LLFIO_PREVIOUS_COMMIT_REF    cec7539cc88eee83d5d5059de730f8a9ea86d355
+#define LLFIO_PREVIOUS_COMMIT_DATE   "2020-11-25 17:35:45 +00:00"
+#define LLFIO_PREVIOUS_COMMIT_UNIQUE cec7539c