From 8ac1a6f72b0c10d49abc1023d811a9f678cd2e15 Mon Sep 17 00:00:00 2001 From: Fred Brennan Date: Sat, 28 Jan 2023 06:34:31 -0500 Subject: [PATCH] Use Git submodules instead of git clones at pull time --- .github/download-dependencies.sh | 8 ++------ .gitmodules | 15 +++++++++++++++ README.md | 7 ++----- import/flre | 1 + import/pasdblstrutils | 1 + import/synapse | 1 + internettools | 1 + rcmdline | 1 + 8 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 .gitmodules create mode 160000 import/flre create mode 160000 import/pasdblstrutils create mode 160000 import/synapse create mode 160000 internettools create mode 160000 rcmdline diff --git a/.github/download-dependencies.sh b/.github/download-dependencies.sh index 2aa4d70..bea5715 100755 --- a/.github/download-dependencies.sh +++ b/.github/download-dependencies.sh @@ -1,7 +1,3 @@ #!/bin/bash -mkdir -p import -git clone https://github.com/benibela/flre.git import/flre -mkdir -p import/pasdblstrutils/src && curl https://raw.githubusercontent.com/BeRo1985/pasdblstrutils/master/src/PasDblStrUtils.pas > import/pasdblstrutils/src/PasDblStrUtils.pas -git clone https://github.com/benibela/ararat-synapse.git import/synapse -git clone https://github.com/benibela/rcmdline.git rcmdline -git clone https://github.com/benibela/internettools.git internettools +git submodule init +git submodule update diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0302ccb --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "import/flre"] + path = import/flre + url = https://github.com/benibela/flre.git +[submodule "import/synapse"] + path = import/synapse + url = https://github.com/benibela/ararat-synapse.git +[submodule "rcmdline"] + path = rcmdline + url = https://github.com/benibela/rcmdline.git +[submodule "internettools"] + path = internettools + url = https://github.com/benibela/internettools.git +[submodule "import/pasdblstrutils"] + path = import/pasdblstrutils + url = https://github.com/BeRo1985/pasdblstrutils diff --git a/README.md b/README.md index e5c7967..8265df2 100644 --- a/README.md +++ b/README.md @@ -38,11 +38,8 @@ Screenshots

Compilation and Installation ------------ +---------------------------- You can compile it by calling `build.sh` and install it by calling `build.sh -t`. Alternatively you can compile it with the Lazarus IDE. -You can call the commands from the [.travis.yml](.travis.yml) script to download dependencies. - - - +Don't forget to pull git submodules (see `.github/download-dependencies.sh` script) to download dependencies. diff --git a/import/flre b/import/flre new file mode 160000 index 0000000..3e926d4 --- /dev/null +++ b/import/flre @@ -0,0 +1 @@ +Subproject commit 3e926d45d4352f1b7c7cd411ccd625df117dad5c diff --git a/import/pasdblstrutils b/import/pasdblstrutils new file mode 160000 index 0000000..1696f0a --- /dev/null +++ b/import/pasdblstrutils @@ -0,0 +1 @@ +Subproject commit 1696f0a2b822fef26c8992f96620f1be129cfa99 diff --git a/import/synapse b/import/synapse new file mode 160000 index 0000000..7a77db9 --- /dev/null +++ b/import/synapse @@ -0,0 +1 @@ +Subproject commit 7a77db926de66809080bada68b54172da7f84c0e diff --git a/internettools b/internettools new file mode 160000 index 0000000..dd972ca --- /dev/null +++ b/internettools @@ -0,0 +1 @@ +Subproject commit dd972caaa4415468fa679ea7262976ead3fd3e38 diff --git a/rcmdline b/rcmdline new file mode 160000 index 0000000..ea02b77 --- /dev/null +++ b/rcmdline @@ -0,0 +1 @@ +Subproject commit ea02b770c4568717dd7b3b72da191a8bbcb4c751