Download as
Browse Code »

Commit 7c25bb0a7dfcf87f95d5cc154fba7046e15d61e0

Authored by Perry Werneck
1 parent eb5f5e56
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

+ Ícone windows passa a ser gerado automaticamente pelo imagemagick. 

- Removendo rsvg-view.
Showing 5 changed files with 32 additions and 8 deletions   Show diff stats
branding/Makefile.in
  Diff comments   View file @7c25bb0
@@ -40,7 +40,7 @@ MKDIR=@MKDIR_P@ @@ -40,7 +40,7 @@ MKDIR=@MKDIR_P@
40 INSTALL=@INSTALL@ 40 INSTALL=@INSTALL@
41 INSTALL_DATA=@INSTALL_DATA@ 41 INSTALL_DATA=@INSTALL_DATA@
42 INSTALL_PROGRAM=@INSTALL_PROGRAM@ 42 INSTALL_PROGRAM=@INSTALL_PROGRAM@
43 -SVG2PNG=@SVG2PNG@ 43 +CONVERT=@CONVERT@
44 OPTIPNG=@OPTIPNG@ 44 OPTIPNG=@OPTIPNG@
45 45
46 #---[ Rules ]---------------------------------------------------------------------------- 46 #---[ Rules ]----------------------------------------------------------------------------
@@ -50,11 +50,17 @@ $(BINDIR)/%.png: \ @@ -50,11 +50,17 @@ $(BINDIR)/%.png: \
50 50
51 @echo $< ... 51 @echo $< ...
52 @$(MKDIR) `dirname $@` 52 @$(MKDIR) `dirname $@`
53 - @$(SVG2PNG) $< --format=png > $@ 53 + @$(CONVERT) -background transparent $< $@
54 @$(OPTIPNG) -o7 $@ 54 @$(OPTIPNG) -o7 $@
55 55
56 -$(SRCDIR): 56 +$(BINDIR)/%.ico: \
  57 + %.svg
  58 +
  59 + @echo $< ...
  60 + @$(MKDIR) `dirname $@`
  61 + @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
57 62
  63 +$(SRCDIR):
58 @$(MKDIR) $@ 64 @$(MKDIR) $@
59 @$(INSTALL_DATA) $(PACKAGE_NAME).svg $(PACKAGE_NAME)-logo.svg *.in $@ 65 @$(INSTALL_DATA) $(PACKAGE_NAME).svg $(PACKAGE_NAME)-logo.svg *.in $@
60 66
@@ -229,6 +229,7 @@ AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) @@ -229,6 +229,7 @@ AC_PATH_TOOL([MSGMERGE], [msgmerge], [no])
229 AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) 229 AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
230 AC_PATH_TOOL([VALGRIND], [valgrind], [no]) 230 AC_PATH_TOOL([VALGRIND], [valgrind], [no])
231 AC_PATH_TOOL([SVG2PNG],[rsvg-convert],[no]) 231 AC_PATH_TOOL([SVG2PNG],[rsvg-convert],[no])
  232 +AC_PATH_TOOL([CONVERT], [convert], [no])
232 AC_PATH_TOOL([OPTIPNG],[optipng],[no]) 233 AC_PATH_TOOL([OPTIPNG],[optipng],[no])
233 234
234 AC_CHECK_HEADER(libintl.h, [ 235 AC_CHECK_HEADER(libintl.h, [
src/pw3270/Makefile.in
  Diff comments   View file @7c25bb0
@@ -72,6 +72,7 @@ CC=@CC@ @@ -72,6 +72,7 @@ CC=@CC@
72 LD=@CC@ 72 LD=@CC@
73 XGETTEXT=@XGETTEXT@ 73 XGETTEXT=@XGETTEXT@
74 MSGCAT=@MSGCAT@ 74 MSGCAT=@MSGCAT@
  75 +CONVERT=@CONVERT@
75 WINDRES=@WINDRES@ 76 WINDRES=@WINDRES@
76 77
77 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \ 78 CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ \
@@ -87,7 +88,12 @@ APP_LDFLAGS=@APP_LDFLAGS@ @@ -87,7 +88,12 @@ APP_LDFLAGS=@APP_LDFLAGS@
87 88
88 #---[ Rules ]---------------------------------------------------------------------------- 89 #---[ Rules ]----------------------------------------------------------------------------
89 90
90 -DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h $(BASEDIR)/src/include/pw3270/*.h *.h Makefile 91 +DEPENDS=\
  92 + $(BASEDIR)/src/include/*.h \
  93 + $(BASEDIR)/src/include/lib3270/*.h \
  94 + $(BASEDIR)/src/include/pw3270/*.h \
  95 + *.h \
  96 + Makefile
91 97
92 $(OBJDBG)/%.o: \ 98 $(OBJDBG)/%.o: \
93 %.c \ 99 %.c \
@@ -100,11 +106,21 @@ $(OBJDBG)/%.o: \ @@ -100,11 +106,21 @@ $(OBJDBG)/%.o: \
100 -DBUILD_DATE=`date +"0x%Y%m%d"`\ 106 -DBUILD_DATE=`date +"0x%Y%m%d"`\
101 -o $@ -c $< 107 -o $@ -c $<
102 108
  109 +%.ico: \
  110 + $(BASEDIR)/branding/%.svg
  111 +
  112 + @echo $< ...
  113 + @$(MKDIR) `dirname $@`
  114 + @$(CONVERT) -density 384 -background transparent $< -define icon:auto-resize -colors 256 $@
  115 +
103 $(OBJDBG)/%.o: \ 116 $(OBJDBG)/%.o: \
104 %.rc \ 117 %.rc \
  118 + @PACKAGE_TARNAME@.ico \
105 $(DEPENDS) 119 $(DEPENDS)
106 120
107 - @$(WINDRES) --include-dir=$(BASEDIR)/win -i $< -o $@ 121 + @echo $< ...
  122 + @$(MKDIR) `dirname $@`
  123 + @$(WINDRES) -i $< -o $@
108 124
109 $(BASEDIR)/.obj/Debug/%.a: \ 125 $(BASEDIR)/.obj/Debug/%.a: \
110 ./%/* \ 126 ./%/* \
@@ -253,7 +269,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \ @@ -253,7 +269,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \
253 $(BINDBG)/$(LIBNAME) \ 269 $(BINDBG)/$(LIBNAME) \
254 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) 270 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o)
255 271
256 - $(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@ 272 + @$(LD) -Wl,--rpath,$(BINDBG) -o $@ $^ -L$(BINDBG) $(LIBS) -l@PACKAGE_TARNAME@
257 273
258 $(BINDBG)/$(LIBNAME): \ 274 $(BINDBG)/$(LIBNAME): \
259 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ 275 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@
src/pw3270/resources.rc.in
  Diff comments   View file @7c25bb0
@@ -13,7 +13,7 @@ BEGIN @@ -13,7 +13,7 @@ BEGIN
13 BLOCK "080904E4" 13 BLOCK "080904E4"
14 BEGIN 14 BEGIN
15 VALUE "FileDescription", "@PACKAGE_DESCRIPTION@" 15 VALUE "FileDescription", "@PACKAGE_DESCRIPTION@"
16 - VALUE "CompanyName", "Banco do Brasil S.A."Banco do Brasil S.A.\0"" 16 + VALUE "CompanyName", "Banco do Brasil S.A."Banco do Brasil S.A.\0""
17 VALUE "FileVersion", "@PACKAGE_VERSION@" 17 VALUE "FileVersion", "@PACKAGE_VERSION@"
18 VALUE "InternalName", "@PACKAGE_NAME@" 18 VALUE "InternalName", "@PACKAGE_NAME@"
19 VALUE "LegalCopyright", "Copyright (c) Banco do Brasil S.A." 19 VALUE "LegalCopyright", "Copyright (c) Banco do Brasil S.A."
win/install-cross.sh
  Diff comments   View file @7c25bb0
@@ -42,7 +42,8 @@ sudo zypper --non-interactive in \ @@ -42,7 +42,8 @@ sudo zypper --non-interactive in \
42 gettext-tools \ 42 gettext-tools \
43 glib2-devel \ 43 glib2-devel \
44 optipng \ 44 optipng \
45 - rsvg-view 45 + rsvg-view \
  46 + ImageMagick
46 47
47 while read FILE 48 while read FILE
48 do 49 do