From 28cb18f8f7f2343bc712c94758d4c31b7a2cca11 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 26 Aug 2019 00:13:15 +0900 Subject: [PATCH] Add submodules --- .gitmodules | 15 +++++++++++++++ CreateRelease.cmd | 11 ++++++++--- Externals/freeimage | 1 + Externals/frhed | 1 + Externals/patch | 1 + Externals/sevenzip | 1 + Externals/winimerge | 1 + 7 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 Externals/freeimage create mode 160000 Externals/frhed create mode 160000 Externals/patch create mode 160000 Externals/sevenzip create mode 160000 Externals/winimerge diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..4dc06800e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,15 @@ +[submodule "Externals/frhed"] + path = Externals/frhed + url = https://github.com/WinMerge/frhed.git +[submodule "Externals/winimerge"] + path = Externals/winimerge + url = https://github.com/WinMerge/winimerge.git +[submodule "Externals/patch"] + path = Externals/patch + url = https://github.com/WinMerge/patch.git +[submodule "Externals/sevenzip"] + path = Externals/sevenzip + url = https://github.com/WinMerge/sevenzip.git +[submodule "Externals/freeimage"] + path = Externals/freeimage + url = https://github.com/WinMerge/freeimage.git diff --git a/CreateRelease.cmd b/CreateRelease.cmd index aa0ee9c03..f6f36086b 100644 --- a/CreateRelease.cmd +++ b/CreateRelease.cmd @@ -10,12 +10,17 @@ pushd "%~dp0" rmdir /q /s %workdir% > NUL 2> NUL mkdir %workdir% 2> NUL -call Externals\hg_clone.cmd +git submodule init +git submodule update -hg archive %workdir% +git checkout-index -a -f --prefix=%workdir%\ for /d %%d in (Externals\*) do ( pushd %%d - if exist .hg hg archive ..\..\%workdir%\%%d + if exist .git ( + rmdir /q /s ..\..\%workdir%\%%d + mkdir ..\..\%workdir%\%%d + git checkout-index -a -f --prefix=..\..\%workdir%\%%d\ + ) popd ) diff --git a/Externals/freeimage b/Externals/freeimage new file mode 160000 index 000000000..be59f0583 --- /dev/null +++ b/Externals/freeimage @@ -0,0 +1 @@ +Subproject commit be59f0583b2a86b630c6c3b0e76bfced84aac38e diff --git a/Externals/frhed b/Externals/frhed new file mode 160000 index 000000000..667f15b0d --- /dev/null +++ b/Externals/frhed @@ -0,0 +1 @@ +Subproject commit 667f15b0d6e77a6438402ce0b244d53c207735b7 diff --git a/Externals/patch b/Externals/patch new file mode 160000 index 000000000..a44c7a292 --- /dev/null +++ b/Externals/patch @@ -0,0 +1 @@ +Subproject commit a44c7a2921d52b274ab33900a3f49e6b02a5a95f diff --git a/Externals/sevenzip b/Externals/sevenzip new file mode 160000 index 000000000..cff58f152 --- /dev/null +++ b/Externals/sevenzip @@ -0,0 +1 @@ +Subproject commit cff58f15205a4e45343a5ed9214059162039e6c0 diff --git a/Externals/winimerge b/Externals/winimerge new file mode 160000 index 000000000..99ababb01 --- /dev/null +++ b/Externals/winimerge @@ -0,0 +1 @@ +Subproject commit 99ababb01a3987174bff0637fe6b546ea7a2f455 -- 2.11.0