Skip to content

Commit 631ca5e

Browse files
committed
- [repo](src) Use git submodule for third party projects.
1 parent 395aaa0 commit 631ca5e

File tree

7 files changed

+15
-10
lines changed

7 files changed

+15
-10
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*private
22
local*
3-
dep
3+
sub/*
4+
!sub/module

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "sub/module/phpami"]
2+
path = sub/module/phpami
3+
url = https://github.com/ofbeaton/phpami.git

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
- [docker](README.md) Advancing documentation.
77
- [websms](src/websms) `WEBSMSD_PORT=80` sets PHP web server port, used by WebSMS.
88
- [repo](src) Harmonized file names in `entrypoint.d` and `exitpoint.d`.
9+
- [repo](src) Use git submodule for third party projects.
910

1011
# 0.8.0
1112

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ COPY src/*/bin $DOCKER_BIN_DIR/
4242
COPY src/*/entrypoint.d $DOCKER_ENTRY_DIR/
4343
COPY src/*/exitpoint.d $DOCKER_EXIT_DIR/
4444
COPY src/*/php $DOCKER_PHP_DIR/
45-
COPY dep/*/php $DOCKER_PHP_DIR/
45+
COPY sub/*/php $DOCKER_PHP_DIR/
4646
COPY src/*/config $DOCKER_SEED_CONF_DIR/
4747
COPY src/*/nft $DOCKER_SEED_NFT_DIR/
4848

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,15 @@ build: depends
4343
build_%: depends
4444
docker build $(BLD_ARG) --target $* -t $(BLD_REPO):$(call _version,$*,$(BLD_VER)) .
4545

46-
depends: Dockerfile dep/autoban/php/ami.class.inc
46+
depends: Dockerfile submodule sub/autoban/php/ami.class.inc
4747

4848

49-
dep/autoban/php/ami.class.inc:
50-
mkdir -p dep/autoban/php
51-
wget -O dep/autoban/php/ami.class.inc https://raw.githubusercontent.com/ofbeaton/phpami/master/src/Ami.php
49+
submodule:
50+
git submodule update --init --recursive
51+
52+
sub/autoban/php/ami.class.inc:
53+
mkdir -p sub/autoban/php
54+
cp sub/module/phpami/src/Ami.php sub/autoban/php/ami.class.inc
5255

5356
variables:
5457
make -pn | grep -A1 "^# makefile"| grep -v "^#\|^--" | sort | uniq

ROADMAP.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
- README.md
66

7-
## Dependencies
8-
9-
- Reorganize. Use git submodules?
10-
117
## PrivateDial
128

139
- Make IVR custom-able

sub/module/phpami

Submodule phpami added at a973668

0 commit comments

Comments
 (0)