Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added submodules, fixes #291 #292

Merged
merged 1 commit into from
Jan 3, 2022
Merged

Added submodules, fixes #291 #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/generator/vendor/
/generator/build/
/generator/doc/doc-en/
/generator/doc/entities/generated.ent
/composer.lock
vendor/
Expand Down
6 changes: 6 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "generator/doc/doc-en/doc-base"]
path = generator/doc/doc-en/doc-base
url = https://github.com/salathe/phpdoc-base
[submodule "generator/doc/doc-en/en"]
path = generator/doc/doc-en/en
url = https://github.com/php/doc-en
1 change: 1 addition & 0 deletions generator/doc/doc-en/doc-base
Open in desktop
Submodule doc-base added at 851670
1 change: 1 addition & 0 deletions generator/doc/doc-en/en
Open in desktop
Submodule en added at d5d4f1
15 changes: 4 additions & 11 deletions generator/doc/update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
if [ ! -d "doc-en" ]; then
mkdir doc-en
cd doc-en
git clone https://github.com/salathe/phpdoc-base doc-base
git clone https://github.com/php/doc-en en
else
cd doc-en/en
git pull
cd ../doc-base
git pull
fi
#!/usr/bin/env sh

git submodule init
git submodule update --remote --merge