Melhorando construção automática de pacotes windows.

Perry Werneck
1 parent 368dc170
Showing 3 changed files with 73 additions and 24 deletions Show diff stats
.gitignore
po/pt_BR.po
winpacket.sh
@@ -13,6 +13,7 @@
 *.depend
 *.tar
 *.bz2
+*.cache
 ChangeLog*
 Makefile
 aclocal.m4
@@ -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 15:43-0200\n"
+"POT-Creation-Date: 2015-11-09 16:05-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"
@@ -8,7 +8,6 @@ cleanup()
 	cd ${myDIR}
 	rm -fr ${TEMPDIR}
 	rm -fr ${RUNTIMEDIR}
-	rm -fr ${DESTDIR}
 	exit -1
 }
  
@@ -22,24 +21,58 @@ failed()
 #
 # Copia pacote gerado
 #
-# $1 = Arquitetura (x86_32/x86_64)
+# $1 = Arquitetura (i686/x86_64)
 # $2 = Tipo do link
 #
 CopyPacket()
 {
+	#
+	# Primeiro move a versão baseada no runtime
+	#
+	FILENAME=$(find nsi -maxdepth 1 -name "pw3270-*-requires-gtk-*-${1}.exe" | head --lines 1)
  
-	FILENAME=$(find nsi -maxdepth 1 -name "*.exe" | head --lines 1 | sed "s@./@@g")
+	if [ ! -z ${FILENAME} ]; then
  
-	mkdir -p ${DESTDIR}/${1}
+		mkdir -p ${DESTDIR}/${1}
+
+		echo "Copiando ${FILENAME} para ${DESTDIR}/${1}"
+
+		mv "${FILENAME}" "${DESTDIR}/${1}"
+		if [ "$?" != "0" ]; then
+			echo "src=${FILENAME}"
+			echo "dst=${DESTDIR}/${1}"
+			failed "Erro ao copiar instalador sem o runtime"
+		fi
  
-	cp ${FILENAME} ${DESTDIR}/${1}
-	if [ "$?" != "0" ]; then
-		failed "Erro ao copiar instalador"
 	fi
  
-	ln -sf ${FILENAME} ${DESTDIR}/${1}/pw3270-${1}-${2}.exe
-	if [ "$?" != "0" ]; then
-		failed "Erro ao criar o link simbólico"
+	#
+	# Depois copia o pacote completo
+	#
+	FILENAME=$(find nsi -maxdepth 1 -name "pw3270-*-gtk-*-${1}.exe" | head --lines 1)
+
+	if [ ! -z ${FILENAME} ]; then
+
+		mkdir -p ${DESTDIR}/${1}
+
+		echo "Copiando ${FILENAME} para ${DESTDIR}/${1}"
+
+		mv "${FILENAME}" "${DESTDIR}/${1}"
+		if [ "$?" != "0" ]; then
+			echo "src=${FILENAME}"
+			echo "dst=${DESTDIR}/${1}"
+			failed "Erro ao copiar instalador completo"
+		fi
+
+		#
+		# Cria link do pacote completo para "latest"
+		#
+		ln -sf $(basename ${FILENAME}) ${DESTDIR}/${1}/pw3270-with-gtk-${2}-${1}.exe
+		if [ "$?" != "0" ]; then
+			failed "Erro ao criar o link simbólico"
+		fi
+
+
 	fi
  
 }
@@ -74,7 +107,7 @@ build()
 	esac
  
 	./configure \
-		--cache-file=${1}.cache \
+		--cache-file=.${1}.cache \
 		--host=${host} \
 		--prefix=${prefix}
  
@@ -117,7 +150,7 @@ build()
 		failed "Erro ao gerar pacote windows"
 	fi
  
-	CopyPacket ${1} "latest"
+	CopyPacket ${host_cpu} "latest"
  
 	make clean
 	rm -f *.exe
@@ -128,7 +161,6 @@ myDIR=$(readlink -f $(dirname $0))
 TEMPDIR=$(mktemp -d)
 DESTDIR=${HOME}/public_html/win
 RUNTIMEDIR=$(mktemp -d)
-SRC=svn
 ARCHS="x86_32 x86_64"
 RUNTIME=0
 COMPLETE=1
@@ -144,13 +176,16 @@ do
  
 		case $parameter in
  
-		SRC)
-			value=${tmp##*=}
-			eval SRC=$value
+		32)
+			ARCHS="x86_32"
+			;;
+
+		64)
+			ARCHS="x86_64"
 			;;
  
 		FULL)
-			RUNTIME=0
+			RUNTIME=1
 			COMPLETE=1
 			;;
  
@@ -200,12 +235,11 @@ if [ &quot;${RUNTIME}&quot; == &quot;1&quot; ]; then
  
 	for i in ${ARCHS}; do
  
-		rm -f *.exe
-
 		echo -e "\e]2;gtk-runtime-${i}\a"
  
 		case ${i} in
 		x86_32)
+			host_cpu=i686
 			./win32.sh
 			if [ "$?" != "0" ]; then
 				exit -1
@@ -213,6 +247,7 @@ if [ &quot;${RUNTIME}&quot; == &quot;1&quot; ]; then
 			;;
  
 		x86_64)
+			host_cpu=x86_64
 			./win64.sh
 			if [ "$?" != "0" ]; then
 				exit -1
@@ -225,6 +260,9 @@ if [ &quot;${RUNTIME}&quot; == &quot;1&quot; ]; then
  
 		esac
  
+		rm -f gtk-runtime-*-${host_cpu}.exe
+
+
 		chmod +x ./makeruntime.sh
  
 		./makeruntime.sh
@@ -232,11 +270,21 @@ if [ &quot;${RUNTIME}&quot; == &quot;1&quot; ]; then
 			exit -1
 		fi
  
-		cp *.exe ${DESTDIR}/${i}
+		# Copia o pacote gerado
+		FILENAME=$(find . -maxdepth 1 -name "gtk-runtime-*-${host_cpu}.exe" | head --lines 1)
+
+		mkdir -p ${DESTDIR}/${host_cpu}
+
+		mv gtk-runtime-*-${host_cpu}.exe ${DESTDIR}/${host_cpu}
 		if [ "$?" != "0" ]; then
 			failed "Erro ao copiar instalador"
 		fi
  
+		ln -sf $(basename ${FILENAME}) "${DESTDIR}/${host_cpu}/gtk-runtime-latest-${host_cpu}.exe"
+		if [ "$?" != "0" ]; then
+			failed "Erro ao criar o link simbólico"
+		fi
+
 	done
  
 fi
@@ -245,9 +293,9 @@ cd $myDIR
 rm -fr ${TEMPDIR}
 rm -fr ${RUNTIMEDIR}
  
-zip -r -j ${HOME}/public_html/win/pw3270-latest.zip \
-			${HOME}/public_html/win/x86_32/pw3270-x86_32-latest.exe \
-			${HOME}/public_html/win/x86_64/pw3270-x86_64-latest.exe 
+#zip -r -j ${HOME}/public_html/win/pw3270-latest.zip \
+#			${HOME}/public_html/win/x86_32/pw3270-x86_32-latest.exe \
+#			${HOME}/public_html/win/x86_64/pw3270-x86_64-latest.exe 
  
 echo -e "\e]2;Success!\a"
...	...	@@ -13,6 +13,7 @@
13	13	*.depend
14	14	*.tar
15	15	*.bz2
	16	+*.cache
16	17	ChangeLog*
17	18	Makefile
18	19	aclocal.m4
...	...
...	...	@@ -5,7 +5,7 @@ msgid ""
5	5	msgstr ""
6	6	"Project-Id-Version: pw3270 5.0\n"
7	7	"Report-Msgid-Bugs-To: \n"
8		-"POT-Creation-Date: 2015-11-03 15:43-0200\n"
	8	+"POT-Creation-Date: 2015-11-09 16:05-0200\n"
9	9	"PO-Revision-Date: 2014-02-17 08:05-0300\n"
10	10	"Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
11	11	"Language-Team: Portugues <>\n"
...	...
...	...	@@ -8,7 +8,6 @@ cleanup()
8	8	cd ${myDIR}
9	9	rm -fr ${TEMPDIR}
10	10	rm -fr ${RUNTIMEDIR}
11		- rm -fr ${DESTDIR}
12	11	exit -1
13	12	}
14	13
...	...	@@ -22,24 +21,58 @@ failed()
22	21	#
23	22	# Copia pacote gerado
24	23	#
25		-# $1 = Arquitetura (x86_32/x86_64)
	24	+# $1 = Arquitetura (i686/x86_64)
26	25	# $2 = Tipo do link
27	26	#
28	27	CopyPacket()
29	28	{
	29	+ #
	30	+ # Primeiro move a versão baseada no runtime
	31	+ #
	32	+ FILENAME=$(find nsi -maxdepth 1 -name "pw3270--requires-gtk--${1}.exe" \| head --lines 1)
30	33
31		- FILENAME=$(find nsi -maxdepth 1 -name "*.exe" \| head --lines 1 \| sed "s@./@@g")
	34	+ if [ ! -z ${FILENAME} ]; then
32	35
33		- mkdir -p ${DESTDIR}/${1}
	36	+ mkdir -p ${DESTDIR}/${1}
	37	+
	38	+ echo "Copiando ${FILENAME} para ${DESTDIR}/${1}"
	39	+
	40	+ mv "${FILENAME}" "${DESTDIR}/${1}"
	41	+ if [ "$?" != "0" ]; then
	42	+ echo "src=${FILENAME}"
	43	+ echo "dst=${DESTDIR}/${1}"
	44	+ failed "Erro ao copiar instalador sem o runtime"
	45	+ fi
34	46
35		- cp ${FILENAME} ${DESTDIR}/${1}
36		- if [ "$?" != "0" ]; then
37		- failed "Erro ao copiar instalador"
38	47	fi
39	48
40		- ln -sf ${FILENAME} ${DESTDIR}/${1}/pw3270-${1}-${2}.exe
41		- if [ "$?" != "0" ]; then
42		- failed "Erro ao criar o link simbólico"
	49	+ #
	50	+ # Depois copia o pacote completo
	51	+ #
	52	+ FILENAME=$(find nsi -maxdepth 1 -name "pw3270--gtk--${1}.exe" \| head --lines 1)
	53	+
	54	+ if [ ! -z ${FILENAME} ]; then
	55	+
	56	+ mkdir -p ${DESTDIR}/${1}
	57	+
	58	+ echo "Copiando ${FILENAME} para ${DESTDIR}/${1}"
	59	+
	60	+ mv "${FILENAME}" "${DESTDIR}/${1}"
	61	+ if [ "$?" != "0" ]; then
	62	+ echo "src=${FILENAME}"
	63	+ echo "dst=${DESTDIR}/${1}"
	64	+ failed "Erro ao copiar instalador completo"
	65	+ fi
	66	+
	67	+ #
	68	+ # Cria link do pacote completo para "latest"
	69	+ #
	70	+ ln -sf $(basename ${FILENAME}) ${DESTDIR}/${1}/pw3270-with-gtk-${2}-${1}.exe
	71	+ if [ "$?" != "0" ]; then
	72	+ failed "Erro ao criar o link simbólico"
	73	+ fi
	74	+
	75	+
43	76	fi
44	77
45	78	}
...	...	@@ -74,7 +107,7 @@ build()
74	107	esac
75	108
76	109	./configure \
77		- --cache-file=${1}.cache \
	110	+ --cache-file=.${1}.cache \
78	111	--host=${host} \
79	112	--prefix=${prefix}
80	113
...	...	@@ -117,7 +150,7 @@ build()
117	150	failed "Erro ao gerar pacote windows"
118	151	fi
119	152
120		- CopyPacket ${1} "latest"
	153	+ CopyPacket ${host_cpu} "latest"
121	154
122	155	make clean
123	156	rm -f *.exe
...	...	@@ -128,7 +161,6 @@ myDIR=$(readlink -f $(dirname $0))
128	161	TEMPDIR=$(mktemp -d)
129	162	DESTDIR=${HOME}/public_html/win
130	163	RUNTIMEDIR=$(mktemp -d)
131		-SRC=svn
132	164	ARCHS="x86_32 x86_64"
133	165	RUNTIME=0
134	166	COMPLETE=1
...	...	@@ -144,13 +176,16 @@ do
144	176
145	177	case $parameter in
146	178
147		- SRC)
148		- value=${tmp##*=}
149		- eval SRC=$value
	179	+ 32)
	180	+ ARCHS="x86_32"
	181	+ ;;
	182	+
	183	+ 64)
	184	+ ARCHS="x86_64"
150	185	;;
151	186
152	187	FULL)
153		- RUNTIME=0
	188	+ RUNTIME=1
154	189	COMPLETE=1
155	190	;;
156	191
...	...	@@ -200,12 +235,11 @@ if [ "${RUNTIME}" == "1" ]; then
200	235
201	236	for i in ${ARCHS}; do
202	237
203		- rm -f *.exe
204		-
205	238	echo -e "\e]2;gtk-runtime-${i}\a"
206	239
207	240	case ${i} in
208	241	x86_32)
	242	+ host_cpu=i686
209	243	./win32.sh
210	244	if [ "$?" != "0" ]; then
211	245	exit -1
...	...	@@ -213,6 +247,7 @@ if [ "${RUNTIME}" == "1" ]; then
213	247	;;
214	248
215	249	x86_64)
	250	+ host_cpu=x86_64
216	251	./win64.sh
217	252	if [ "$?" != "0" ]; then
218	253	exit -1
...	...	@@ -225,6 +260,9 @@ if [ "${RUNTIME}" == "1" ]; then
225	260
226	261	esac
227	262
	263	+ rm -f gtk-runtime-*-${host_cpu}.exe
	264	+
	265	+
228	266	chmod +x ./makeruntime.sh
229	267
230	268	./makeruntime.sh
...	...	@@ -232,11 +270,21 @@ if [ "${RUNTIME}" == "1" ]; then
232	270	exit -1
233	271	fi
234	272
235		- cp *.exe ${DESTDIR}/${i}
	273	+ # Copia o pacote gerado
	274	+ FILENAME=$(find . -maxdepth 1 -name "gtk-runtime-*-${host_cpu}.exe" \| head --lines 1)
	275	+
	276	+ mkdir -p ${DESTDIR}/${host_cpu}
	277	+
	278	+ mv gtk-runtime-*-${host_cpu}.exe ${DESTDIR}/${host_cpu}
236	279	if [ "$?" != "0" ]; then
237	280	failed "Erro ao copiar instalador"
238	281	fi
239	282
	283	+ ln -sf $(basename ${FILENAME}) "${DESTDIR}/${host_cpu}/gtk-runtime-latest-${host_cpu}.exe"
	284	+ if [ "$?" != "0" ]; then
	285	+ failed "Erro ao criar o link simbólico"
	286	+ fi
	287	+
240	288	done
241	289
242	290	fi
...	...	@@ -245,9 +293,9 @@ cd $myDIR
245	293	rm -fr ${TEMPDIR}
246	294	rm -fr ${RUNTIMEDIR}
247	295
248		-zip -r -j ${HOME}/public_html/win/pw3270-latest.zip \
249		- ${HOME}/public_html/win/x86_32/pw3270-x86_32-latest.exe \
250		- ${HOME}/public_html/win/x86_64/pw3270-x86_64-latest.exe
	296	+#zip -r -j ${HOME}/public_html/win/pw3270-latest.zip \
	297	+# ${HOME}/public_html/win/x86_32/pw3270-x86_32-latest.exe \
	298	+# ${HOME}/public_html/win/x86_64/pw3270-x86_64-latest.exe
251	299
252	300	echo -e "\e]2;Success!\a"
253	301
...	...