Download as
Browse Code »

Commit 288607c6d012634d81eced0a1f460751bf538669

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

Melhorando detecção de release.

Showing 2 changed files with 15 additions and 10 deletions   Show diff stats
configure.ac
  Diff comments   View file @288607c
... ... @@ -165,24 +165,29 @@ dnl ---------------------------------------------------------------------------
165 165 dnl Version info
166 166 dnl ---------------------------------------------------------------------------
167 167  
168   -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%Y%m%d`" ])
169   -
170   -AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)
171   -AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
  168 +AC_SUBST(PACKAGE_DESCRIPTION,"3270 Emulator for gtk")
172 169  
173 170 app_vrs_major=$(echo $VERSION | cut -d. -f1)
174 171 app_vrs_minor=$(echo $VERSION | cut -d. -f2)
175 172  
176   -AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
177   -AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
178   -
179 173 AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
180 174 AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
181 175  
182 176 AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
183 177 AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
184 178  
185   -AC_SUBST(PACKAGE_DESCRIPTION,"3270 Emulator for windows/gtk")
  179 +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%y`.`date +%m`.`date +%d`" ])
  180 +
  181 +app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
  182 +app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
  183 +
  184 +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)
  185 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)
  186 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)
  187 +
  188 +AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
  189 +AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
  190 +AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
186 191  
187 192 dnl ---------------------------------------------------------------------------
188 193 dnl Check for D-Bus
... ...
src/pw3270/resources.rc.in
  Diff comments   View file @288607c
1 1 1 ICON @PACKAGE_NAME@.ico
2 2  
3 3 2 VERSIONINFO
4   -FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,0,0
5   -PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,0,0
  4 +FILEVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
  5 +PRODUCTVERSION @PACKAGE_MAJOR_VERSION@,@PACKAGE_MINOR_VERSION@,@PACKAGE_MAJOR_RELEASE@,@PACKAGE_MINOR_RELEASE@
6 6 BEGIN
7 7 BLOCK "StringFileInfo"
8 8 BEGIN
... ...