Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
92bd99bd
by Werner Lemberg at 2021-02-16T14:07:18+01:00
-
dfa7cca5
by Werner Lemberg at 2021-02-16T14:29:45+01:00
7 changed files:
- .gitmodules
- ChangeLog
- autogen.sh
- builds/toplevel.mk
- builds/windows/vc2010/script.bat
- src/tools/no-copyright
- submodules/dlg → subprojects/dlg
Changes:
| 1 |
-[submodule "submodules/dlg"]
|
|
| 2 |
- path = submodules/dlg
|
|
| 1 |
+[submodule "dlg"]
|
|
| 2 |
+ path = subprojects/dlg
|
|
| 3 | 3 |
url = "">
|
| 1 |
+2021-02-16 Werner Lemberg <wl@gnu.org>
|
|
| 2 |
+ |
|
| 3 |
+ * builds/toplevel.mk: Avoid side effects of `shell`.
|
|
| 4 |
+ |
|
| 5 |
+ We use a dummy variable to catch its output. Otherwise the `make`
|
|
| 6 |
+ program is going to interpret the return value of `shell`; this can
|
|
| 7 |
+ cause obscure warning or error messages or even be harmful.
|
|
| 8 |
+ |
|
| 9 |
+2021-02-16 Werner Lemberg <wl@gnu.org>
|
|
| 10 |
+ |
|
| 11 |
+ Move 'dlg' submodule to `subprojects` directory.
|
|
| 12 |
+ |
|
| 13 |
+ This is for future changes with Meson, which doesn't allow a
|
|
| 14 |
+ different name for its `subprojects` directory. Having both a
|
|
| 15 |
+ `submodules` and a `subprojects` directory is confusing.
|
|
| 16 |
+ |
|
| 17 |
+ * .gitmodules, autogen.sh (copy_submodule_files, DLG_INC_DIR,
|
|
| 18 |
+ DLG_SRC_DIR): Updated.
|
|
| 19 |
+ |
|
| 20 |
+ * builds/toplevel.mk (<top-level>, do-dist),
|
|
| 21 |
+ builds/windows/vc2010/script.bat: Updated.
|
|
| 22 |
+ |
|
| 23 |
+ * src/tools/no-copyright: Updated.
|
|
| 24 |
+ |
|
| 1 | 25 |
2021-02-16 Dominik Röttsches <drott@chromium.org>
|
| 2 | 26 |
|
| 3 | 27 |
[sfnt] Update paint format values to support non-variable paints.
|
| ... | ... | @@ -172,18 +172,18 @@ chmod +x ./configure |
| 172 | 172 |
# Copy all necessary 'dlg' files.
|
| 173 | 173 |
copy_submodule_files ()
|
| 174 | 174 |
{
|
| 175 |
- echo "Copying files from \`submodules/dlg' to \`src/dlg' and \`include/dlg'"
|
|
| 175 |
+ echo "Copying files from \`subprojects/dlg' to \`src/dlg' and \`include/dlg'"
|
|
| 176 | 176 |
mkdir include/dlg 2> /dev/null
|
| 177 | 177 |
cp $DLG_INC_DIR/output.h include/dlg
|
| 178 | 178 |
cp $DLG_INC_DIR/dlg.h include/dlg
|
| 179 | 179 |
cp $DLG_SRC_DIR/* src/dlg
|
| 180 | 180 |
}
|
| 181 | 181 |
|
| 182 |
-DLG_INC_DIR=submodules/dlg/include/dlg
|
|
| 183 |
-DLG_SRC_DIR=submodules/dlg/src/dlg
|
|
| 182 |
+DLG_INC_DIR=subprojects/dlg/include/dlg
|
|
| 183 |
+DLG_SRC_DIR=subprojects/dlg/src/dlg
|
|
| 184 | 184 |
|
| 185 | 185 |
if ! test -d "$DLG_INC_DIR"; then
|
| 186 |
- echo "Checking out submodule in \`submodules/dlg':"
|
|
| 186 |
+ echo "Checking out submodule in \`subprojects/dlg':"
|
|
| 187 | 187 |
git submodule init
|
| 188 | 188 |
git submodule update
|
| 189 | 189 |
fi
|
| ... | ... | @@ -113,23 +113,23 @@ ifdef check_platform |
| 113 | 113 |
include $(TOP_DIR)/builds/detect.mk
|
| 114 | 114 |
|
| 115 | 115 |
# For builds directly from the git repository we need to copy files
|
| 116 |
- # from `submodule/dlg' to `src/dlg' and `include/dlg'.
|
|
| 116 |
+ # from `subprojects/dlg' to `src/dlg' and `include/dlg'.
|
|
| 117 | 117 |
#
|
| 118 | 118 |
ifeq ($(wildcard src/dlg/dlg.*),)
|
| 119 |
- ifeq ($(wildcard submodules/dlg/*),)
|
|
| 120 |
- $(info Checking out submodule in `submodules/dlg')
|
|
| 121 |
- $(shell git submodule init)
|
|
| 122 |
- $(shell git submodule update)
|
|
| 119 |
+ ifeq ($(wildcard subprojects/dlg/*),)
|
|
| 120 |
+ $(info Checking out submodule in `subprojects/dlg')
|
|
| 121 |
+ dummy := $(shell git submodule init)
|
|
| 122 |
+ dummy := $(shell git submodule update)
|
|
| 123 | 123 |
endif
|
| 124 | 124 |
|
| 125 |
- $(info Copying files from `submodules/dlg' to `src/dlg' and `include/dlg')
|
|
| 126 |
- $(shell mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT))
|
|
| 127 |
- $(shell $(COPY) \
|
|
| 128 |
- $(subst /,$(SEP),submodules/dlg/include/dlg/output.h include/dlg))
|
|
| 129 |
- $(shell $(COPY) \
|
|
| 130 |
- $(subst /,$(SEP),submodules/dlg/include/dlg/dlg.h include/dlg))
|
|
| 131 |
- $(shell $(COPY) \
|
|
| 132 |
- $(subst /,$(SEP),submodules/dlg/src/dlg/dlg.c src/dlg))
|
|
| 125 |
+ $(info Copying files from `subprojects/dlg' to `src/dlg' and `include/dlg')
|
|
| 126 |
+ dummy := $(shell mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT))
|
|
| 127 |
+ dummy := $(shell $(COPY) \
|
|
| 128 |
+ $(subst /,$(SEP),subprojects/dlg/include/dlg/output.h include/dlg))
|
|
| 129 |
+ dummy := $(shell $(COPY) \
|
|
| 130 |
+ $(subst /,$(SEP),subprojects/dlg/include/dlg/dlg.h include/dlg))
|
|
| 131 |
+ dummy := $(shell $(COPY) \
|
|
| 132 |
+ $(subst /,$(SEP),subprojects/dlg/src/dlg/dlg.c src/dlg))
|
|
| 133 | 133 |
endif
|
| 134 | 134 |
|
| 135 | 135 |
# This rule makes sense for Unix only to remove files created by a run of
|
| ... | ... | @@ -292,6 +292,6 @@ do-dist: distclean refdoc |
| 292 | 292 |
rm -f docs/mkdocs.yml
|
| 293 | 293 |
|
| 294 | 294 |
@# Remove more stuff related to git.
|
| 295 |
- rm -rf submodules
|
|
| 295 |
+ rm -rf subprojects
|
|
| 296 | 296 |
|
| 297 | 297 |
# EOF
|
| ... | ... | @@ -3,9 +3,9 @@ |
| 3 | 3 |
:: Move to Top Dir
|
| 4 | 4 |
cd ..\..\..\
|
| 5 | 5 |
|
| 6 |
-:: Copy dlg's files from `submodules\dlg' to `src\dlg'
|
|
| 6 |
+:: Copy dlg's files from `subprojects\dlg' to `src\dlg'
|
|
| 7 | 7 |
IF NOT EXIST include\dlg (
|
| 8 | 8 |
mkdir include\dlg
|
| 9 |
- COPY submodules\dlg\include\dlg\dlg.h include\dlg
|
|
| 10 |
- COPY submodules\dlg\include\dlg\output.h include\dlg
|
|
| 11 |
- COPY submodules\dlg\src\dlg\dlg.c src\dlg\ )
|
|
| 9 |
+ COPY subprojects\dlg\include\dlg\dlg.h include\dlg
|
|
| 10 |
+ COPY subprojects\dlg\include\dlg\output.h include\dlg
|
|
| 11 |
+ COPY subprojects\dlg\src\dlg\dlg.c src\dlg\ )
|
| ... | ... | @@ -60,6 +60,6 @@ src/gzip/zutil.h |
| 60 | 60 |
src/tools/apinames.c
|
| 61 | 61 |
src/tools/ftrandom/ftrandom.c
|
| 62 | 62 |
#
|
| 63 |
-submodules/dlg
|
|
| 63 |
+subprojects/dlg
|
|
| 64 | 64 |
#
|
| 65 | 65 |
# EOF
|