From 288607c6d012634d81eced0a1f460751bf538669 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Thu, 2 Feb 2017 14:58:57 -0200 Subject: [PATCH] Melhorando detecção de release. --- configure.ac | 21 +++++++++++++-------- src/pw3270/resources.rc.in | 4 ++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 6db555a..ea38dd4 100644 --- a/configure.ac +++ b/configure.ac @@ -165,24 +165,29 @@ dnl --------------------------------------------------------------------------- dnl Version info dnl --------------------------------------------------------------------------- -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%Y%m%d`" ]) - -AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release) -AC_SUBST(PACKAGE_RELEASE,$app_cv_release) +AC_SUBST(PACKAGE_DESCRIPTION,"3270 Emulator for gtk") app_vrs_major=$(echo $VERSION | cut -d. -f1) app_vrs_minor=$(echo $VERSION | cut -d. -f2) -AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) -AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) - AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major) AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor) AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major) AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) -AC_SUBST(PACKAGE_DESCRIPTION,"3270 Emulator for windows/gtk") +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%y`.`date +%m`.`date +%d`" ]) + +app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) +app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) + +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release) +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major) +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor) + +AC_SUBST(PACKAGE_RELEASE,$app_cv_release) +AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major) +AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor) dnl --------------------------------------------------------------------------- dnl Check for D-Bus diff --git a/src/pw3270/resources.rc.in b/src/pw3270/resources.rc.in index 028e24b..2db5b92 100644 --- a/src/pw3270/resources.rc.in +++ b/src/pw3270/resources.rc.in @@ -1,8 +1,8 @@ 1 ICON @PACKAGE_NAME@.ico 2 VERSIONINFO -FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,0,0 -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,0,0 +FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@ +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@ BEGIN BLOCK "StringFileInfo" BEGIN -- libgit2 0.21.2