Updating windows package.

Perry Werneck
1 parent e73735bc
Showing 3 changed files with 89 additions and 11 deletions Show diff stats
configure.ac
win/pack.sh
win/pw3270.nsi.in
@@ -81,6 +81,16 @@ dnl		INSTALL_PACKAGES=&quot;windows-lib ${INSTALL_PACKAGES}&quot;
 		AC_CONFIG_FILES(src/main/windows/resources.rc)
 		AC_CONFIG_FILES(schemas/windows/application.gschema.xml)
+		if test "$host_cpu" = "x86_64"; then
+			app_cv_programfiles="PROGRAMFILES64"
+			app_cv_winarch="64"
+			app_cv_nsisredir="DisableX64FSRedirection"
+		else
+			app_cv_programfiles="PROGRAMFILES"
+			app_cv_winarch="32"
+			app_cv_nsisredir="EnableX64FSRedirection"
+		fi
+
 		;;
  	*)
@@ -443,6 +443,15 @@ buildApplication()
 			failed "Can't install ${1}"
 		fi
+		if [ -x ${PROJECTDIR}/win/install.${1} ]; then
+			pushd "${WORKDIR}/build/${ARCH}"
+			echo "Executando install.${1} em ${PWD}"
+			${PROJECTDIR}/win/install.${1}
+			if [ "$?" != "0" ]; then
+				failed "Can't install ${1}"
+			fi
+			popd
+		fi
 		for NSI in $(find ./win -name '*.nsi')
 		do
@@ -552,6 +561,15 @@ makeInstaller()
 		fi
+		if [ -d ${PROJECTDIR}/ui ]; then
+			mkdir -p ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}/ui
+			cp -rv ${PROJECTDIR}/ui/* ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}/ui
+
+			if [ "$?" != "0" ]; then
+				failed "Can't copy UI files"
+			fi
+		fi
+
 		cd ${WORKDIR}/build/${ARCH}
 		TARCH=${ARCH}
+#
+# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+# aplicativos mainframe. Registro no INPI sob o nome G3270.
+#
+# Copyright (C) <2008> <Banco do Brasil S.A.>
+#
+# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+# os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+# Free Software Foundation.
+#
+# Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+# obter mais detalhes.
+#
+# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+# programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA, 02111-1307, USA
+#
+# Contatos:
+#
+# perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+# erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
+#
+
 !include "MUI2.nsh"
 !include "x64.nsh"
 !include "FileFunc.nsh"
 !include "LogicLib.nsh"
+!include "winmessages.nsh"
 Name "@PRODUCT_NAME@"
 Caption "@PRODUCT_NAME@ - @PACKAGE_DESCRIPTION@"
@@ -79,7 +106,6 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
 		file "/oname=$INSTDIR\lib@LIBRARY_NAME@.dll"			"lib@LIBRARY_NAME@.dll"
 		file "/oname=$INSTDIR\libv3270.dll"				"libv3270.dll"
 		file "/oname=$INSTDIR\@PACKAGE@.dll"				"@PACKAGE@.dll"
-		file "/oname=$SYSDIR\libipc3270.dll"				"libipc3270.dll"
 		# Configuration files
 		file "/oname=$INSTDIR\@PRODUCT_NAME@-logo.png"			"@PRODUCT_NAME@\@PRODUCT_NAME@-logo.png"
@@ -104,7 +130,10 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
 		# Locale files
 		CreateDirectory "$INSTDIR\locale\pt_BR\LC_MESSAGES"
-		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo" "locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
+		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"		"locale\pt_BR\LC_MESSAGES\@PACKAGE@.mo"
+		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo"	"locale\pt_BR\LC_MESSAGES\lib@LIBRARY_NAME@.mo"
+		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libv3270.mo"		"locale\pt_BR\LC_MESSAGES\libv3270.mo"
+		file "/oname=$INSTDIR\locale\pt_BR\LC_MESSAGES\libipc3270.mo"		"locale\pt_BR\LC_MESSAGES\libipc3270.mo"
 		# define uninstaller name
 		SetRegView 32
@@ -127,12 +156,15 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
 		WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@PRODUCT_NAME@" \
 			         "NoRepair" "1"
-		# Customized options
+		# Default settings
 		SetRegView @WINARCH@
 		# Required for IPC Library.
 		WriteRegStr 	HKLM	"Software\@PRODUCT_NAME@"			"InstallLocation"	"$INSTDIR"
+		# Customized options
+
+
 	sectionEnd
 !ifdef WITHCERTS
@@ -149,10 +181,13 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
 			setOutPath $INSTDIR
 			${DisableX64FSRedirection}
-			CreateDirectory "$INSTDIR\plugins"
+			CreateDirectory "$INSTDIR\plugins"
 			file "/oname=$INSTDIR\plugins\ipcserver.dll"	"@PRODUCT_NAME@-plugins\ipcserver.dll"
+			${@NSISREDIR@}
+			file "/oname=$SYSDIR\libipc3270.dll"		"libipc3270.dll"
+
 		sectionEnd
 	SubSectionEnd
@@ -163,7 +198,9 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
 !ifdef WITHLIBHLLAPI
 		Section /o "HLLAPI" HLLAPIBinding
-			${DisableX64FSRedirection}
+			${@NSISREDIR@}
+
+			# Install HLLAPI connector
 			file "/oname=$SYSDIR\hllapi.dll"		"libhllapi.dll"
 			# Install with "lib" prefix for compatibility.
@@ -175,11 +212,13 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
 !ifdef WITHMONO-TN3270
 		Section /o ".NET" DOTNET
-			${DisableX64FSRedirection}
 			CreateDirectory "$INSTDIR\dotnet"
+			${DisableX64FSRedirection}
 			file "/oname=$INSTDIR\dotnet\tn3270.dll"	"mono/lib/tn3270-5.2/tn3270.dll"
 			file "/oname=$INSTDIR\dotnet\tn3270.xml"	"mono/gapi-2.0/tn3270/tn3270.xml"
+
+			${@NSISREDIR@}
 			file "/oname=$SYSDIR\mono-tn3270.dll"		"mono-tn3270.dll"
 		SectionEnd
@@ -218,11 +257,13 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
 		CreateDirectory "$INSTDIR\sdk\def"
 		CreateDirectory "$INSTDIR\sdk\lib"
-		file "/oname=$INSTDIR\sdk\def\lib@LIBRARY_NAME@.def"		"@PRODUCT_NAME@\def\lib@LIBRARY_NAME@.def"
+		file "/oname=$INSTDIR\sdk\def\lib@LIBRARY_NAME@.def"	"@PRODUCT_NAME@\def\lib@LIBRARY_NAME@.def"
 		file "/oname=$INSTDIR\sdk\lib\lib3270.dll.a"		"lib@LIBRARY_NAME@.dll.a"
 		file "/oname=$INSTDIR\sdk\lib\lib3270.delayed.a"	"lib@LIBRARY_NAME@.delayed.a"
 		file "/oname=$INSTDIR\sdk\lib\lib3270.static.a"		"lib@LIBRARY_NAME@.static.a"
+		file "/oname=$INSTDIR\sdk\lib3270.mak"			"@PRODUCT_NAME@\def\lib3270.mak"
+
 		file "/oname=$INSTDIR\sdk\def\libv3270.def"		"@PRODUCT_NAME@\def\libv3270.def"
 		file "/oname=$INSTDIR\sdk\lib\libv3270.dll.a"		"libv3270.dll.a"
@@ -233,6 +274,10 @@ SubSection &quot;@PRODUCT_NAME@&quot; SecMain
 		file "/oname=$INSTDIR\sdk\def\libhllapi.def"		"@PRODUCT_NAME@\def\libhllapi.def"
 		file "/oname=$INSTDIR\sdk\lib\libhllapi.dll.a"		"libhllapi.dll.a"
+		SetRegView @WINARCH@
+		WriteRegExpandStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PW3270_SDK_PATH" "$INSTDIR\sdk"
+		SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
 	SectionEnd
 !endif
@@ -268,6 +313,7 @@ Section &quot;Uninstall&quot;
 	RMDir /r "$INSTDIR\sdk"
 	RMDir /r "$INSTDIR\gtk2-runtime"
+
 	# Delete all files
 	delete "$INSTDIR\*.dll"
@@ -278,16 +324,20 @@ Section &quot;Uninstall&quot;
 	SetRegView @WINARCH@
 	DeleteRegKey HKLM "Software\@PRODUCT_NAME@"
+	DeleteRegValue HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PW3270_SDK_PATH"
+	SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
 	# Delete System libraries
+	${@NSISREDIR@}
+
 	delete $SYSDIR\libipc3270.dll
-!ifdef WITHHLLAPI
+!ifdef WITHLIBHLLAPI
 	delete $SYSDIR\libhllapi.dll
 	delete $SYSDIR\hllapi.dll
 !endif
-!ifdef WITHMONO
+!ifdef WITHMONO-TN3270
 	delete $SYSDIR\mono-tn3270.dll
 !endif
@@ -299,7 +349,7 @@ Function .onInit
 	#---[ Check DOTNET Command line option ]0-------------------------------------------------------------
-!ifdef WITHMONO
+!ifdef WITHMONO-TN3270
 	Push $0
 	${GetParameters} $R0
@@ -329,7 +379,7 @@ Function .onInit
 	#---[ Check HLLAPI Command line option ]-------------------------------------------------------------
-!ifdef WITHHLLAPI
+!ifdef WITHLIBHLLAPI
 	Push $0
	@@ -81,6 +81,16 @@ dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}"		@@ -81,6 +81,16 @@ dnl INSTALL_PACKAGES="windows-lib ${INSTALL_PACKAGES}"
81	AC_CONFIG_FILES(src/main/windows/resources.rc)	81	AC_CONFIG_FILES(src/main/windows/resources.rc)
82	AC_CONFIG_FILES(schemas/windows/application.gschema.xml)	82	AC_CONFIG_FILES(schemas/windows/application.gschema.xml)
83		83
		84	+ if test "$host_cpu" = "x86_64"; then
		85	+ app_cv_programfiles="PROGRAMFILES64"
		86	+ app_cv_winarch="64"
		87	+ app_cv_nsisredir="DisableX64FSRedirection"
		88	+ else
		89	+ app_cv_programfiles="PROGRAMFILES"
		90	+ app_cv_winarch="32"
		91	+ app_cv_nsisredir="EnableX64FSRedirection"
		92	+ fi
		93	+
84	;;	94	;;
85		95
86	*)	96	*)
	@@ -443,6 +443,15 @@ buildApplication()		@@ -443,6 +443,15 @@ buildApplication()
443	failed "Can't install ${1}"	443	failed "Can't install ${1}"
444	fi	444	fi
445		445
		446	+ if [ -x ${PROJECTDIR}/win/install.${1} ]; then
		447	+ pushd "${WORKDIR}/build/${ARCH}"
		448	+ echo "Executando install.${1} em ${PWD}"
		449	+ ${PROJECTDIR}/win/install.${1}
		450	+ if [ "$?" != "0" ]; then
		451	+ failed "Can't install ${1}"
		452	+ fi
		453	+ popd
		454	+ fi
446		455
447	for NSI in $(find ./win -name '*.nsi')	456	for NSI in $(find ./win -name '*.nsi')
448	do	457	do
	@@ -552,6 +561,15 @@ makeInstaller()		@@ -552,6 +561,15 @@ makeInstaller()
552		561
553	fi	562	fi
554		563
		564	+ if [ -d ${PROJECTDIR}/ui ]; then
		565	+ mkdir -p ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}/ui
		566	+ cp -rv ${PROJECTDIR}/ui/* ${WORKDIR}/build/${ARCH}/${PRODUCT_NAME}/ui
		567	+
		568	+ if [ "$?" != "0" ]; then
		569	+ failed "Can't copy UI files"
		570	+ fi
		571	+ fi
		572	+
555	cd ${WORKDIR}/build/${ARCH}	573	cd ${WORKDIR}/build/${ARCH}
556		574
557	TARCH=${ARCH}	575	TARCH=${ARCH}