Download as
Browse Code »

Commit 2a2ce4a3887b2dbeb3fe4c08b64b9cb97427b0a2

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

Fixing version configs.

Showing 3 changed files with 47 additions and 44 deletions   Show diff stats
configure.ac
  Diff comments   View file @2a2ce4a
... ... @@ -75,6 +75,49 @@ DLL_LDFLAGS="-shared"
75 75 STATIC_LDFLAGS=""
76 76  
77 77 dnl ---------------------------------------------------------------------------
  78 +dnl Version & customization
  79 +dnl ---------------------------------------------------------------------------
  80 +
  81 +AC_SUBST(PACKAGE_DESCRIPTION,"IBM 3270 Terminal emulator")
  82 +
  83 +app_vrs_major=$(echo $VERSION | cut -d. -f1)
  84 +app_vrs_minor=$(echo $VERSION | cut -d. -f2)
  85 +
  86 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
  87 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
  88 +
  89 +AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
  90 +AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
  91 +
  92 +AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
  93 +AC_ARG_WITH([session-name], [AS_HELP_STRING([--with-session-name], [Set default session name])], [ AC_DEFINE_UNQUOTED(DEFAULT_SESSION_NAME, $withval) ],[ AC_MSG_NOTICE([No default session name.]) ])
  94 +AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ AC_DEFINE_UNQUOTED(APPLICATION_NAME, $withval) ],[ AC_MSG_NOTICE([No default application name.]) ])
  95 +
  96 +app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
  97 +app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
  98 +
  99 +AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)
  100 +AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)
  101 +AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)
  102 +
  103 +AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
  104 +AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
  105 +AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
  106 +
  107 +AC_ARG_WITH([source-locales], [AS_HELP_STRING([--with-source-locales], [Set path for lib3270 locale sources])], [ app_cv_source_locales="$withval" ],[ app_cv_source_locales="/usr/share/pw3270/pot" ])
  108 +
  109 +AC_DEFINE_UNQUOTED(LIBRARY_POT_FILES, $app_cv_source_locales)
  110 +AC_SUBST(LIBRARY_POT_FILES,$app_cv_source_locales)
  111 +
  112 +AC_ARG_WITH([application-datadir], [AS_HELP_STRING([--with-application-datadir], [Set path for configuration file])], [ app_cv_source_appdatadir="$withval" ],[ app_cv_source_appdatadir="\$(datarootdir)/\$(PACKAGE_NAME)" ])
  113 +
  114 +AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
  115 +AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
  116 +
  117 +AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
  118 +AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
  119 +
  120 +dnl ---------------------------------------------------------------------------
78 121 dnl Check for OS specifics
79 122 dnl ---------------------------------------------------------------------------
80 123  
... ... @@ -184,46 +227,6 @@ AC_PATH_TOOL([DBUSBINDINGTOOL],[dbus-binding-tool],[no])
184 227 PKG_CHECK_EXISTS
185 228  
186 229 dnl ---------------------------------------------------------------------------
187   -dnl Version & customization
188   -dnl ---------------------------------------------------------------------------
189   -
190   -AC_SUBST(PACKAGE_DESCRIPTION,"IBM 3270 Terminal emulator")
191   -
192   -app_vrs_major=$(echo $VERSION | cut -d. -f1)
193   -app_vrs_minor=$(echo $VERSION | cut -d. -f2)
194   -
195   -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
196   -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
197   -
198   -AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
199   -AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
200   -
201   -AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
202   -AC_ARG_WITH([session-name], [AS_HELP_STRING([--with-session-name], [Set default session name])], [ AC_DEFINE_UNQUOTED(DEFAULT_SESSION_NAME, $withval) ],[ AC_MSG_NOTICE([No default session name.]) ])
203   -AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ AC_DEFINE_UNQUOTED(APPLICATION_NAME, $withval) ],[ AC_MSG_NOTICE([No default application name.]) ])
204   -
205   -app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
206   -app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
207   -
208   -AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)
209   -AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)
210   -AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)
211   -
212   -AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
213   -AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
214   -AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
215   -
216   -AC_ARG_WITH([source-locales], [AS_HELP_STRING([--with-source-locales], [Set path for lib3270 locale sources])], [ app_cv_source_locales="$withval" ],[ app_cv_source_locales="/usr/share/pw3270/pot" ])
217   -
218   -AC_DEFINE_UNQUOTED(LIBRARY_POT_FILES, $app_cv_source_locales)
219   -AC_SUBST(LIBRARY_POT_FILES,$app_cv_source_locales)
220   -
221   -AC_ARG_WITH([application-datadir], [AS_HELP_STRING([--with-application-datadir], [Set path for configuration file])], [ app_cv_source_appdatadir="$withval" ],[ app_cv_source_appdatadir="\$(datarootdir)/\$(PACKAGE_NAME)" ])
222   -
223   -AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
224   -AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
225   -
226   -dnl ---------------------------------------------------------------------------
227 230 dnl Check for libintl
228 231 dnl ---------------------------------------------------------------------------
229 232  
... ...
locale/pw3270.pot
  Diff comments   View file @2a2ce4a
... ... @@ -9,7 +9,7 @@ msgstr ""
9 9 "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n"
10 10 "Project-Id-Version: PACKAGE VERSION\n"
11 11 "Report-Msgid-Bugs-To: \n"
12   -"POT-Creation-Date: 2019-08-30 13:58-0300\n"
  12 +"POT-Creation-Date: 2019-08-30 16:37-0300\n"
13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
14 14 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
15 15 "Language-Team: LANGUAGE <LL@li.org>\n"
... ...
src/pw3270/Makefile.in
  Diff comments   View file @2a2ce4a
... ... @@ -258,16 +258,16 @@ install: \
258 258  
259 259 @$(MKDIR) $(DESTDIR)$(libdir)
260 260  
261   - @$(INSTALL_PROGRAM) \
  261 + $(INSTALL_PROGRAM) \
262 262 $(BINRLS)/$(LIBNAME) \
263 263 $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
264 264  
265 265  
266   - @$(LN_S) \
  266 + $(LN_S) \
267 267 @DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \
268 268 $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@
269 269  
270   - @$(LN_S) \
  270 + $(LN_S) \
271 271 @DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \
272 272 $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@
273 273  
... ...