Atualizando empacotamento windows, incluindo extensão python para windows (quando disponível).

Perry Werneck
1 parent cd5453b7
Showing 18 changed files with 81 additions and 70 deletions Show diff stats
nsi/Makefile.in
nsi/header-i686-no-gtk.nsi.in
nsi/header-i686.nsi.in
nsi/header-x86_64-no-gtk.nsi.in
nsi/header-x86_64.nsi.in
nsi/hllapi.nsi.in
nsi/java-extension.nsi
nsi/main-begin-i686.nsi.in
nsi/main-begin-x86_64.nsi.in
nsi/main-end.nsi.in
nsi/python-extension.nsi
nsi/rexx-extension.nsi
nsi/runtime.nsi.in
nsi/rx3270.nsi.in
nsi/sdk.nsi.in
nsi/uninstall-i686.nsi.in
nsi/uninstall-x86_64.nsi.in
po/pt_BR.po
@@ -65,7 +65,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
 	sdk.nsi \
 	uninstall-$(HOST_CPU).nsi \
 	oninit-$(HOST_CPU).nsi \
-	$(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi )
+	$(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) \
+	$(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )
  
 	@rm -f $@
 	@cat header-$(HOST_CPU).nsi		> 	$@
@@ -74,6 +75,7 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
 	# Install plugins
  
 	@cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN).nsi )	>> $@
+	@cat $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )	>> $@
  
 	# Finalize
  
@@ -9,9 +9,9 @@ XPStyle on
 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"
+!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"
@@ -29,7 +29,7 @@ VIAddVersionKey &quot;LegalCopyright&quot; &quot;GPL-2.0&quot;
  
 !define MUI_ABORTWARNING
 # !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
@@ -9,9 +9,9 @@ XPStyle on
 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"
+!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"
@@ -29,7 +29,7 @@ VIAddVersionKey &quot;LegalCopyright&quot; &quot;GPL-2.0&quot;
  
 !define MUI_ABORTWARNING
 # !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
@@ -9,9 +9,9 @@ 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"
+!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"
@@ -29,7 +29,7 @@ VIAddVersionKey &quot;LegalCopyright&quot; &quot;GPL-2.0&quot;
  
 !define MUI_ABORTWARNING
 # !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
@@ -9,9 +9,9 @@ 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"
+!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"
@@ -29,7 +29,7 @@ VIAddVersionKey &quot;LegalCopyright&quot; &quot;GPL-2.0&quot;
  
 !define MUI_ABORTWARNING
 # !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "LICENSE"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
@@ -2,8 +2,8 @@
 			setOutPath $INSTDIR
  
 			CreateDirectory "$INSTDIR\plugins"
-			file "/oname=$INSTDIR\plugins\hllapi.dll"	".bin\Release\plugins\hllapi.dll"
-			file "/oname=$SYSDIR\libhllapi.dll"			".bin\Release\hllapi.dll.@PACKAGE_VERSION@"
+			file "/oname=$INSTDIR\plugins\hllapi.dll"	"..\.bin\Release\plugins\hllapi.dll"
+			file "/oname=$SYSDIR\libhllapi.dll"			"..\.bin\Release\hllapi.dll.@PACKAGE_VERSION@"
  
 		sectionEnd
  
@@ -11,20 +11,20 @@ SubSection &quot;@PACKAGE@&quot; SecMain
 		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@"
+		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"
+		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"
+		file "/oname=$INSTDIR\ChangeLog"						"..\ChangeLog"
+		file "/oname=$INSTDIR\AUTHORS"							"..\AUTHORS"
+		file "/oname=$INSTDIR\LICENSE"							"..\LICENSE"
  
 		# Misc folders
 		CreateDirectory "$INSTDIR\certs"
@@ -33,11 +33,11 @@ SubSection &quot;@PACKAGE@&quot; SecMain
 		# UI definition files
 		CreateDirectory "$INSTDIR\ui"
  
-		file "/oname=$INSTDIR\ui\00default.xml" 	"uiui\00default.xml"0default.xml"
+		file "/oname=$INSTDIR\ui\00default.xml" 				"..\uiui\00default.xml"0default.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"
+		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"
@@ -14,20 +14,20 @@ SubSection &quot;@PACKAGE@&quot; SecMain
 		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@"
+		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"
+		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"
+		file "/oname=$INSTDIR\ChangeLog"			"..\ChangeLog"
+		file "/oname=$INSTDIR\AUTHORS"				"..\AUTHORS"
+		file "/oname=$INSTDIR\LICENSE"				"..\LICENSE"
  
 		# Misc folders
 		CreateDirectory "$INSTDIR\certs"
@@ -36,11 +36,11 @@ SubSection &quot;@PACKAGE@&quot; SecMain
 		# UI definition files
 		CreateDirectory "$INSTDIR\ui"
  
-		file "/oname=$INSTDIR\ui\00default.xml" 	"uiui\00default.xml"0default.xml"
+		file "/oname=$INSTDIR\ui\00default.xml" 	"..\uiui\00default.xml"0default.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"
+		file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
  
 		# Save DataDir
 		SetRegView 64
@@ -3,20 +3,20 @@
  
 	SubSection "Menus, Keypads & Toolbars" SecMenu
  
-		Section "Keypad" TraceMenu
-			file "/oname=$INSTDIR\ui\10keypad.xml" "ui\10keypad.xml"
+		Section "Keypad" KeypadMenu
+			file "/oname=$INSTDIR\ui\10keypad.xml" "..\ui\10keypad.xml"
 		sectionEnd
  
-		Section "Functions" TraceMenu
-			file "/oname=$INSTDIR\ui\10functions.xml" "ui\10functions.xml"
+		Section "Functions" FunctionsMenu
+			file "/oname=$INSTDIR\ui\10functions.xml" "..\ui\10functions.xml"
 		sectionEnd
  
 		Section /o "View trace Menu" TraceMenu
-			file "/oname=$INSTDIR\ui\98trace.xml" "ui8trace.xml"
+			file "/oname=$INSTDIR\ui\98trace.xml" "..\ui8trace.xml"
 		sectionEnd
  
 		Section /o "Application debug" DBGMenu
-			file "/oname=$INSTDIR\ui\99debug.xml" "ui9debug.xml"
+			file "/oname=$INSTDIR\ui\99debug.xml" "..\ui9debug.xml"
 		sectionEnd
  
 	SubSectionEnd
@@ -0,0 +1,7 @@
+		Section /o "Python" PythonModule
+
+			setOutPath $INSTDIR
+			file "/oname=$SYSDIR\py3270.dll" "..\.bin\Release\py3270.dll"
+
+		sectionEnd
+
@@ -2,7 +2,7 @@
 Section "GTK @GTK_MODVERSION@ Runtime" SecGTK
  
 	setOutPath $INSTDIR
-	file /r ".bin\gtkruntime\*.*"
+	file /r "..\.bin\gtkruntime\*.*"
  
 SectionEnd
  
@@ -2,12 +2,12 @@
  
 			setOutPath $INSTDIR
  
-			file "/oname=$INSTDIR\plugins\rxplug.dll" ".bin\Release\plugins\rx3270.dll"
-			file "/oname=$INSTDIR\ui\80rexx.xml" "ui\80rexx.xml"
+			file "/oname=$INSTDIR\plugins\rxplug.dll"	"..\.bin\Release\plugins\rx3270.dll"
+			file "/oname=$INSTDIR\ui\80rexx.xml" 		"..\ui\80rexx.xml"
  
-			file "/oname=$PROGRAMFILES\ooRexx\rx3270.cls" "src\plugins\rx3270\rx3270.cls"
-			file "/oname=$INSTDIR\rx3270.dll.@PACKAGE_VERSION@" ".bin\Release\rx3270.dll.@PACKAGE_VERSION@"
-			file "/oname=$PROGRAMFILES\ooRexx\rx3270.dll" ".bin\Release\rx3270.dll.@PACKAGE_VERSION@"
+			file "/oname=$PROGRAMFILES\ooRexx\rx3270.cls"		"..\src\plugins\rx3270\rx3270.cls"
+			file "/oname=$INSTDIR\rx3270.dll.@PACKAGE_VERSION@"	"..\.bin\Release\rx3270.dll.@PACKAGE_VERSION@"
+			file "/oname=$PROGRAMFILES\ooRexx\rx3270.dll"		"..\.bin\Release\rx3270.dll.@PACKAGE_VERSION@"
  
 		sectionEnd
  
@@ -9,28 +9,28 @@ Section /o &quot;Software Development Kit&quot; SecSDK
 	CreateDirectory "$INSTDIR\sdk\sample\classlib"
  
 	setOutPath $INSTDIR\sdk\include
-	file "src\include\lib3270.h"
-	file "src\include\pw3270.h"
+	file "..\src\include\lib3270.h"
+	file "..\src\include\pw3270.h"
  
 	setOutPath $INSTDIR\sdk\include\pw3270
-	file "src\include\pw3270\class.h"
-	file "src\include\pw3270\hllapi.h"
-	file "src\include\pw3270\ipcpackets.h"
-	file "src\include\pw3270\plugin.h"
-	file "src\include\pw3270\trace.h"
-	file "src\include\pw3270\v3270.h"
+	file "..\src\include\pw3270\class.h"
+	file "..\src\include\pw3270\hllapi.h"
+	file "..\src\include\pw3270\ipcpackets.h"
+	file "..\src\include\pw3270\plugin.h"
+	file "..\src\include\pw3270\trace.h"
+	file "..\src\include\pw3270\v3270.h"
  
 	setOutPath $INSTDIR\sdk\include\lib3270
-	file "src\include\lib3270\config.h"
-	file "src\include\rules.mak"
+	file "..\src\include\lib3270\config.h"
+	file "..\src\include\rules.mak"
  
 	setOutPath $INSTDIR\sdk\sample\connect
-	file "src\sample\Makefile"
-	file "src\sample\connect.c"
+	file "..\src\sample\Makefile"
+	file "..\src\sample\connect.c"
  
 	setOutPath $INSTDIR\sdk\sample\classlib
-	file "src\classlib\*.cc"
-	file "src\include\pw3270\class.h"
+	file "..\src\classlib\*.cc"
+	file "..\src\include\pw3270\class.h"
  
 SectionEnd
  
@@ -32,6 +32,7 @@ section &quot;Uninstall&quot;
  
 	# Delete System libraries
 	delete $SYSDIR\libhllapi.dll
+	delete $SYSDIR\py3270.dll
  
 	# Delete extension libraries
 	delete "$PROGRAMFILES\ooRexx\rx3270.cls"
@@ -34,6 +34,7 @@ section &quot;Uninstall&quot;
  
 	# Delete System libraries
 	delete $SYSDIR\libhllapi.dll
+	delete $SYSDIR\py3270.dll
  
 	# Delete extension libraries
 	delete "$PROGRAMFILES64\ooRexx\rx3270.cls"
@@ -5,7 +5,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-11-03 08:25-0200\n"
+"POT-Creation-Date: 2015-11-03 10:19-0200\n"
 "PO-Revision-Date: 2014-02-17 08:05-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Portugues <>\n"
...	...	@@ -65,7 +65,8 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
65	65	sdk.nsi \
66	66	uninstall-$(HOST_CPU).nsi \
67	67	oninit-$(HOST_CPU).nsi \
68		- $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi )
	68	+ $(foreach PLUGIN, $(PLUGINS), $(PLUGIN)-init.nsi ) \
	69	+ $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi )
69	70
70	71	@rm -f $@
71	72	@cat header-$(HOST_CPU).nsi > $@
...	...	@@ -74,6 +75,7 @@ $(PACKAGE_NAME)-$(HOST_CPU).nsi: \
74	75	# Install plugins
75	76
76	77	@cat $(foreach PLUGIN, $(PLUGINS), $(PLUGIN).nsi ) >> $@
	78	+ @cat $(foreach EXTENSION, $(EXTENSIONS), $(EXTENSION)-extension.nsi ) >> $@
77	79
78	80	# Finalize
79	81
...	...
...	...	@@ -9,9 +9,9 @@ XPStyle on
9	9	installDir $PROGRAMFILES\@PACKAGE@
10	10
11	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"
	12	+!define MUI_ICON "..\src\pw3270\@PACKAGE@.ico"
	13	+!define MUI_UNICON "..\src\pw3270\@PACKAGE@.ico"
	14	+icon "..\src\pw3270\@PACKAGE@.ico"
15	15
16	16	# Get installation folder from registry if available
17	17	InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
...	...	@@ -29,7 +29,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
29	29
30	30	!define MUI_ABORTWARNING
31	31	# !insertmacro MUI_PAGE_WELCOME
32		-!insertmacro MUI_PAGE_LICENSE "LICENSE"
	32	+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
33	33	!insertmacro MUI_PAGE_COMPONENTS
34	34	!insertmacro MUI_PAGE_DIRECTORY
35	35	!insertmacro MUI_PAGE_INSTFILES
...	...
...	...	@@ -9,9 +9,9 @@ XPStyle on
9	9	installDir "$PROGRAMFILES64\pw3270"
10	10
11	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"
	12	+!define MUI_ICON "..\src\pw3270\@PACKAGE@.ico"
	13	+!define MUI_UNICON "..\src\pw3270\@PACKAGE@.ico"
	14	+icon "..\src\pw3270\@PACKAGE@.ico"
15	15
16	16	# Get installation folder from registry if available
17	17	InstallDirRegKey HKLM "Software\@PACKAGE@" "InstallLocation"
...	...	@@ -29,7 +29,7 @@ VIAddVersionKey "LegalCopyright" "GPL-2.0"
29	29
30	30	!define MUI_ABORTWARNING
31	31	# !insertmacro MUI_PAGE_WELCOME
32		-!insertmacro MUI_PAGE_LICENSE "LICENSE"
	32	+!insertmacro MUI_PAGE_LICENSE "../LICENSE"
33	33	!insertmacro MUI_PAGE_COMPONENTS
34	34	!insertmacro MUI_PAGE_DIRECTORY
35	35	!insertmacro MUI_PAGE_INSTFILES
...	...
...	...	@@ -2,8 +2,8 @@
2	2	setOutPath $INSTDIR
3	3
4	4	CreateDirectory "$INSTDIR\plugins"
5		- file "/oname=$INSTDIR\plugins\hllapi.dll" ".bin\Release\plugins\hllapi.dll"
6		- file "/oname=$SYSDIR\libhllapi.dll" ".bin\Release\hllapi.dll.@PACKAGE_VERSION@"
	5	+ file "/oname=$INSTDIR\plugins\hllapi.dll" "..\.bin\Release\plugins\hllapi.dll"
	6	+ file "/oname=$SYSDIR\libhllapi.dll" "..\.bin\Release\hllapi.dll.@PACKAGE_VERSION@"
7	7
8	8	sectionEnd
9	9
...	...
...	...	@@ -11,20 +11,20 @@ SubSection "@PACKAGE@" SecMain
11	11	createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
12	12
13	13	# Binary files
14		- file "/oname=$INSTDIR\@PACKAGE@.exe" ".bin\Release\@PACKAGE@.exe"
15		- file "/oname=$INSTDIR\@PACKAGE@.ico" "src\pw3270\@PACKAGE@.ico"
16		- file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@"
17		- file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@" ".bin\Release\pw3270.dll.@PACKAGE_VERSION@"
	14	+ file "/oname=$INSTDIR\@PACKAGE@.exe" "..\.bin\Release\@PACKAGE@.exe"
	15	+ file "/oname=$INSTDIR\@PACKAGE@.ico" "..\src\pw3270\@PACKAGE@.ico"
	16	+ file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@" "..\.bin\Release\lib3270.dll.@PACKAGE_VERSION@"
	17	+ file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@" "..\.bin\Release\pw3270.dll.@PACKAGE_VERSION@"
18	18
19	19	# Configuration files
20		- file "/oname=$INSTDIR\@PACKAGE@-logo.png" "src\pw3270\@PACKAGE@-logo.png"
21		- file "/oname=$INSTDIR\@PACKAGE@.png" "src\pw3270\@PACKAGE@.png"
22		- file "/oname=$INSTDIR\colors.conf" "colors.conf"
	20	+ file "/oname=$INSTDIR\@PACKAGE@-logo.png" "..\src\pw3270\@PACKAGE@-logo.png"
	21	+ file "/oname=$INSTDIR\@PACKAGE@.png" "..\src\pw3270\@PACKAGE@.png"
	22	+ file "/oname=$INSTDIR\colors.conf" "..\colors.conf"
23	23
24	24	# Documentation files
25		- file "/oname=$INSTDIR\ChangeLog" "ChangeLog"
26		- file "/oname=$INSTDIR\AUTHORS" "AUTHORS"
27		- file "/oname=$INSTDIR\LICENSE" "LICENSE"
	25	+ file "/oname=$INSTDIR\ChangeLog" "..\ChangeLog"
	26	+ file "/oname=$INSTDIR\AUTHORS" "..\AUTHORS"
	27	+ file "/oname=$INSTDIR\LICENSE" "..\LICENSE"
28	28
29	29	# Misc folders
30	30	CreateDirectory "$INSTDIR\certs"
...	...	@@ -33,11 +33,11 @@ SubSection "@PACKAGE@" SecMain
33	33	# UI definition files
34	34	CreateDirectory "$INSTDIR\ui"
35	35
36		- file "/oname=$INSTDIR\ui\00default.xml" "uiui\00default.xml"0default.xml"
	36	+ file "/oname=$INSTDIR\ui\00default.xml" "..\uiui\00default.xml"0default.xml"
37	37
38	38	# Locale files
39	39	CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
40		- file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" ".bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
	40	+ file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
41	41
42	42	# Save DataDir
43	43	WriteRegStr HKLM "Software\@PACKAGE@" "datadir" "$INSTDIR"
...	...
...	...	@@ -14,20 +14,20 @@ SubSection "@PACKAGE@" SecMain
14	14	createShortCut "$DESKTOP\@PACKAGE@.lnk" "$INSTDIR\@PACKAGE@.exe"
15	15
16	16	# Binary files
17		- file "/oname=$INSTDIR\@PACKAGE@.exe" ".bin\Release\@PACKAGE@.exe"
18		- file "/oname=$INSTDIR\@PACKAGE@.ico" "src\pw3270\@PACKAGE@.ico"
19		- file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@" ".bin\Release\lib3270.dll.@PACKAGE_VERSION@"
20		- file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@" ".bin\Release\pw3270.dll.@PACKAGE_VERSION@"
	17	+ file "/oname=$INSTDIR\@PACKAGE@.exe" "..\.bin\Release\@PACKAGE@.exe"
	18	+ file "/oname=$INSTDIR\@PACKAGE@.ico" "..\src\pw3270\@PACKAGE@.ico"
	19	+ file "/oname=$INSTDIR\lib3270.dll.@PACKAGE_VERSION@" "..\.bin\Release\lib3270.dll.@PACKAGE_VERSION@"
	20	+ file "/oname=$INSTDIR\pw3270.dll.@PACKAGE_VERSION@" "..\.bin\Release\pw3270.dll.@PACKAGE_VERSION@"
21	21
22	22	# Configuration files
23		- file "/oname=$INSTDIR\@PACKAGE@-logo.png" "src\pw3270\@PACKAGE@-logo.png"
24		- file "/oname=$INSTDIR\@PACKAGE@.png" "src\pw3270\@PACKAGE@.png"
25		- file "/oname=$INSTDIR\colors.conf" "colors.conf"
	23	+ file "/oname=$INSTDIR\@PACKAGE@-logo.png" "..\src\pw3270\@PACKAGE@-logo.png"
	24	+ file "/oname=$INSTDIR\@PACKAGE@.png" "..\src\pw3270\@PACKAGE@.png"
	25	+ file "/oname=$INSTDIR\colors.conf" "..\colors.conf"
26	26
27	27	# Documentation files
28		- file "/oname=$INSTDIR\ChangeLog" "ChangeLog"
29		- file "/oname=$INSTDIR\AUTHORS" "AUTHORS"
30		- file "/oname=$INSTDIR\LICENSE" "LICENSE"
	28	+ file "/oname=$INSTDIR\ChangeLog" "..\ChangeLog"
	29	+ file "/oname=$INSTDIR\AUTHORS" "..\AUTHORS"
	30	+ file "/oname=$INSTDIR\LICENSE" "..\LICENSE"
31	31
32	32	# Misc folders
33	33	CreateDirectory "$INSTDIR\certs"
...	...	@@ -36,11 +36,11 @@ SubSection "@PACKAGE@" SecMain
36	36	# UI definition files
37	37	CreateDirectory "$INSTDIR\ui"
38	38
39		- file "/oname=$INSTDIR\ui\00default.xml" "uiui\00default.xml"0default.xml"
	39	+ file "/oname=$INSTDIR\ui\00default.xml" "..\uiui\00default.xml"0default.xml"
40	40
41	41	# Locale files
42	42	CreateDirectory "$INSTDIR\@localedir@\pt_BR\LC_MESSAGES"
43		- file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" ".bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
	43	+ file "/oname=$INSTDIR\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "..\.bin\Release\@localedir@\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
44	44
45	45	# Save DataDir
46	46	SetRegView 64
...	...
...	...	@@ -3,20 +3,20 @@
3	3
4	4	SubSection "Menus, Keypads & Toolbars" SecMenu
5	5
6		- Section "Keypad" TraceMenu
7		- file "/oname=$INSTDIR\ui\10keypad.xml" "ui\10keypad.xml"
	6	+ Section "Keypad" KeypadMenu
	7	+ file "/oname=$INSTDIR\ui\10keypad.xml" "..\ui\10keypad.xml"
8	8	sectionEnd
9	9
10		- Section "Functions" TraceMenu
11		- file "/oname=$INSTDIR\ui\10functions.xml" "ui\10functions.xml"
	10	+ Section "Functions" FunctionsMenu
	11	+ file "/oname=$INSTDIR\ui\10functions.xml" "..\ui\10functions.xml"
12	12	sectionEnd
13	13
14	14	Section /o "View trace Menu" TraceMenu
15		- file "/oname=$INSTDIR\ui\98trace.xml" "ui8trace.xml"
	15	+ file "/oname=$INSTDIR\ui\98trace.xml" "..\ui8trace.xml"
16	16	sectionEnd
17	17
18	18	Section /o "Application debug" DBGMenu
19		- file "/oname=$INSTDIR\ui\99debug.xml" "ui9debug.xml"
	19	+ file "/oname=$INSTDIR\ui\99debug.xml" "..\ui9debug.xml"
20	20	sectionEnd
21	21
22	22	SubSectionEnd
...	...
...	...	@@ -0,0 +1,7 @@
	1	+ Section /o "Python" PythonModule
	2	+
	3	+ setOutPath $INSTDIR
	4	+ file "/oname=$SYSDIR\py3270.dll" "..\.bin\Release\py3270.dll"
	5	+
	6	+ sectionEnd
	7	+
...	...
...	...	@@ -2,7 +2,7 @@
2	2	Section "GTK @GTK_MODVERSION@ Runtime" SecGTK
3	3
4	4	setOutPath $INSTDIR
5		- file /r ".bin\gtkruntime\."
	5	+ file /r "..\.bin\gtkruntime\."
6	6
7	7	SectionEnd
8	8
...	...
...	...	@@ -2,12 +2,12 @@
2	2
3	3	setOutPath $INSTDIR
4	4
5		- file "/oname=$INSTDIR\plugins\rxplug.dll" ".bin\Release\plugins\rx3270.dll"
6		- file "/oname=$INSTDIR\ui\80rexx.xml" "ui\80rexx.xml"
	5	+ file "/oname=$INSTDIR\plugins\rxplug.dll" "..\.bin\Release\plugins\rx3270.dll"
	6	+ file "/oname=$INSTDIR\ui\80rexx.xml" "..\ui\80rexx.xml"
7	7
8		- file "/oname=$PROGRAMFILES\ooRexx\rx3270.cls" "src\plugins\rx3270\rx3270.cls"
9		- file "/oname=$INSTDIR\rx3270.dll.@PACKAGE_VERSION@" ".bin\Release\rx3270.dll.@PACKAGE_VERSION@"
10		- file "/oname=$PROGRAMFILES\ooRexx\rx3270.dll" ".bin\Release\rx3270.dll.@PACKAGE_VERSION@"
	8	+ file "/oname=$PROGRAMFILES\ooRexx\rx3270.cls" "..\src\plugins\rx3270\rx3270.cls"
	9	+ file "/oname=$INSTDIR\rx3270.dll.@PACKAGE_VERSION@" "..\.bin\Release\rx3270.dll.@PACKAGE_VERSION@"
	10	+ file "/oname=$PROGRAMFILES\ooRexx\rx3270.dll" "..\.bin\Release\rx3270.dll.@PACKAGE_VERSION@"
11	11
12	12	sectionEnd
13	13
...	...