Download as
Browse Code »

Commit e7d61accfb28dbf1ebf895ddde4ff26fc298f365

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

Incluindo informação de revisão do RPM na tela de informações sobre a aplicação.

Showing 8 changed files with 19 additions and 18 deletions   Show diff stats
Makefile.in
  Diff comments   View file @e7d61ac
... ... @@ -305,6 +305,7 @@ $(SRCDIR): \
305 305 $(SRCDIR)/src/pw3270 \
306 306 $(SRCDIR)/src/libpw3270cpp \
307 307 $(SRCDIR)/sdk \
  308 + $(SRCDIR)/branding \
308 309 $(SRCDIR)/src/plugins/dbus3270 \
309 310 $(SRCDIR)/src/plugins/hllapi
310 311  
... ...
branding/Makefile.in
  Diff comments   View file @e7d61ac
... ... @@ -33,6 +33,7 @@ exec_prefix=@exec_prefix@
33 33 datarootdir=@datarootdir@
34 34  
35 35 BASEDIR=@BASEDIR@
  36 +SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)/branding
36 37 BINDIR=$(BASEDIR)/.bin
37 38  
38 39 MKDIR=@MKDIR_P@
... ... @@ -52,6 +53,11 @@ $(BINDIR)/%.png: \
52 53 @$(SVG2PNG) $< --format=png > $@
53 54 @$(OPTIPNG) -o7 $@
54 55  
  56 +$(SRCDIR):
  57 +
  58 + @$(MKDIR) $@
  59 + @$(INSTALL_DATA) $(PACKAGE_NAME).svg $(PACKAGE_NAME)-logo.svg *.in $@
  60 +
55 61 $(BINDIR)/%.png: \
56 62 %.png
57 63  
... ...
configure.ac
  Diff comments   View file @e7d61ac
... ... @@ -165,10 +165,10 @@ dnl ---------------------------------------------------------------------------
165 165 dnl Version info
166 166 dnl ---------------------------------------------------------------------------
167 167  
168   -AC_ARG_WITH([revision], [AS_HELP_STRING([--with-revision], [Set revision])], [ app_cv_revision="$withval" ],[ app_cv_revision="`date +%Y%m%d`" ])
  168 +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%Y%m%d`" ])
169 169  
170   -AC_DEFINE_UNQUOTED(PACKAGE_REVISION, $app_cv_revision)
171   -AC_SUBST(PACKAGE_REVISION,$app_cv_revision)
  170 +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)
  171 +AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
172 172  
173 173 app_vrs_major=$(echo $VERSION | cut -d. -f1)
174 174 app_vrs_minor=$(echo $VERSION | cut -d. -f2)
... ...
locale/Makefile.in
  Diff comments   View file @e7d61ac
... ... @@ -67,7 +67,7 @@ $(DESTDIR)/$(localedir)/%/LC_MESSAGES/$(PACKAGE_NAME).mo: \
67 67  
68 68 @echo $< ...
69 69 @$(MKDIR) `dirname $@`
70   - @echo $(INSTALL_DATA) $^ $@
  70 + @$(INSTALL_DATA) $^ $@
71 71  
72 72 #---[ Targets ]--------------------------------------------------------------------------
73 73  
... ...
rpm/pw3270.spec
  Diff comments   View file @e7d61ac
... ... @@ -190,10 +190,6 @@ Plugin exporting a DBUS object from every %{name} open session.
190 190  
191 191 %setup -q -n pw3270-%{version}
192 192  
193   -echo "m4_define([SVN_REVISION], %{release})" > revision.m4
194   -echo "m4_define([SVN_URL], http://softwarepublico.gov.br/gitlab/pw3270/principal.git)" >> revision.m4
195   -echo "m4_define([APP_LEVEL], 0)" >> revision.m4
196   -
197 193 aclocal
198 194 autoconf
199 195  
... ... @@ -201,14 +197,16 @@ export CFLAGS=&quot;$RPM_OPT_FLAGS&quot;
201 197 export CXXFLAGS="$RPM_OPT_FLAGS"
202 198 export FFLAGS="$RPM_OPT_FLAGS"
203 199  
204   -%configure
  200 +%configure --with-release=%{release}
  201 +
  202 +cat src/include/lib3270/config.h
205 203  
206 204 %build
207 205 make clean
208 206 make all
209 207  
210 208 %install
211   -%makeinstall
  209 +%make_install
212 210  
213 211 %find_lang pw3270 langfiles
214 212  
... ...
src/include/lib3270/config.h.in
  Diff comments   View file @e7d61ac
... ... @@ -35,7 +35,7 @@
35 35  
36 36 #undef PACKAGE_NAME
37 37 #undef PACKAGE_VERSION
38   - #undef PACKAGE_REVISION
  38 + #undef PACKAGE_RELEASE
39 39  
40 40 #undef HAVE_GNUC_VISIBILITY
41 41 #undef HAVE_LIBM
... ...
src/pw3270/Makefile.in
  Diff comments   View file @e7d61ac
... ... @@ -244,10 +244,6 @@ $(SRCDIR): \
244 244 @$(MKDIR) $@
245 245 @$(INSTALL_DATA) *.c *.h *.in *.cbp $@
246 246  
247   - @$(MKDIR) $@/svg
248   - @$(INSTALL_DATA) svg/*.svg $@/svg
249   -
250   -
251 247 #---[ Debug Targets ]--------------------------------------------------------------------
252 248  
253 249 Debug: \
... ...
src/pw3270/dialog.c
  Diff comments   View file @e7d61ac
... ... @@ -509,10 +509,10 @@
509 509 g_free(filename);
510 510 g_free(text);
511 511  
512   -#ifdef PACKAGE_REVISION
513   - text = g_strdup_printf(_("Version %s - Revision %s"),PACKAGE_VERSION,G_STRINGIFY(PACKAGE_REVISION));
  512 +#ifdef PACKAGE_RELEASE
  513 + text = g_strdup_printf(_("Version %s-%s"),PACKAGE_VERSION,G_STRINGIFY(PACKAGE_RELEASE));
514 514 #else
515   - text = g_strdup_printf(_("Version %s - Revision %08lx"),PACKAGE_VERSION,BUILD_DATE);
  515 + text = g_strdup_printf(_("Version %s-%s"),PACKAGE_VERSION,G_STRINGIFY(BUILD_DATE));
516 516 #endif // PACKAGE_REVISION
517 517  
518 518 gtk_about_dialog_set_version(dialog,text);
... ...