Commit Graph

38 Commits (2923cf7d2114df2578227202a36746df7d9bff3a)

Author SHA1 Message Date
Josh Cooper cd7fe8a213 Update .gitmodules
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2022-11-25 09:43:04 -08:00
Josh Cooper 268719ed1f Integrates googletest 2022-11-25 09:43:04 -08:00
lethosor 9ca2eaa794
Disable shallow clones in .gitmodules
Shallow clones cause issues with `git push --recurse-submodules=check|on-demand`
such as in https://github.com/DFHack/dfhack/runs/3307192897?check_suite_focus=true:

```
The following submodule paths contain changes that can
not be found on any remote:
  depends/luacov

Please try

    git push --recurse-submodules=on-demand

or cd to the path and use

    git push

to push them to a remote.
```

(in this case, the changes *are* on the remote, and on-demand doesn't help)

Our submodules also aren't currently very large on disk even with full clones -
libexpat is the largest:

616K    .git/modules/depends/clsocket
744K    .git/modules/depends/luacov
924K    .git/modules/depends/xlsxio
1.8M    .git/modules/depends/libzip
3.7M    .git/modules/depends/jsoncpp
8.2M    .git/modules/depends/libexpat

If a shallow clone of submodules is desired, `git clone --shallow-submodules` is
still an option.
2021-08-11 21:54:05 -04:00
lethosor 9d723dc256
Switch to DFHack luacov fork
Fixes behavior of `push.recurseSubmodules`: since the commit we track is
currently only a tag (v0.15.0), pushing with `recurseSubmodules = check` fails
since that checks that submodule commits are on a branch. In our own fork, we
can add a `dfhack` branch that resolves this issue, which is consistent with
other dependencies.
2021-04-03 18:12:09 -04:00
myk002 d6cefcb00a
fix luacov to v0.15.0 release 2021-03-07 08:15:05 -08:00
myk002 a68c73e140
add the luacov repository itself 2021-03-07 08:15:05 -08:00
myk002 439173248f
add luacov as a dependency 2021-03-07 08:15:05 -08:00
lethosor 64b1202119
Fix some CMake warnings and extraneous output 2020-09-19 01:17:25 -04:00
lethosor f354f7800f
Switch to DFHack forks of lipzip and xlsxio, and update
libzip: upgraded to 1.7.3 (was between 1.7.1 and 1.7.2)
xlsxio: downgraded to latest release (0.2.29), which should be inconsequential: https://github.com/brechtsanders/xlsxio/compare/0.2.29...2d12a88
2020-09-17 21:00:16 -04:00
Myk Taylor 8de39c2d7d add libexpat as a submodule 2020-08-08 20:09:29 -07:00
Myk Taylor 4f0eb4bca6 add libzip dep 2020-08-08 19:47:02 -07:00
Myk Taylor b033e4644f add xlsxio as a submodule 2020-08-07 12:44:40 -07:00
Ben Lubar ceaa457460
point the git module at the DFHack fork of the jsoncpp repository for consistency 2020-01-31 13:43:57 -06:00
Lethosor 6b067bbba8
Use relative submodule path 2018-06-29 22:29:12 -04:00
Pauli 2b79b4cce7 Use jsoncpp 1.8.4 as a submodule
This makes jsoncpp a submodule that can be build directly from git
sources. This changes depends/jsoncpp to depends/jsoncpp-sub to avoid
filename conflict if someone tries to use git bisect.

jsoncpp library name changes to jsoncpp_lib_static.

jsoncpp version is the latest tagged release.
2018-06-14 21:20:46 +03:00
Ben Lubar 8f609d0ddf
Replace submodule URLs with relative URLs
They will be downloaded via the same transport as the main repo (HTTPS or SSH, usually)
2018-04-23 18:56:29 -05:00
lethosor 85a920d1df Re-add the scripts submodule, with a different internal name
This will break existing clones when using git versions before 1.8.1, which do
not support the --name option of "git submodule add", unless steps are taken to
remove the old scripts submodules in .git/modules (see Compile.rst).
2016-06-29 19:07:45 -04:00
lethosor af906d6582 Remove library/scripts submodule 2016-06-29 19:06:00 -04:00
lethosor 27a84a8246 Move scripts to library/scripts
git can't cope with replacing scripts/3rdparty/* submodules with a single
scripts submodule.
2016-06-15 18:45:08 -04:00
lethosor 53440a6f0d Add scripts submodule 2016-06-14 19:43:06 -04:00
lethosor 6258870e2c Remove scripts/ folder 2016-06-14 19:40:48 -04:00
PeridexisErrant 291787a019 Remove df2mc plugin (obsolete)
It's still got it's own repo, but it hasn't been compatible with
Minecraft for years and shouldn't be in the DFHack repo.
2015-11-17 11:13:20 +09:30
expwnent 4190ba3259 Fix .gitmodules. 2015-09-21 20:38:31 -04:00
expwnent 0568edb6e3 Attempt to fix gitmodule remote urls manually. 2015-09-21 19:39:01 -04:00
expwnent dc4dc54912 Add third party script submodules. 2015-09-21 19:34:16 -04:00
lethosor 2fcf751a44 Use DFHack fork of lethosor-scripts 2015-09-14 16:56:09 -04:00
lethosor 418d2831ef Add a framework for including 3rd-party script repos
Repos need to include a CMakeLists.txt file with calls to the
DFHACK_SCRIPTS macro, which functions similarly to DFHACK_PLUGIN.

The `open-legends` script from lethosor/dfhack-scripts is included
as an example.
2015-08-06 21:50:01 -04:00
lethosor d02e67267a Replace jsonxx with jsoncpp 2015-07-29 15:50:33 -04:00
lethosor d382d94cbc Use git:// url in .gitmodules 2015-03-20 20:26:24 -04:00
lethosor f3508f82c1 Add jsonxx to depends/ 2015-03-20 15:45:38 -04:00
Alexander Gavrilov 9c0fb61fd1 Fix the default submodule paths to point at the DFHack organization. 2014-03-24 20:28:35 +04:00
Petr Mrázek c361ba7bf4 Sync, fix isoworld in .gitmodules 2013-04-02 19:19:29 +02:00
Petr Mrázek 9079ffa4ff Add clsocket as a dependency for dfhack lib. 2012-03-13 17:10:46 +01:00
Petr Mrázek f2a69188ea Use submodule for memory structure definitions (df-structures). 2012-01-01 03:34:29 +01:00
Petr Mrázek 25257fe598 Move df2mc back. 2011-11-05 02:00:51 +01:00
Petr Mrázek 2dfee0a9f9 Move df2mc to devel 2011-10-30 19:56:08 +01:00
Petr Mrázek 13ca2e608f Added df2mc (TroZ) and drybuckets (Quietust) plugins 2011-10-30 02:50:29 +01:00
Petr Mrázek d451c6910b Add stonesense as a submodule, fix MSVC build of vdig module 2011-08-28 22:28:23 +02:00