Skip to content

Commit

Permalink
all: rename Poac to Cabin
Browse files Browse the repository at this point in the history
  • Loading branch information
ken-matsui committed Dec 28, 2024
1 parent d45a909 commit 9be8245
Show file tree
Hide file tree
Showing 48 changed files with 283 additions and 309 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ assignees: ''

---

**Certify that you tried to find the same problem on [Issues](https://github.com/poac-dev/poac/issues), [PRs](https://github.com/poac-dev/poac/pulls), and [Discussions](https://github.com/orgs/poac-dev/discussions)** (this is important for us to reduce workload)
**Certify that you tried to find the same problem on [Issues](https://github.com/cabinpkg/cabin/issues), [PRs](https://github.com/cabinpkg/cabin/pulls), and [Discussions](https://github.com/orgs/cabinpkg/discussions)** (this is important for us to reduce workload)
- [ ] I certify that I looked for the same issue and couldn't find it to the best of my knowledge.

**Describe the bug**
Expand All @@ -24,7 +24,7 @@ If applicable, add screenshots to help explain your problem.

**Environment (please complete the following information):**
- OS: [e.g. macOS Sonoma]
- Poac Version [e.g. 0.9.3]
- Cabin Version [e.g. 0.9.3]

**Additional context**
Add any other context about the problem here.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Complete the following checklist and remove it from the description.

## Checklist

- [ ] Did you follow [CONTRIBUTING.md](https://github.com/poac-dev/poac/blob/main/CONTRIBUTING.md)?
- [ ] Did you follow [Pull Request Style](https://github.com/poac-dev/poac/blob/main/CONTRIBUTING.md#pull-request-style)?
- [ ] Did you follow [CONTRIBUTING.md](https://github.com/cabinpkg/cabin/blob/main/CONTRIBUTING.md)?
- [ ] Did you follow [Pull Request Style](https://github.com/cabinpkg/cabin/blob/main/CONTRIBUTING.md#pull-request-style)?
24 changes: 12 additions & 12 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:

env:
POAC_TERM_COLOR: always
CABIN_TERM_COLOR: always
CXX: g++-13

permissions:
Expand All @@ -21,7 +21,7 @@ jobs:
- name: Setup dependencies
uses: ./.github/actions/setup-ubuntu-deps

- name: Build Poac
- name: Build Cabin
run: make RELEASE=1

- name: Install clang-tidy
Expand All @@ -31,10 +31,10 @@ jobs:
sudo ./llvm.sh 18
sudo apt-get install -y clang-tidy-18
- name: poac tidy
run: ./build/poac tidy --verbose
- name: cabin tidy
run: ./build/cabin tidy --verbose
env:
POAC_TIDY: clang-tidy-18
CABIN_TIDY: clang-tidy-18

format:
runs-on: ubuntu-24.04
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Setup dependencies
uses: ./.github/actions/setup-ubuntu-deps

- name: Build Poac
- name: Build Cabin
run: make RELEASE=1

- name: Install clang-format
Expand All @@ -54,10 +54,10 @@ jobs:
sudo ./llvm.sh 18
sudo apt-get install -y clang-format-18
- name: poac fmt
run: ./build/poac fmt --check --verbose --exclude srcOld --exclude testsOld
- name: cabin fmt
run: ./build/cabin fmt --check --verbose --exclude srcOld --exclude testsOld
env:
POAC_FMT: clang-format-18
CABIN_FMT: clang-format-18

lint:
runs-on: ubuntu-24.04
Expand All @@ -67,11 +67,11 @@ jobs:
- name: Setup dependencies
uses: ./.github/actions/setup-ubuntu-deps

- name: Build Poac
- name: Build Cabin
run: make RELEASE=1

- name: Install cpplint
run: sudo apt-get install -y cpplint

- name: poac lint
run: ./build/poac lint --verbose --exclude srcOld --exclude testsOld
- name: cabin lint
run: ./build/cabin lint --verbose --exclude srcOld --exclude testsOld
4 changes: 2 additions & 2 deletions .github/workflows/demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
- name: Print versions
run: make versions

- name: Build Poac
- name: Build Cabin
run: make RELEASE=1 -j4

- name: Install Poac
- name: Install Cabin
run: |
make PREFIX="$HOME/.local" install
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,5 @@ jobs:
- name: Install mkdocs
run: pip install mkdocs

- name: Setup Git
run: |
git config --global user.name 'poac-bot'
git config --global user.email '[email protected]'
- name: Publish docs
run: mkdocs gh-deploy --no-history
16 changes: 8 additions & 8 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:

env:
POAC_TERM_COLOR: always
CABIN_TERM_COLOR: always

permissions:
contents: read
Expand Down Expand Up @@ -66,22 +66,22 @@ jobs:
run: make test -j4

- name: Second Generation Build
run: ./build/poac build --verbose
run: ./build/cabin build --verbose

- name: Test the second generation
run: ./poac-out/debug/poac test --verbose
run: ./cabin-out/debug/cabin test --verbose

- name: Third Generation Build & Test
run: ./poac-out/debug/poac --verbose run --release test --verbose
run: ./cabin-out/debug/cabin --verbose run --release test --verbose

- name: Print Poac version
run: ./poac-out/debug/poac version --verbose
- name: Print Cabin version
run: ./cabin-out/debug/cabin version --verbose

- name: Create a new project with the third generation
run: ./poac-out/debug/poac new hello_world
run: ./cabin-out/debug/cabin new hello_world

- name: Run the new project
run: ../poac-out/debug/poac --verbose run
run: ../cabin-out/debug/cabin --verbose run
working-directory: hello_world

# - name: Print coverage
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:

env:
POAC_TERM_COLOR: always
CABIN_TERM_COLOR: always

permissions:
contents: read
Expand Down Expand Up @@ -35,24 +35,24 @@ jobs:
run: make test -j4

- name: Second Generation Build
run: ./build/poac build --verbose
run: ./build/cabin build --verbose

- name: Test the second generation
run: ./poac-out/debug/poac test --verbose
run: ./cabin-out/debug/cabin test --verbose

- name: Third Generation Build & Test
run: ./poac-out/debug/poac --verbose run --release test --verbose
run: ./cabin-out/debug/cabin --verbose run --release test --verbose

- name: Print Poac version
run: ./poac-out/debug/poac version --verbose
- name: Print Cabin version
run: ./cabin-out/debug/cabin version --verbose

- name: Create a new project with the third generation
run: ./poac-out/debug/poac new hello_world
run: ./cabin-out/debug/cabin new hello_world

- name: Run the new project
run: ../poac-out/debug/poac --verbose run
run: ../cabin-out/debug/cabin --verbose run
working-directory: hello_world

# - name: Test Poac
# - name: Test Cabin
# run: ctest --output-on-failure --verbose
# working-directory: build
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
# Make
build/

# Poac
poac-out/
# Cabin
cabin-out/

# Gcov
*.gcno
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Given our limited resources, we may not review PRs that fail to adhere to this document.

Note that we have a [code of conduct](https://github.com/poac-dev/.github/blob/main/CODE_OF_CONDUCT.md),
Note that we have a [code of conduct](https://github.com/cabinpkg/.github/blob/main/CODE_OF_CONDUCT.md),
follow it in all your interactions with the project.

You can ignore sections marked as "Under Construction".
Expand Down Expand Up @@ -60,15 +60,15 @@ standards by running the following tools:

1. Run the linter (`cpplint`)
```bash
poac lint --exclude srcOld --exclude testsOld
cabin lint --exclude srcOld --exclude testsOld
```
2. Run the formatter (`clang-format`)
```bash
poac fmt --exclude srcOld --exclude testsOld
cabin fmt --exclude srcOld --exclude testsOld
```
3. Run the static analyzer (`clang-tidy`)
```bash
poac tidy # or make tidy
cabin tidy # or make tidy
```

### Testing
Expand All @@ -77,7 +77,7 @@ Always validate your changes to ensure they do not introduce regressions or
break existing functionality:

```bash
poac test # or make test
cabin test # or make test
```

## Documentation
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ WORKDIR /app

COPY .clang-format .
COPY .clang-tidy .
COPY poac.toml .
COPY cabin.toml .
COPY .git .
COPY Makefile .
COPY src ./src/
Expand All @@ -25,6 +25,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential clang libfmt-dev libgit2-dev libcurl4-openssl-dev nlohmann-json3-dev libtbb-dev \
&& rm -rf /var/lib/apt/lists/*

COPY --from=builder /usr/local/bin/poac /usr/local/bin/poac
COPY --from=builder /usr/local/bin/cabin /usr/local/bin/cabin

CMD ["poac"]
CMD ["cabin"]
10 changes: 5 additions & 5 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Installing from Source

> [!CAUTION]
> This document explains how to build Poac from source. Building from source is not recommended unless you are familiar with the process. If your goal is simply to install Poac, refer to the [README.md](README.md) instead.
> This document explains how to build Cabin from source. Building from source is not recommended unless you are familiar with the process. If your goal is simply to install Cabin, refer to the [README.md](README.md) instead.
You will require the following compilers, commands, and libraries:

Expand All @@ -11,7 +11,7 @@ You will require the following compilers, commands, and libraries:
* Clang: `16` or later
* Apple Clang: provided by `macOS Ventura (13)` or later

(generally, the latest 3 versions are supported to build Poac.)
(generally, the latest 3 versions are supported to build Cabin.)

## Commands

Expand Down Expand Up @@ -66,10 +66,10 @@ When running Make, the following libraries will be installed automatically.

* [toml11](https://github.com/ToruNiina/toml11): [`v4.2.0`](https://github.com/ToruNiina/toml11/releases/tag/v4.2.0)

Once you have all the necessary requirements in place, you can build Poac by the following commands:
Once you have all the necessary requirements in place, you can build Cabin by the following commands:

```bash
git clone https://github.com/poac-dev/poac.git
cd poac
git clone https://github.com/cabinpkg/cabin.git
cd cabin
make RELEASE=1 -j$(nproc) install
```
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CXX ?= clang++
POAC_TIDY ?= clang-tidy
CABIN_TIDY ?= clang-tidy
PREFIX ?= /usr/local
INSTALL ?= install
COMMIT_HASH ?= $(shell git rev-parse HEAD)
Expand All @@ -16,8 +16,8 @@ else
endif

O := build
PROJECT := $(O)/poac
VERSION := $(shell grep -m1 version poac.toml | cut -f 2 -d'"')
PROJECT := $(O)/cabin
VERSION := $(shell grep -m1 version cabin.toml | cut -f 2 -d'"')
MKDIR_P := @mkdir -p

LIBGIT2_VERREQ := libgit2 >= 1.1.0, libgit2 < 1.9.0
Expand All @@ -26,10 +26,10 @@ NLOHMANN_JSON_VERREQ := nlohmann_json >= 3.10.5, nlohmann_json < 4.0.0
TBB_VERREQ := tbb >= 2021.5.0, tbb < 2023.0.0
FMT_VERREQ := fmt >= 8.1.1, fmt < 12.0.0

DEFINES := -DPOAC_POAC_PKG_VERSION='"$(VERSION)"' \
-DPOAC_POAC_COMMIT_HASH='"$(COMMIT_HASH)"' \
-DPOAC_POAC_COMMIT_SHORT_HASH='"$(COMMIT_SHORT_HASH)"' \
-DPOAC_POAC_COMMIT_DATE='"$(COMMIT_DATE)"'
DEFINES := -DCABIN_CABIN_PKG_VERSION='"$(VERSION)"' \
-DCABIN_CABIN_COMMIT_HASH='"$(COMMIT_HASH)"' \
-DCABIN_CABIN_COMMIT_SHORT_HASH='"$(COMMIT_SHORT_HASH)"' \
-DCABIN_CABIN_COMMIT_DATE='"$(COMMIT_DATE)"'
INCLUDES := -isystem $(O)/DEPS/toml11/include \
$(shell pkg-config --cflags '$(LIBGIT2_VERREQ)') \
$(shell pkg-config --cflags '$(LIBCURL_VERREQ)') \
Expand Down Expand Up @@ -86,7 +86,7 @@ test: $(UNITTEST_BINS)

$(O)/tests/test_%.o: src/%.cc $(GIT_DEPS)
$(MKDIR_P) $(@D)
$(CXX) $(CXXFLAGS) -MMD -DPOAC_TEST $(DEFINES) $(INCLUDES) -c $< -o $@
$(CXX) $(CXXFLAGS) -MMD -DCABIN_TEST $(DEFINES) $(INCLUDES) -c $< -o $@

-include $(UNITTEST_DEPS)

Expand Down Expand Up @@ -117,7 +117,7 @@ $(O)/tests/test_Manifest: $(O)/tests/test_Manifest.o $(O)/TermColor.o \
tidy: $(TIDY_TARGETS)

$(TIDY_TARGETS): tidy_%: src/% $(GIT_DEPS)
$(POAC_TIDY) $(POAC_TIDY_FLAGS) $< -- $(CXXFLAGS) $(DEFINES) -DPOAC_TEST $(INCLUDES)
$(CABIN_TIDY) $(CABIN_TIDY_FLAGS) $< -- $(CXXFLAGS) $(DEFINES) -DCABIN_TEST $(INCLUDES)

install: all
$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/bin
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

## Reporting a Vulnerability

Please go to <https://github.com/poac-dev/poac/security/advisories/new> to report a vulnerability.
Please go to <https://github.com/cabinpkg/cabin/security/advisories/new> to report a vulnerability.
8 changes: 4 additions & 4 deletions poac.toml → cabin.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
authors = ["Ken Matsui <[email protected]>"]
description = "A package manager and build system for C++"
documentation = "https://poac.dev/docs"
documentation = "https://docs.cabinpkg.com"
edition = "20"
homepage = "https://poac.dev"
homepage = "https://cabinpkg.com"
license = "Apache-2.0"
name = "poac"
name = "cabin"
readme = "README.md"
repository = "https://github.com/poac-dev/poac"
repository = "https://github.com/cabinpkg/cabin"
version = "0.10.1"

[dependencies]
Expand Down
8 changes: 4 additions & 4 deletions demo.tape
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@

Output demo.gif

Require poac
Require cabin

Set Shell "bash"
Set FontSize 32
Set Width 1600
Set Height 800

Type "poac version" Sleep 500ms Enter Sleep 1s
Type "poac new hello_world" Sleep 500ms Enter Sleep 1s
Type "cabin version" Sleep 500ms Enter Sleep 1s
Type "cabin new hello_world" Sleep 500ms Enter Sleep 1s
Type "cd hello_world" Sleep 500ms Enter Sleep 1s
Type "poac run" Sleep 500ms Enter Sleep 5s
Type "cabin run" Sleep 500ms Enter Sleep 5s
Loading

0 comments on commit 9be8245

Please sign in to comment.