Download as
Browse Code »

Commit 1ce219f1ff1ec6991ee4ba73dbb6de3ac3c23312

Authored by perry.werneck@gmail.com
1 parent 7c7d11ea
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustando empacotamento windows

Showing 12 changed files with 135 additions and 40 deletions   Show diff stats
@@ -163,7 +163,7 @@ case "$host" in @@ -163,7 +163,7 @@ case "$host" in
163 AC_CONFIG_FILES(nsi/j3270.nsi) 163 AC_CONFIG_FILES(nsi/j3270.nsi)
164 AC_CONFIG_FILES(nsi/rx3270.nsi) 164 AC_CONFIG_FILES(nsi/rx3270.nsi)
165 165
166 - AC_CONFIG_FILES(nsi/runtime-init-$host_cpu.nsi) 166 + AC_CONFIG_FILES(nsi/runtime-init.nsi)
167 167
168 AC_CONFIG_FILES(src/plugins/hllapi/Makefile) 168 AC_CONFIG_FILES(src/plugins/hllapi/Makefile)
169 AC_CONFIG_FILES(makegtkruntime.sh) 169 AC_CONFIG_FILES(makegtkruntime.sh)
nsi/Makefile.in
  Diff comments   View file @1ce219f
@@ -58,7 +58,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \ @@ -58,7 +58,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
58 runtime.nsi \ 58 runtime.nsi \
59 sdk.nsi \ 59 sdk.nsi \
60 uninstall-$(HOST_CPU).nsi \ 60 uninstall-$(HOST_CPU).nsi \
61 - oninit-$(HOST_CPU).nsi 61 + oninit-$(HOST_CPU).nsi \
  62 + $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi )
62 63
63 @rm -f $@ 64 @rm -f $@
64 @cat header-$(HOST_CPU).nsi > $@ 65 @cat header-$(HOST_CPU).nsi > $@
@@ -78,8 +79,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \ @@ -78,8 +79,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
78 79
79 # Install plugin scripts 80 # Install plugin scripts
80 81
81 - @cat runtime-init-$(HOST_CPU).nsi >> $@  
82 - @cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init-$(HOST_CPU).nsi ) >> $@ 82 + @cat runtime-init.nsi >> $@
  83 + @cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) >> $@
83 84
84 # Finalize onInit script 85 # Finalize onInit script
85 86
nsi/header-x86_64-no-gtk.nsi.in 0 → 100644
  Diff comments   View file @1ce219f
@@ -0,0 +1,47 @@ @@ -0,0 +1,47 @@
  1 +!include "MUI2.nsh"
  2 +!include x64.nsh
  3 +
  4 +Name "@PACKAGE@"
  5 +Caption "@PACKAGE@ - 3270 Emulator for windows/gtk"
  6 +outfile "@PACKAGE@-@PACKAGE_VERSION@.@PACKAGE_LEVEL@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.exe"
  7 +XPStyle on
  8 +
  9 +installDir "$PROGRAMFILES64\pw3270"
  10 +
  11 +#define the installer icon
  12 +!define MUI_ICON "src\pw3270\@PACKAGE@.ico"
  13 +!define MUI_UNICON "src\pw3270\@PACKAGE@.ico"
  14 +icon "src\pw3270\@PACKAGE@.ico"
  15 +
  16 +# Get installation folder from registry if available
  17 +InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
  18 +
  19 +RequestExecutionLevel admin
  20 +
  21 +# Properties
  22 +VIProductVersion "@PACKAGE_VERSION@.@PACKAGE_LEVEL@.@PACKAGE_REVISION@"
  23 +VIAddVersionKey "ProductName" "@PACKAGE@"
  24 +VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk"
  25 +VIAddVersionKey "FileVersion" "@PACKAGE_REVISION@"
  26 +VIAddVersionKey "LegalCopyright" "GPL-2.0"
  27 +
  28 +# Interface
  29 +
  30 +!define MUI_ABORTWARNING
  31 +# !insertmacro MUI_PAGE_WELCOME
  32 +!insertmacro MUI_PAGE_LICENSE "LICENSE"
  33 +!insertmacro MUI_PAGE_COMPONENTS
  34 +!insertmacro MUI_PAGE_DIRECTORY
  35 +!insertmacro MUI_PAGE_INSTFILES
  36 +
  37 +# !insertmacro MUI_UNPAGE_WELCOME
  38 +!insertmacro MUI_UNPAGE_CONFIRM
  39 +!insertmacro MUI_UNPAGE_INSTFILES
  40 +# !insertmacro MUI_UNPAGE_FINISH
  41 +
  42 +# Languages
  43 +!insertmacro MUI_LANGUAGE "English"
  44 +
  45 +# Section scripts
  46 +!include Sections.nsh
  47 +
nsi/header-x86_64.nsi.in 0 → 100644
  Diff comments   View file @1ce219f
@@ -0,0 +1,47 @@ @@ -0,0 +1,47 @@
  1 +!include "MUI2.nsh"
  2 +!include x64.nsh
  3 +
  4 +Name "@PACKAGE@"
  5 +Caption "@PACKAGE@ - 3270 Emulator for windows/gtk"
  6 +outfile "@PACKAGE@-@PACKAGE_VERSION@.@PACKAGE_LEVEL@-gtk-@GTK_MODVERSION@-@host_cpu@.exe"
  7 +XPStyle on
  8 +
  9 +installDir "$PROGRAMFILES64\pw3270"
  10 +
  11 +#define the installer icon
  12 +!define MUI_ICON "src\pw3270\@PACKAGE@.ico"
  13 +!define MUI_UNICON "src\pw3270\@PACKAGE@.ico"
  14 +icon "src\pw3270\@PACKAGE@.ico"
  15 +
  16 +# Get installation folder from registry if available
  17 +InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
  18 +
  19 +RequestExecutionLevel admin
  20 +
  21 +# Properties
  22 +VIProductVersion "@PACKAGE_VERSION@.@PACKAGE_LEVEL@.@PACKAGE_REVISION@"
  23 +VIAddVersionKey "ProductName" "@PACKAGE@"
  24 +VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk"
  25 +VIAddVersionKey "FileVersion" "@PACKAGE_REVISION@"
  26 +VIAddVersionKey "LegalCopyright" "GPL-2.0"
  27 +
  28 +# Interface
  29 +
  30 +!define MUI_ABORTWARNING
  31 +# !insertmacro MUI_PAGE_WELCOME
  32 +!insertmacro MUI_PAGE_LICENSE "LICENSE"
  33 +!insertmacro MUI_PAGE_COMPONENTS
  34 +!insertmacro MUI_PAGE_DIRECTORY
  35 +!insertmacro MUI_PAGE_INSTFILES
  36 +
  37 +# !insertmacro MUI_UNPAGE_WELCOME
  38 +!insertmacro MUI_UNPAGE_CONFIRM
  39 +!insertmacro MUI_UNPAGE_INSTFILES
  40 +# !insertmacro MUI_UNPAGE_FINISH
  41 +
  42 +# Languages
  43 +!insertmacro MUI_LANGUAGE "English"
  44 +
  45 +# Section scripts
  46 +!include Sections.nsh
  47 +
nsi/hllapi-init-i686.nsi
View file @7c7d11e
nsi/hllapi-init-x86_64.nsi 0 → 100644
  Diff comments   View file @1ce219f
nsi/hllapi-init.nsi 0 → 100644
  Diff comments   View file @1ce219f
nsi/runtime-init-i686.nsi.in
View file @7c7d11e
@@ -1,27 +0,0 @@ @@ -1,27 +0,0 @@
1 -  
2 -ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path"  
3 -  
4 -${if} $4 == ""  
5 -  
6 - SectionGetFlags "${SecGTK}" $0  
7 - IntOp $0 $0 | ${SF_SELECTED}  
8 - SectionSetFlags "${SecGTK}" $0  
9 -  
10 -${Else}  
11 -  
12 - ${if} ${FileExists} `$4\*.*`  
13 -  
14 - SectionGetFlags "${SecGTK}" $0  
15 - IntOp $0 $0 & ${SECTION_OFF}  
16 - SectionSetFlags "${SecGTK}" $0  
17 -  
18 - ${Else}  
19 -  
20 - SectionGetFlags "${SecGTK}" $0  
21 - IntOp $0 $0 | ${SF_SELECTED}  
22 - SectionSetFlags "${SecGTK}" $0  
23 -  
24 - ${EndIf}  
25 -  
26 -${EndIf}  
27 -  
nsi/runtime-init.nsi.in 0 → 100644
  Diff comments   View file @1ce219f
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
  1 +
  2 +ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path"
  3 +
  4 +${if} $4 == ""
  5 +
  6 + SectionGetFlags "${SecGTK}" $0
  7 + IntOp $0 $0 | ${SF_SELECTED}
  8 + SectionSetFlags "${SecGTK}" $0
  9 +
  10 +${Else}
  11 +
  12 + ${if} ${FileExists} `$4\*.*`
  13 +
  14 + SectionGetFlags "${SecGTK}" $0
  15 + IntOp $0 $0 & ${SECTION_OFF}
  16 + SectionSetFlags "${SecGTK}" $0
  17 +
  18 + ${Else}
  19 +
  20 + SectionGetFlags "${SecGTK}" $0
  21 + IntOp $0 $0 | ${SF_SELECTED}
  22 + SectionSetFlags "${SecGTK}" $0
  23 +
  24 + ${EndIf}
  25 +
  26 +${EndIf}
  27 +
nsi/rx3270-init-i686.nsi
View file @7c7d11e
@@ -1,8 +0,0 @@ @@ -1,8 +0,0 @@
1 -${if} ${FileExists} `$PROGRAMFILES\ooRexx\rexx.exe`  
2 -  
3 - SectionGetFlags "${RexxPlugin}" $0  
4 - IntOp $0 $0 | ${SF_SELECTED}  
5 - SectionSetFlags "${RexxPlugin}" $0  
6 -  
7 -${EndIf}  
8 -  
nsi/rx3270-init.nsi 0 → 100644
  Diff comments   View file @1ce219f
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
  1 +${if} ${FileExists} `$PROGRAMFILES\ooRexx\rexx.exe`
  2 +
  3 + SectionGetFlags "${RexxPlugin}" $0
  4 + IntOp $0 $0 | ${SF_SELECTED}
  5 + SectionSetFlags "${RexxPlugin}" $0
  6 +
  7 +${EndIf}
  8 +
@@ -5,7 +5,7 @@ msgid "" @@ -5,7 +5,7 @@ msgid ""
5 msgstr "" 5 msgstr ""
6 "Project-Id-Version: pw3270 5.0\n" 6 "Project-Id-Version: pw3270 5.0\n"
7 "Report-Msgid-Bugs-To: \n" 7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2015-08-28 08:33-0300\n" 8 +"POT-Creation-Date: 2015-08-28 10:29-0300\n"
9 "PO-Revision-Date: 2014-02-17 08:05-0300\n" 9 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n" 10 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11 "Language-Team: Portugues <>\n" 11 "Language-Team: Portugues <>\n"