Working on windows package.

Perry Werneck
1 parent 220d52a0
Showing 2 changed files with 22 additions and 4 deletions Show diff stats
win/makeruntime.sh.in
win/pack.sh
@@ -285,7 +285,7 @@ do
                 value=${tmp##*=}
                 case "$parameter" in
-		PATH)
+		OUTPUT-DIR)
 			TARGET=$value
 			;;
@@ -325,6 +325,4 @@ copy_theme &quot;Adwaita&quot;
 #echo "Optimizing..."
 #find ${TARGET} -iname *.png -exec optipng -o7 -quiet {} \; 2>&1 > /dev/null
-
-
 echo "Runtime ok"
@@ -304,7 +304,7 @@ makeRuntime()
 			chmod +x ${SCRIPT}
 			cd ${WORKDIR}/build/${ARCH}
-			${SCRIPT} --output-dir="${WORKDIR}/build/${ARCH}/runtime"  --bindir="${WORKDIR}/build/${ARCH}"
+			${SCRIPT} --output-dir="${WORKDIR}/build/${ARCH}/runtime" --bindir="${WORKDIR}/build/${ARCH}"
 			if [ "$?" != "0" ]; then
 				failed "Error on ${SCRIPT}"
 			fi
@@ -319,6 +319,13 @@ makeRuntime()
 #
 makeInstaller()
 {
+	NSIS_ARGS="-DWITHGTK"
+
+	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
@@ -327,9 +334,16 @@ makeInstaller()
 		echo "Creating installer for ${ARCH}"
 		cd ${WORKDIR}/build/${ARCH}
+
+		echo makensis ${NSIS_ARGS} ./pw3270.nsi
 		/bin/bash
+		mv -f *.exe ${PROJECTDIR}
+		if [ "$?" != "0" ]; then
+			failed "Can't copy installer to ${PROJECTDIR}"
+		fi
+
 	done
 }
@@ -360,6 +374,12 @@ do
 			fi
 			;;
+
+		CONFIG)
+			. ${value}
+			;;
+
+
 		HELP)
 			echo "${0} [options]"
 			echo ""
	@@ -285,7 +285,7 @@ do		@@ -285,7 +285,7 @@ do
285	value=${tmp##*=}	285	value=${tmp##*=}
286		286
287	case "$parameter" in	287	case "$parameter" in
288	- PATH)	288	+ OUTPUT-DIR)
289	TARGET=$value	289	TARGET=$value
290	;;	290	;;
291		291
	@@ -325,6 +325,4 @@ copy_theme "Adwaita"		@@ -325,6 +325,4 @@ copy_theme "Adwaita"
325	#echo "Optimizing..."	325	#echo "Optimizing..."
326	#find ${TARGET} -iname *.png -exec optipng -o7 -quiet {} \; 2>&1 > /dev/null	326	#find ${TARGET} -iname *.png -exec optipng -o7 -quiet {} \; 2>&1 > /dev/null
327		327
328	-
329	-
330	echo "Runtime ok"	328	echo "Runtime ok"
	@@ -304,7 +304,7 @@ makeRuntime()		@@ -304,7 +304,7 @@ makeRuntime()
304	chmod +x ${SCRIPT}	304	chmod +x ${SCRIPT}
305		305
306	cd ${WORKDIR}/build/${ARCH}	306	cd ${WORKDIR}/build/${ARCH}
307	- ${SCRIPT} --output-dir="${WORKDIR}/build/${ARCH}/runtime" --bindir="${WORKDIR}/build/${ARCH}"	307	+ ${SCRIPT} --output-dir="${WORKDIR}/build/${ARCH}/runtime" --bindir="${WORKDIR}/build/${ARCH}"
308	if [ "$?" != "0" ]; then	308	if [ "$?" != "0" ]; then
309	failed "Error on ${SCRIPT}"	309	failed "Error on ${SCRIPT}"
310	fi	310	fi
	@@ -319,6 +319,13 @@ makeRuntime()		@@ -319,6 +319,13 @@ makeRuntime()
319	#	319	#
320	makeInstaller()	320	makeInstaller()
321	{	321	{
		322	+ NSIS_ARGS="-DWITHGTK"
		323	+
		324	+ for ARG in $(echo ${PACKAGE_PLUGINS} \| tr "[:lower:]" "[:upper:]") $(echo ${PACKAGE_LANGUAGE_BINDINGS} \| tr "[:lower:]" "[:upper:]")
		325	+ do
		326	+ NSIS_ARGS="${NSIS_ARGS} -DWITH${ARG}"
		327	+ done
		328	+
322		329
323	for ARCH in ${TARGET_ARCHS}	330	for ARCH in ${TARGET_ARCHS}
324	do	331	do
	@@ -327,9 +334,16 @@ makeInstaller()		@@ -327,9 +334,16 @@ makeInstaller()
327	echo "Creating installer for ${ARCH}"	334	echo "Creating installer for ${ARCH}"
328		335
329	cd ${WORKDIR}/build/${ARCH}	336	cd ${WORKDIR}/build/${ARCH}
		337	+
		338	+ echo makensis ${NSIS_ARGS} ./pw3270.nsi
330	/bin/bash	339	/bin/bash
331		340
332		341
		342	+ mv -f *.exe ${PROJECTDIR}
		343	+ if [ "$?" != "0" ]; then
		344	+ failed "Can't copy installer to ${PROJECTDIR}"
		345	+ fi
		346	+
333	done	347	done
334		348
335	}	349	}
	@@ -360,6 +374,12 @@ do		@@ -360,6 +374,12 @@ do
360	fi	374	fi
361		375
362	;;	376	;;
		377	+
		378	+ CONFIG)
		379	+ . ${value}
		380	+ ;;
		381	+
		382	+
363	HELP)	383	HELP)
364	echo "${0} [options]"	384	echo "${0} [options]"
365	echo ""	385	echo ""