Updating windows builds.

Perry Werneck
1 parent 3a057b77
Showing 2 changed files with 32 additions and 10 deletions Show diff stats
win/pack.sh
win/pw3270.nsi.in
@@ -5,7 +5,7 @@ LIBRARY_NAME=&quot;lib3270&quot;
 CORE_LIBRARIES="lib3270 libv3270"
 PACKAGE_PLUGINS="ipc"
 PACKAGE_LANGUAGE_BINDINGS="hllapi"
-TARGET_ARCHS="x86_32 x86_64"
+TARGET_ARCHS="x86_64"
 GIT_URL="https://github.com/PerryWerneck"
 PROJECTDIR=$(dirname $(dirname $(readlink -f ${0})))
@@ -81,6 +81,8 @@ configure()
 		done
 	fi
+	echo -e "\e]2;Creating configuration\a"
+	echo "Creating configuration"
 	for DIR in $(find ${WORKDIR}/sources -maxdepth 1 -type d)
 	do
 		echo ${DIR}
@@ -159,6 +161,7 @@ buildLibrary()
 				LDFLAGS="-L${WORKDIR}/build/${ARCH}" \
 				--host=${host} \
 				--prefix=${prefix} \
+				--with-product-name="${PRODUCT_NAME}" \
 				--bindir=${WORKDIR}/build/${ARCH} \
 				--libdir=${WORKDIR}/build/${ARCH} \
 				--localedir=${WORKDIR}/build/${ARCH}/locale \
@@ -168,8 +171,6 @@ buildLibrary()
 				--datarootdir=${WORKDIR}/build/${ARCH}
 		fi
-		/bin/bash
-
 		if [ "$?" != "0" ]; then
 			failed "Can't configure ${1}"
 		fi
@@ -362,12 +363,19 @@ makeInstaller()
 {
 	NSIS_ARGS="-DWITHGTK"
+	if [ ! -z ${PACKAGE_PLUGINS} ]; then
+		NSIS_ARGS="${NSIS_ARGS} -DWITHPLUGINS"
+	fi
+
+	if [ ! -z ${PACKAGE_LANGUAGE_BINDINGS} ]; then
+		NSIS_ARGS="${NSIS_ARGS} -DWITHLANGUAGE"
+	fi
+
 	for ARG in $(echo ${PACKAGE_PLUGINS} | tr "[:lower:]" "[:upper:]") $(echo ${PACKAGE_LANGUAGE_BINDINGS} | tr "[:lower:]" "[:upper:]")
 	do
 		NSIS_ARGS="${NSIS_ARGS} -DWITH${ARG}"
 	done
-
 	for ARCH in ${TARGET_ARCHS}
 	do
@@ -134,8 +134,10 @@ SubSection &quot;@PACKAGE@&quot; SecMain
 	sectionEnd
+!ifdef WITHPLUGINS
 	SubSection "Plugins" SecPLugin
+!ifdef WITHIPC
 		Section /o "Remote control" IPCPlugin
 			setOutPath $INSTDIR
@@ -143,15 +145,19 @@ SubSection &quot;@PACKAGE@&quot; SecMain
 			${DisableX64FSRedirection}
 			CreateDirectory "$INSTDIR\plugins"
-			file "/oname=$INSTDIR\plugins\ipc3270c.dll"	"pw3270-plugins\ipcserver.dll"
+			file "/oname=$INSTDIR\plugins\ipcserver.dll"	"pw3270-plugins\ipcserver.dll"
 		sectionEnd
+!endif
 	SubSectionEnd
+!endif
+!ifdef WITHLANGUAGE
 	SubSection "Language bindins" Languages
-		Section /o "HLLAPI" HLLAPIPlugin
+!ifdef WITHHLLAPI
+		Section /o "HLLAPI" HLLAPIBinding
 			setOutPath $INSTDIR
@@ -159,8 +165,10 @@ SubSection &quot;@PACKAGE@&quot; SecMain
 			file "/oname=$SYSDIR\libhllapi.dll"		"libhllapi.dll"
 		sectionEnd
+!endif
 	SubSectionEnd
+!endif
 	SubSection "Menus, Keypads & Toolbars" SecMenu
@@ -236,6 +244,8 @@ Function .onInit
 	#---[ Check HLLAPI Command line option ]-------------------------------------------------------------
+!ifdef WITHHLLAPI
+
 	Push $0
 	${GetParameters} $R0
@@ -244,24 +254,28 @@ Function .onInit
 	${if} $0 == "NO"
-		SectionGetFlags ${HLLAPIPlugin} $0
+		SectionGetFlags ${HLLAPIBinding} $0
 		IntOp $0 $0 & ${SECTION_OFF}
-		SectionSetFlags ${HLLAPIPlugin} $0
+		SectionSetFlags ${HLLAPIBinding} $0
 	${else}
-		SectionGetFlags ${HLLAPIPlugin} $0
+		SectionGetFlags ${HLLAPIBinding} $0
 		IntOp $0 $0 | ${SF_SELECTED}
-		SectionSetFlags ${HLLAPIPlugin} $0
+		SectionSetFlags ${HLLAPIBinding} $0
+!ifdef WITHIPC
 		SectionGetFlags ${IPCPlugin} $0
 		IntOp $0 $0 | ${SF_SELECTED}
 		SectionSetFlags ${IPCPlugin} $0
+!endif
 	${EndIf}
 	Pop $0
+!endif
+
 !ifdef WITHGTK
 	#---[ Verifica se precisa instalar GTK ]-------------------------------------------------------------