Skip to content

Commit

Permalink
The latest version of convert isn't able to write a Microsoft Cursor
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Jun 12, 2018
1 parent 917628c commit 2027dcd
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 21 deletions.
1 change: 0 additions & 1 deletion .gitignore
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
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
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 added contribs/gmf/cursors/grab.cur
Binary file not shown.
Binary file removed contribs/gmf/cursors/grab.png
Binary file not shown.
Binary file added contribs/gmf/cursors/grabbing.cur
Binary file not shown.
Binary file removed contribs/gmf/cursors/grabbing.png
Binary file not shown.
15 changes: 1 addition & 14 deletions npm.mk
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) $< $@

0 comments on commit 2027dcd

Please sign in to comment.