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

Jump to bottom

The latest version of convert isn't able to write a Microsoft Cursor #3955

Merged
merged 1 commit into from
Jun 12, 2018
Merged

The latest version of convert isn't able to write a Microsoft Cursor #3955

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: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ Makefile* text whitespace=indent-with-non-tab,tabwidth=2 eol=lf
*.gif binary
*.ico binary
*.enc binary
*.cur binary
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
/contribs/gmf/fonts/gmf-icons.woff
/contribs/gmf/fonts/FontAwesome*
/contribs/gmf/fonts/fontawesome*
/contribs/gmf/cursors/*.cur
/contribs/gmf/examples/https.js
/test/spec/templatecache.js
/test/spec/gmftemplatecache.js
Expand Down
9 changes: 2 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ NGEO_EXAMPLES_JS_FILES := $(NGEO_EXAMPLES_HTML_FILES:.html=.js)

GMF_PARTIALS_FILES := $(shell find contribs/gmf/src/ -name *.html)
GMF_JS_FILES := $(shell find contribs/gmf/src/ -type f -name '*.js')
GMF_ALL_SRC_FILES := $(shell find contribs/gmf/src/ -type f) $(NGEO_ALL_SRC_FILES)
GMF_ALL_SRC_FILES := $(shell find contribs/gmf/src/ -type f) $(shell find contribs/gmf/cursors/ -type f) $(NGEO_ALL_SRC_FILES)
GMF_TEST_JS_FILES := $(shell find contribs/gmf/test/ -type f -name '*.js')
GMF_EXAMPLES_HTML_FILES := $(shell ls -1 contribs/gmf/examples/*.html)
GMF_EXAMPLES_JS_FILES := $(GMF_EXAMPLES_HTML_FILES:.html=.js)
Expand Down Expand Up @@ -254,8 +254,7 @@ gh-pages: .build/python-venv.timestamp

.build/examples-hosted-gmf-apps-deps.timestamp: \
$(addprefix contribs/gmf/build/gmf-, $(addsuffix .json, $(LANGUAGES))) \
$(addprefix contribs/gmf/build/angular-locale_, $(addsuffix .js, $(LANGUAGES))) \
$(addprefix contribs/gmf/cursors/,grab.cur grabbing.cur)
$(addprefix contribs/gmf/build/angular-locale_, $(addsuffix .js, $(LANGUAGES)))
mkdir -p .build/examples-hosted/contribs/gmf
# We need the files for each app
# To simplify processing, we first copy them in gmfappsdeps directory, then from there to each app
Expand Down Expand Up @@ -346,10 +345,6 @@ contribs/gmf/build/angular-locale_%.js: package.json
rm -rf $@
./node_modules/.bin/jsdoc -c $< --destination $@

.PRECIOUS: contribs/gmf/cursors/%.cur
contribs/gmf/cursors/%.cur: contribs/gmf/cursors/%.png
convert $< $@


# i18n

Expand Down
Binary file removed contribs/gmf/cursors/Grab_hand_animation_2sec.gif
View file
Open in desktop
Binary file not shown.
Binary file added contribs/gmf/cursors/grab.cur
View file
Open in desktop
Binary file not shown.
Binary file removed contribs/gmf/cursors/grab.png
View file
Open in desktop
Binary file not shown.
Binary file added contribs/gmf/cursors/grabbing.cur
View file
Open in desktop
Binary file not shown.
Binary file removed contribs/gmf/cursors/grabbing.png
View file
Open in desktop
Binary file not shown.
15 changes: 1 addition & 14 deletions npm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
OS := $(shell uname)
ifneq (, $(findstring CYGWIN_NT, $(OS)))
CONVERT_CMD := magick convert
else ifeq ($(OS),Windows_NT)
CONVERT_CMD := magick convert
else
CONVERT_CMD := convert
endif

.PHONY: install
install: $(addprefix contribs/gmf/fonts/gmf-icons.,ttf eot woff) \
$(addprefix contribs/gmf/cursors/,grab.cur grabbing.cur)
install: $(addprefix contribs/gmf/fonts/gmf-icons.,ttf eot woff)

contribs/gmf/fonts/gmf-icons.ttf: contribs/gmf/fonts/gmf-icons.svg
svg2ttf $< $@
Expand All @@ -19,6 +9,3 @@ contribs/gmf/fonts/gmf-icons.eot: contribs/gmf/fonts/gmf-icons.ttf

contribs/gmf/fonts/gmf-icons.woff: contribs/gmf/fonts/gmf-icons.ttf
ttf2woff $< $@

contribs/gmf/cursors/%.cur: contribs/gmf/cursors/%.png
$(CONVERT_CMD) $< $@