From 58cf0b6c55e22504bf0ee01b7e2a429c70b7de07 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 1 Jul 2013 10:50:43 +0000 Subject: [PATCH] Acertando empacotamento windows --- configure.ac | 1 - po/pt_BR.po | 2 +- pw3270.nsi.in | 285 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/plugins/rx3270/Makefile.in | 6 +++--- 4 files changed, 4 insertions(+), 290 deletions(-) delete mode 100644 pw3270.nsi.in diff --git a/configure.ac b/configure.ac index 88560cd..cb622bf 100644 --- a/configure.ac +++ b/configure.ac @@ -552,7 +552,6 @@ AC_CONFIG_FILES([ lib3270.pc pw3270.pc pw3270.spec - pw3270.nsi pw3270-i686.nsi pw3270-x86_64.nsi src/include/rules.mak diff --git a/po/pt_BR.po b/po/pt_BR.po index ed06a9d..3b0df5d 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: 2013-06-28 16:57-0300\n" +"POT-Creation-Date: 2013-07-01 07:45-0300\n" "PO-Revision-Date: 2013-05-08 14:30-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" diff --git a/pw3270.nsi.in b/pw3270.nsi.in deleted file mode 100644 index d23b09a..0000000 --- a/pw3270.nsi.in +++ /dev/null @@ -1,285 +0,0 @@ -!include "MUI2.nsh" - -Name "@PACKAGE@" -Caption "@PACKAGE@ - 3270 Emulator for windows/gtk" -outfile "@PACKAGE@-@PACKAGE_VERSION@.@PACKAGE_LEVEL@-gtk-@GTK_MODVERSION@-@host_cpu@-install.exe" -XPStyle on - -# define the directory to install to -installDir $PROGRAMFILES\@PACKAGE@ - -#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 - -# default section -SubSection "@PACKAGE@" SecMain - - Section "Core" SecCore - - # define the output path for this file - setOutPath $INSTDIR - SetShellVarContext all - - createShortCut "$SMPROGRAMS\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe" - createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe" - - # Binary files - file "/oname=$INSTDIR\@PACKAGE@.exe" ".bin\Release\@PACKAGE@.exe" - file "/oname=$INSTDIR\@PACKAGE@.ico" "src\pw3270\@PACKAGE@.ico" - file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@" - file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@" ".bin\Release\pw3270.dll.@PACKAGE_VERSION@" - - # Configuration files - file "/oname=$INSTDIR\@PACKAGE@-logo.png" "src\pw3270\@PACKAGE@-logo.png" - file "/oname=$INSTDIR\@PACKAGE@.png" "src\pw3270\@PACKAGE@.png" - file "/oname=$INSTDIR\colors.conf" "colors.conf" - - # Documentation files - file "/oname=$INSTDIR\ChangeLog" "ChangeLog" - file "/oname=$INSTDIR\AUTHORS" "AUTHORS" - file "/oname=$INSTDIR\LICENSE" "LICENSE" - - # Misc folders - CreateDirectory "$INSTDIR\certs" - CreateDirectory "$INSTDIR\plugins" - - # UI definition files - CreateDirectory "$INSTDIR\ui" - - file "/oname=$INSTDIR\ui\00default.xml" "ui\00default.xml" - file "/oname=$INSTDIR\ui\10keypad.xml" "ui\10keypad.xml" - - # Locale files - CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES" - file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" ".bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" - - # Save DataDir - WriteRegStr HKLM "Software\@PACKAGE@" \ - "datadir" $INSTDIR - - # define uninstaller name - writeUninstaller $INSTDIR\uninstall.exe - - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ - "DisplayName" "@PACKAGE@ - 3270 emulator for windows/gtk" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ - "DisplayIcon" "$INSTDIR\@PACKAGE@.ico" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ - "DisplayVersion" "@PACKAGE_VERSION@ (Rev: @PACKAGE_REVISION@)" - - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ - "UninstallString" "$INSTDIR\uninstall.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ - "InstallLocation" "$INSTDIR" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ - "NoModify" "1" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" \ - "NoRepair" "1" - - # Save instalation dir - WriteRegStr HKCU "Software\@PACKAGE@" "" $INSTDIR - - sectionEnd - - SubSection "Plugins" SecPLugin - - Section /o "HLLAPI" HLLAPIPlugin - setOutPath $INSTDIR - - CreateDirectory "$INSTDIR\plugins" - file "/oname=$INSTDIR\plugins\hllapi.dll" ".bin\Release\plugins\hllapi.dll" - file "/oname=$SYSDIR\libhllapi.dll" ".bin\Release\libhllapi.dll" - - sectionEnd - -# -# Section /o "Rexx" RexxPlugin -# setOutPath $INSTDIR -# -# CreateDirectory "$INSTDIR" -# file src\plugins\rexx\rx3270.cls -# -# CreateDirectory "$INSTDIR\plugins" -# file "/oname=$INSTDIR\plugins\rx3270.dll" ".bin\Release\plugins\rx3270.dll" -# file "/oname=$INSTDIR\ui\rexx.xml" ui\rexx.xml -# -# sectionEnd -# - SubSectionEnd - -SubSectionEnd - -Section /o "GTK @GTK_MODVERSION@ Runtime" SecGTK - - setOutPath $INSTDIR - file /r ".bin\gtkruntime\*.*" - -SectionEnd - -Section /o "Software Development Kit" SecSDK - - CreateDirectory "$INSTDIR\sdk" - CreateDirectory "$INSTDIR\sdk\include" - CreateDirectory "$INSTDIR\sdk\include\lib3270" - CreateDirectory "$INSTDIR\sdk\include\pw3270" - - file "/oname=$INSTDIR\sdk\include\lib3270.h" "src\include\lib3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270.h" "src\include\pw3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270\v3270.h" "src\include\pw3270\v3270.h" - file "/oname=$INSTDIR\sdk\include\pw3270\hllapi.h" "src\include\pw3270\hllapi.h" - - file "/oname=$INSTDIR\sdk\include\lib3270\config.h" "src\include\lib3270\config.h" - file "/oname=$INSTDIR\sdk\include\lib3270\rules.mak" "src\include\rules.mak" - - file "/oname=$INSTDIR\sdk\sample\Makefile" "src\sample\Makefile" - file "/oname=$INSTDIR\sdk\sample\connect.c" "src\sample\connect.c" - - file "/oname=$INSTDIR\sdk\lib3270.def" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@.def" - file "/oname=$INSTDIR\sdk\pw3270.def" ".bin\Release\pw3270.dll.@PACKAGE_VERSION@.def" - file "/oname=$INSTDIR\sdk\libhllapi.def" ".bin\Release\libhllapi.dll.def" - -SectionEnd - -# create a section to define what the uninstaller does. -# the section will always be named "Uninstall" -section "Uninstall" - - # Always delete uninstaller first - delete $INSTDIR\uninstaller.exe - - # Set SMPROGRAMS and DESKTOP path - SetShellVarContext all - - # now delete installed files - delete $INSTDIR\@PACKAGE@.exe - - delete $SMPROGRAMS\@PACKAGE@.lnk - delete $DESKTOP\@PACKAGE@.lnk - - RMDir /r "$INSTDIR\locale" - RMDir /r "$INSTDIR\share" - RMDir /r "$INSTDIR\etc" - RMDir /r "$INSTDIR\plugins" - RMDir /r "$INSTDIR\sdk" - RMDir /r "$INSTDIR\gtk2-runtime" - - # Delete all files - delete "$INSTDIR\*.dll" - - # Remove registry - DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PACKAGE@" - DeleteRegKey HKLM "Software\@PACKAGE@" - - # Delete System libraries - delete $SYSDIR\libhllapi.dll - - # Delete extension libraries -# delete $PROGRAMFILES\ooRexx\rx3270.dll - - RMDir /r "$INSTDIR" - -sectionEnd - -Function .onInit - -#FindProcDLL::FindProc "@PACKAGE@.exe" -#IntCmp $R0 1 0 notRunning -# -# MessageBox MB_OK|MB_ICONEXCLAMATION "@PACKAGE@ is running. Please close it first" /SD IDOK -# Abort -# -#notRunning: - -#IfFileExists $PROGRAMFILES\ooRexx\rexx.exe RexxOK RexxNOK -# -#RexxOK: -# SectionGetFlags "${RexxPlugin}" $0 -# IntOp $0 $0 | ${SF_SELECTED} -# SectionSetFlags "${RexxPlugin}" $0 -# -# SectionGetFlags "${SecRexxLib}" $0 -# IntOp $0 $0 | ${SF_SELECTED} -# SectionSetFlags "${SecRexxLib}" $0 -# -#goto PastRexxCheck -# -#RexxNOK: -# SectionGetFlags "${RexxPlugin}" $0 -# IntOp $0 $0 | ${SF_RO} -# SectionSetFlags "${RexxPlugin}" $0 -# -# SectionGetFlags "${SecRexxLib}" $0 -# IntOp $0 $0 | ${SF_RO} -# SectionSetFlags "${SecRexxLib}" $0 -# -#PastRexxCheck: - - ReadRegStr $4 HKLM "Software\GTK2-Runtime" "DllPath" - - # remove trailing back slash - Push $4 - Exch $EXEDIR - Exch $EXEDIR - Pop $4 - - # if Gtk runtime DLL path exists gtk runtime is already installed. - IfFileExists $4 gtkOK gtkNOK - -gtkOK: - - SectionGetFlags "${SecGTK}" $0 - IntOp $0 $0 & ${SECTION_OFF} - SectionSetFlags "${SecGTK}" $0 - -goto PastGTKCheck - -gtkNOK: - - SectionGetFlags "${SecGTK}" $0 - IntOp $0 $0 | ${SF_SELECTED} - SectionSetFlags "${SecGTK}" $0 - -goto PastGTKCheck - - - -PastGTKCheck: - - -FunctionEnd - - diff --git a/src/plugins/rx3270/Makefile.in b/src/plugins/rx3270/Makefile.in index 9cfc28a..ae8986d 100644 --- a/src/plugins/rx3270/Makefile.in +++ b/src/plugins/rx3270/Makefile.in @@ -47,7 +47,7 @@ include ../../include/plugin.mak #---[ Debug Targets ]---------------------------------------------------------- -$(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME).$(VERSION) +$(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ @DBGRPATH@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS) @@ -59,7 +59,7 @@ $(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ #---[ Release Targets ]-------------------------------------------------------- -$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME).$(VERSION) +$(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) $(GTK_LIBS) $(GLIB_LIBS) $(PW3270_LIBS) @@ -70,7 +70,7 @@ $(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJ $(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) @RLS_LDFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) install: - @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins + @$(MKDIR) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugin @$(INSTALL_PROGRAM) $(BINRLS)/$(PLUGIN_NAME) $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-plugins @$(MKDIR) $(DESTDIR)$(REXXLIBDIR) -- libgit2 0.21.2