Download as
Browse Code »

Commit 5167ede25cecb348d28be4fc6f355b66198cc411

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

Getting appname from lib3270.

Showing 3 changed files with 9 additions and 10 deletions   Show diff stats
@@ -91,7 +91,6 @@ AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor) @@ -91,7 +91,6 @@ AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
91 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`" ]) 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.]) ]) 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 94
96 app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) 95 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) 96 app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
@@ -429,7 +428,7 @@ PKG_CHECK_MODULES( [LIBV3270], [libv3270], AC_DEFINE(HAVE_LIBV3270), AC_MSG_ERRO @@ -429,7 +428,7 @@ PKG_CHECK_MODULES( [LIBV3270], [libv3270], AC_DEFINE(HAVE_LIBV3270), AC_MSG_ERRO
429 AC_SUBST(LIBV3270_CFLAGS) 428 AC_SUBST(LIBV3270_CFLAGS)
430 AC_SUBST(LIBV3270_LIBS) 429 AC_SUBST(LIBV3270_LIBS)
431 430
432 -AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ app_cv_appname="$withval" ],[ app_cv_appname="pw3270" ]) 431 +AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ app_cv_appname="$withval" ],[ app_cv_appname=`pkg-config --variable=product_name lib3270` ])
433 432
434 AC_DEFINE_UNQUOTED(APPLICATION_NAME,$app_cv_appname) 433 AC_DEFINE_UNQUOTED(APPLICATION_NAME,$app_cv_appname)
435 AC_SUBST(APPLICATION_NAME,$app_cv_appname) 434 AC_SUBST(APPLICATION_NAME,$app_cv_appname)
src/pw3270/windows/resources.rc.in
  Diff comments   View file @5167ede
@@ -16,8 +16,8 @@ BEGIN @@ -16,8 +16,8 @@ BEGIN
16 VALUE "CompanyName", "Banco do Brasil S/A.\0" 16 VALUE "CompanyName", "Banco do Brasil S/A.\0"
17 VALUE "FileVersion", "@WIN32_VERSION@\0" 17 VALUE "FileVersion", "@WIN32_VERSION@\0"
18 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0" 18 VALUE "LegalCopyright", "(C) 2017 Banco do Brasil S/A. All Rights Reserved\0"
19 - VALUE "OriginalFilename", "@PACKAGE_TARNAME@.exe\0"  
20 - VALUE "ProductName", "@PACKAGE_NAME@\0" 19 + VALUE "OriginalFilename", "@APPLICATION_NAME@.exe\0"
  20 + VALUE "ProductName", "@APPLICATION_NAME@\0"
21 VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0" 21 VALUE "ProductVersion", "@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@.@PACKAGE_MAJOR_RELEASE@.@PACKAGE_MINOR_RELEASE@\0"
22 END 22 END
23 END 23 END
win/pw3270.nsi.in
  Diff comments   View file @5167ede
@@ -68,12 +68,12 @@ SubSection "@PACKAGE@" SecMain @@ -68,12 +68,12 @@ SubSection "@PACKAGE@" SecMain
68 setOutPath $INSTDIR 68 setOutPath $INSTDIR
69 SetShellVarContext all 69 SetShellVarContext all
70 70
71 - createShortCut "$SMPROGRAMS\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"  
72 - createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe" 71 + createShortCut "$SMPROGRAMS\@APPLICATION_NAME@.lnk" "$INSTDIR\@APPLICATION_NAME@.exe"
  72 + createShortCut "$DESKTOP\@APPLICATION_NAME@.lnk" "$INSTDIR\@APPLICATION_NAME@.exe"
73 73
74 # Binary files 74 # Binary files
75 - file "/oname=$INSTDIR\@PACKAGE@.exe" "@PACKAGE@.exe"  
76 - file "/oname=$INSTDIR\@PACKAGE@.ico" "@PACKAGE@.ico" 75 + file "/oname=$INSTDIR\@APPLICATION_NAME@.exe" "@PACKAGE@.exe"
  76 + file "/oname=$INSTDIR\@APPLICATION_NAME@.ico" "@PACKAGE@.ico"
77 file "/oname=$INSTDIR\lib3270.dll" "lib3270.dll" 77 file "/oname=$INSTDIR\lib3270.dll" "lib3270.dll"
78 file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll" 78 file "/oname=$INSTDIR\libv3270.dll" "libv3270.dll"
79 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll" 79 file "/oname=$INSTDIR\@PACKAGE@.dll" "@PACKAGE@.dll"
@@ -114,9 +114,9 @@ SubSection "@PACKAGE@" SecMain @@ -114,9 +114,9 @@ SubSection "@PACKAGE@" SecMain
114 writeUninstaller $INSTDIR\uninstall.exe 114 writeUninstaller $INSTDIR\uninstall.exe
115 115
116 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 116 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
117 - "DisplayName" "@PACKAGE@ - @PACKAGE_DESCRIPTION@" 117 + "DisplayName" "@APPLICATION_NAME@ - @PACKAGE_DESCRIPTION@"
118 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 118 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
119 - "DisplayIcon" "$INSTDIR\@PACKAGE@.ico" 119 + "DisplayIcon" "$INSTDIR\@APPLICATION_NAME@.ico"
120 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ 120 WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \
121 "DisplayVersion" "@PACKAGE_VERSION@" 121 "DisplayVersion" "@PACKAGE_VERSION@"
122 122