From 1ce219f1ff1ec6991ee4ba73dbb6de3ac3c23312 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Fri, 28 Aug 2015 13:38:51 +0000 Subject: [PATCH] Ajustando empacotamento windows --- configure.ac | 2 +- nsi/Makefile.in | 7 ++++--- nsi/header-x86_64-no-gtk.nsi.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ nsi/header-x86_64.nsi.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ nsi/hllapi-init-i686.nsi | 0 nsi/hllapi-init-x86_64.nsi | 0 nsi/hllapi-init.nsi | 0 nsi/runtime-init-i686.nsi.in | 27 --------------------------- nsi/runtime-init.nsi.in | 27 +++++++++++++++++++++++++++ nsi/rx3270-init-i686.nsi | 8 -------- nsi/rx3270-init.nsi | 8 ++++++++ po/pt_BR.po | 2 +- 12 files changed, 135 insertions(+), 40 deletions(-) create mode 100644 nsi/header-x86_64-no-gtk.nsi.in create mode 100644 nsi/header-x86_64.nsi.in delete mode 100644 nsi/hllapi-init-i686.nsi create mode 100644 nsi/hllapi-init-x86_64.nsi create mode 100644 nsi/hllapi-init.nsi delete mode 100644 nsi/runtime-init-i686.nsi.in create mode 100644 nsi/runtime-init.nsi.in delete mode 100644 nsi/rx3270-init-i686.nsi create mode 100644 nsi/rx3270-init.nsi diff --git a/configure.ac b/configure.ac index feb1db0..89c1f80 100644 --- a/configure.ac +++ b/configure.ac @@ -163,7 +163,7 @@ case "$host" in AC_CONFIG_FILES(nsi/j3270.nsi) AC_CONFIG_FILES(nsi/rx3270.nsi) - AC_CONFIG_FILES(nsi/runtime-init-$host_cpu.nsi) + AC_CONFIG_FILES(nsi/runtime-init.nsi) AC_CONFIG_FILES(src/plugins/hllapi/Makefile) AC_CONFIG_FILES(makegtkruntime.sh) diff --git a/nsi/Makefile.in b/nsi/Makefile.in index fee3bb5..2f3d275 100644 --- a/nsi/Makefile.in +++ b/nsi/Makefile.in @@ -58,7 +58,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \ runtime.nsi \ sdk.nsi \ uninstall-$(HOST_CPU).nsi \ - oninit-$(HOST_CPU).nsi + oninit-$(HOST_CPU).nsi \ + $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) @rm -f $@ @cat header-$(HOST_CPU).nsi > $@ @@ -78,8 +79,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \ # Install plugin scripts - @cat runtime-init-$(HOST_CPU).nsi >> $@ - @cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init-$(HOST_CPU).nsi ) >> $@ + @cat runtime-init.nsi >> $@ + @cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) >> $@ # Finalize onInit script diff --git a/nsi/header-x86_64-no-gtk.nsi.in b/nsi/header-x86_64-no-gtk.nsi.in new file mode 100644 index 0000000..342fc23 --- /dev/null +++ b/nsi/header-x86_64-no-gtk.nsi.in @@ -0,0 +1,47 @@ +!include "MUI2.nsh" +!include x64.nsh + +Name "@PACKAGE@" +Caption "@PACKAGE@ - 3270 Emulator for windows/gtk" +outfile "@PACKAGE@-@PACKAGE_VERSION@.@PACKAGE_LEVEL@-requires-gtk-@GTK_MODVERSION@-@host_cpu@.exe" +XPStyle on + +installDir "$PROGRAMFILES64\pw3270" + +#define the installer icon +!define MUI_ICON "src\pw3270\@PACKAGE@.ico" +!define MUI_UNICON "src\pw3270\@PACKAGE@.ico" +icon "src\pw3270\@PACKAGE@.ico" + +# Get installation folder from registry if available +InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation" + +RequestExecutionLevel admin + +# Properties +VIProductVersion "@PACKAGE_VERSION@.@PACKAGE_LEVEL@.@PACKAGE_REVISION@" +VIAddVersionKey "ProductName" "@PACKAGE@" +VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk" +VIAddVersionKey "FileVersion" "@PACKAGE_REVISION@" +VIAddVersionKey "LegalCopyright" "GPL-2.0" + +# Interface + +!define MUI_ABORTWARNING +# !insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "LICENSE" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + +# !insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +# !insertmacro MUI_UNPAGE_FINISH + +# Languages +!insertmacro MUI_LANGUAGE "English" + +# Section scripts +!include Sections.nsh + diff --git a/nsi/header-x86_64.nsi.in b/nsi/header-x86_64.nsi.in new file mode 100644 index 0000000..d29ae1a --- /dev/null +++ b/nsi/header-x86_64.nsi.in @@ -0,0 +1,47 @@ +!include "MUI2.nsh" +!include x64.nsh + +Name "@PACKAGE@" +Caption "@PACKAGE@ - 3270 Emulator for windows/gtk" +outfile "@PACKAGE@-@PACKAGE_VERSION@.@PACKAGE_LEVEL@-gtk-@GTK_MODVERSION@-@host_cpu@.exe" +XPStyle on + +installDir "$PROGRAMFILES64\pw3270" + +#define the installer icon +!define MUI_ICON "src\pw3270\@PACKAGE@.ico" +!define MUI_UNICON "src\pw3270\@PACKAGE@.ico" +icon "src\pw3270\@PACKAGE@.ico" + +# Get installation folder from registry if available +InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation" + +RequestExecutionLevel admin + +# Properties +VIProductVersion "@PACKAGE_VERSION@.@PACKAGE_LEVEL@.@PACKAGE_REVISION@" +VIAddVersionKey "ProductName" "@PACKAGE@" +VIAddVersionKey "FileDescription" "3270 Emulator for windows/gtk" +VIAddVersionKey "FileVersion" "@PACKAGE_REVISION@" +VIAddVersionKey "LegalCopyright" "GPL-2.0" + +# Interface + +!define MUI_ABORTWARNING +# !insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "LICENSE" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES + +# !insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES +# !insertmacro MUI_UNPAGE_FINISH + +# Languages +!insertmacro MUI_LANGUAGE "English" + +# Section scripts +!include Sections.nsh + diff --git a/nsi/hllapi-init-i686.nsi b/nsi/hllapi-init-i686.nsi deleted file mode 100644 index e69de29..0000000 --- a/nsi/hllapi-init-i686.nsi +++ /dev/null diff --git a/nsi/hllapi-init-x86_64.nsi b/nsi/hllapi-init-x86_64.nsi new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/nsi/hllapi-init-x86_64.nsi diff --git a/nsi/hllapi-init.nsi b/nsi/hllapi-init.nsi new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/nsi/hllapi-init.nsi diff --git a/nsi/runtime-init-i686.nsi.in b/nsi/runtime-init-i686.nsi.in deleted file mode 100644 index d45d98b..0000000 --- a/nsi/runtime-init-i686.nsi.in +++ /dev/null @@ -1,27 +0,0 @@ - -ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path" - -${if} $4 == "" - - SectionGetFlags "${SecGTK}" $0 - IntOp $0 $0 | ${SF_SELECTED} - SectionSetFlags "${SecGTK}" $0 - -${Else} - - ${if} ${FileExists} `$4\*.*` - - SectionGetFlags "${SecGTK}" $0 - IntOp $0 $0 & ${SECTION_OFF} - SectionSetFlags "${SecGTK}" $0 - - ${Else} - - SectionGetFlags "${SecGTK}" $0 - IntOp $0 $0 | ${SF_SELECTED} - SectionSetFlags "${SecGTK}" $0 - - ${EndIf} - -${EndIf} - diff --git a/nsi/runtime-init.nsi.in b/nsi/runtime-init.nsi.in new file mode 100644 index 0000000..d45d98b --- /dev/null +++ b/nsi/runtime-init.nsi.in @@ -0,0 +1,27 @@ + +ReadRegStr $4 HKLM "Software\gtkwin\@GTK_MODVERSION@" "path" + +${if} $4 == "" + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${SecGTK}" $0 + +${Else} + + ${if} ${FileExists} `$4\*.*` + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 & ${SECTION_OFF} + SectionSetFlags "${SecGTK}" $0 + + ${Else} + + SectionGetFlags "${SecGTK}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${SecGTK}" $0 + + ${EndIf} + +${EndIf} + diff --git a/nsi/rx3270-init-i686.nsi b/nsi/rx3270-init-i686.nsi deleted file mode 100644 index c0871de..0000000 --- a/nsi/rx3270-init-i686.nsi +++ /dev/null @@ -1,8 +0,0 @@ -${if} ${FileExists} `$PROGRAMFILES\ooRexx\rexx.exe` - - SectionGetFlags "${RexxPlugin}" $0 - IntOp $0 $0 | ${SF_SELECTED} - SectionSetFlags "${RexxPlugin}" $0 - -${EndIf} - diff --git a/nsi/rx3270-init.nsi b/nsi/rx3270-init.nsi new file mode 100644 index 0000000..c0871de --- /dev/null +++ b/nsi/rx3270-init.nsi @@ -0,0 +1,8 @@ +${if} ${FileExists} `$PROGRAMFILES\ooRexx\rexx.exe` + + SectionGetFlags "${RexxPlugin}" $0 + IntOp $0 $0 | ${SF_SELECTED} + SectionSetFlags "${RexxPlugin}" $0 + +${EndIf} + diff --git a/po/pt_BR.po b/po/pt_BR.po index 15a8adb..ddbe4bb 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-28 08:33-0300\n" +"POT-Creation-Date: 2015-08-28 10:29-0300\n" "PO-Revision-Date: 2014-02-17 08:05-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Portugues <>\n" -- libgit2 0.21.2