Skip to content

Commit 343e51b

Browse files
committed
clean up repo root: move capnp schema, mkdocs config into subdirs
1 parent 1ec520e commit 343e51b

File tree

8 files changed

+12
-19
lines changed

8 files changed

+12
-19
lines changed

.dockerignore

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
.git
2-
.vscode
2+
.github
33
.claude
4+
.vscode
45
build
5-
external_cache
6+
output
7+
site
68
docs
7-
examples
89
recipe
9-
scripts
10-
*.md
11-
LICENSE

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Deploy docs
33
on:
44
push:
55
branches: [main]
6-
paths: [docs/**, mkdocs.yml]
6+
paths: [docs/**]
77

88
permissions:
99
contents: read
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
python-version: '3.12'
2424
- run: pip install mkdocs-material
25-
- run: mkdocs build
25+
- run: mkdocs build -f docs/mkdocs.yml
2626
- uses: actions/upload-pages-artifact@v3
2727
with:
2828
path: site

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ message(STATUS "Building CapnProto from bundled source")
139139
include_directories(${CAPNP_INSTALL_DIR}/include)
140140

141141
# Add index_lite.capnp generation (the only capnp schema used)
142-
set(LITE_CAPNP_SRC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/index_lite.capnp")
142+
set(LITE_CAPNP_SRC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/src/index_lite.capnp")
143143
set(LITE_CAPNP_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}")
144144
set(LITE_CAPNP_GEN_CPP "${LITE_CAPNP_GEN_DIR}/index_lite.capnp.c++")
145145
set(LITE_CAPNP_GEN_H "${LITE_CAPNP_GEN_DIR}/index_lite.capnp.h")

Dockerfile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,18 @@ RUN apt-get update && apt-get install -y \
1515
libboost-system-dev \
1616
libboost-date-time-dev \
1717
zlib1g-dev \
18+
libhts-dev \
1819
capnproto \
1920
libcapnp-dev \
20-
autoconf \
21-
automake \
22-
libtool \
2321
libeigen3-dev \
2422
&& rm -rf /var/lib/apt/lists/*
2523

26-
2724
WORKDIR /home/panmap
2825

2926
COPY . .
3027

31-
RUN mkdir -p build && \
32-
cd build && \
33-
cmake .. && make MAKEFLAGS= -j$(nproc)
28+
RUN mkdir -p build && cd build && cmake .. && make -j$(nproc)
3429

3530
ENV PATH="/home/panmap/build/bin:${PATH}"
3631

3732
CMD ["panmap"]
38-

mkdocs.yml renamed to docs/mkdocs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ site_name: panmap
22
site_description: Pangenome-based sequence placement, alignment, and genotyping
33
repo_url: https://github.com/amkram/panmap
44
repo_name: amkram/panmap
5+
docs_dir: .
6+
site_dir: ../site
57

68
theme:
79
name: material

recipe/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ include_directories(SYSTEM ${Protobuf_INCLUDE_DIRS})
3737
# ===== CapnProto code generation =====
3838
add_custom_target(capnp_tools ALL)
3939

40-
set(LITE_CAPNP_SRC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/index_lite.capnp")
40+
set(LITE_CAPNP_SRC_FILE "${CMAKE_CURRENT_SOURCE_DIR}/src/index_lite.capnp")
4141
set(LITE_CAPNP_GEN_DIR "${CMAKE_CURRENT_BINARY_DIR}")
4242
set(LITE_CAPNP_GEN_CPP "${LITE_CAPNP_GEN_DIR}/index_lite.capnp.c++")
4343
set(LITE_CAPNP_GEN_H "${LITE_CAPNP_GEN_DIR}/index_lite.capnp.h")
File renamed without changes.

version.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)