simple cleanup (#973)

* cleanup files

* hide some public APIs

* merged CMakeLists.txt for headers

* fix build

* include cleanup

* include cleanup again

* address #944

* python cmake install

* iostream is still needed

* fix nix

.github/workflows/manifold.yml

@@ -27,7 +27,6 @@ jobs:
     env:
       CC: gcc-${{ matrix.gcc }}
       CXX: g++-${{ matrix.gcc }}
-    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/setup-python@v5
       with:
@@ -89,7 +88,6 @@ jobs:
   build_cbind:
     timeout-minutes: 30
     runs-on: ubuntu-22.04
-    if: github.event.pull_request.draft == false
     steps:
     - name: Install dependencies
       run: |
@@ -110,7 +108,6 @@ jobs:
   build_wasm:
     timeout-minutes: 30
     runs-on: ubuntu-22.04
-    if: github.event.pull_request.draft == false
     strategy:
       matrix:
         exception: [ON, OFF]
@@ -161,7 +158,6 @@ jobs:
         parallel_backend: [OFF, ON]
       max-parallel: 1
     runs-on: windows-2019
-    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - uses: jwlawson/actions-setup-cmake@v2
@@ -213,7 +209,6 @@ jobs:
       matrix:
         parallel_backend: [OFF, ON]
     runs-on: macos-latest
-    if: github.event.pull_request.draft == false
     steps:
     - name: Install common dependencies
       run: |
@@ -249,7 +244,6 @@ jobs:
         # disabling js variant for now
         variant: [none, tbb]
     runs-on: ubuntu-latest
-    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v22
@@ -258,7 +252,6 @@ jobs:
   build_nix_python:
     timeout-minutes: 30
     runs-on: ubuntu-latest
-    if: github.event.pull_request.draft == false
     steps:
     - uses: actions/checkout@v4
     - uses: cachix/install-nix-action@v22

.vscode/launch.json

@@ -13,11 +13,6 @@
       "args": [
         "--gtest_break_on_failure",
         "--gtest_catch_exceptions=0",
-<<<<<<< HEAD
-        "--gtest_filter=Polygon.MultiMerge"
-=======
-        "--gtest_filter=Samples.GyroidModule"
->>>>>>> fbf07bf92a1d8cb380aec321f920d1db5d772f20
       ],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}/build/test",
@@ -30,4 +25,4 @@
       "externalConsole": false
     }
   ]
-}
+}

CMakeLists.txt

@@ -125,7 +125,7 @@ else()
     set(WARNING_FLAGS -Wall -Wno-unused -Wno-array-bounds
       -Wno-stringop-overflow -Wno-alloc-size-larger-than)
   else()
-    set(WARNING_FLAGS -Wall -Wno-unused)
+    set(WARNING_FLAGS -Wall -Wno-unused -Wno-shorten-64-to-32)
   endif()
   if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -252,7 +252,6 @@ if(MANIFOLD_EXPORT)
 endif()
 
 add_subdirectory(src)
-add_subdirectory(include)
 add_subdirectory(bindings)
 add_subdirectory(samples)
 add_subdirectory(test)
@@ -337,6 +336,28 @@ install(FILES
   DESTINATION ${EXPORT_INSTALL_DIR}/manifold
   )
 
+# install public headers
+set(MANIFOLD_PUBLIC_HDRS
+  include/manifold/common.h
+  include/manifold/iters.h
+  include/manifold/manifold.h
+  include/manifold/optional_assert.h
+  include/manifold/parallel.h
+  include/manifold/polygon.h
+  include/manifold/vec_view.h
+  )
+
+if (MANIFOLD_CROSS_SECTION)
+  list(APPEND MANIFOLD_PUBLIC_HDRS include/manifold/cross_section.h)
+endif()
+
+if (MANIFOLD_EXPORT)
+  list(APPEND MANIFOLD_PUBLIC_HDRS include/manifold/meshIO.h)
+endif()
+
+install(FILES ${MANIFOLD_PUBLIC_HDRS}
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/manifold
+  )
 
 # PkgConfig file
 if(MANIFOLD_CROSS_SECTION)

bindings/python/CMakeLists.txt

@@ -70,7 +70,6 @@ if(MANIFOLD_PYBIND_STUBGEN)
     OUTPUT manifold3d.pyi
     PYTHON_PATH $<TARGET_FILE_DIR:manifold3d>
     DEPENDS manifold3d
-    MARKER_FILE py.typed
     PATTERN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/stub_pattern.txt
     )
 endif()
@@ -108,14 +107,12 @@ install(
   TARGETS manifold3d
   LIBRARY DESTINATION ${MANIFOLD_PYBIND_LIBDIR}
   COMPONENT bindings
-  EXCLUDE_FROM_ALL
   )
 if(MANIFOLD_PYBIND_STUBGEN)
   install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/py.typed ${CMAKE_CURRENT_BINARY_DIR}/manifold3d.pyi
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/manifold3d.pyi
     DESTINATION ${MANIFOLD_PYBIND_LIBDIR}
     COMPONENT bindings
-    EXCLUDE_FROM_ALL
     )
 endif()
 

flake.nix

@@ -45,7 +45,6 @@
                 assimp
               ];
               cmakeFlags = [
-                "-DMANIFOLD_PYBIND=ON"
                 "-DMANIFOLD_CBIND=ON"
                 "-DMANIFOLD_EXPORT=ON"
                 "-DBUILD_SHARED_LIBS=ON"
@@ -54,10 +53,7 @@
               checkPhase = ''
                 cd test
                 ./manifold_test
-                cd ../../
-                PYTHONPATH=$PYTHONPATH:$(pwd)/build/bindings/python python3 bindings/python/examples/run_all.py
-                PYTHONPATH=$PYTHONPATH:$(pwd)/build/bindings/python python3 -m pytest
-                cd build
+                cd ../
               '';
             };
           parallelBackends = [