Fixing bundle script

Perry Werneck
1 parent 2b25df68
Showing 1 changed file with 28 additions and 0 deletions Show diff stats
win/bundle.common
@@ -27,6 +27,11 @@
 # Setup default paths
 srcdir="$(dirname $(dirname $(readlink -f "${0}")))"
+cd ${srcdir}
+if [ "$?" != "0" ]; then
+	echo "Cant cd to ${srcdir}"
+	exit -1
+fi
 if [ -z ${MINGW_PREFIX} ]; then
 	if [ -d "/usr/x86_64-w64-mingw32/sys-root/mingw" ]; then
@@ -47,7 +52,30 @@ GTK_BINARY_VERSION=$(${PKG_CONFIG} --variable=gtk_binary_version gtk+-3.0)
 GTK_LIBDIR=$(echo $(${PKG_CONFIG} --variable=libdir gtk+-3.0) | sed "s@^C:/@/c/@g")
 GDK_LOADERS=$(echo $(${PKG_CONFIG} --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0) | sed -e "s@${GTK_PREFIX}@@g")
+mkdir -p .bin/bundle
+if [ "$?" != "0" ]; then
+	echo "Cant mkdir base buildroot"
+	exit -1
+fi
+
 buildroot=$(readlink -f .bin/bundle)
+if [ -z ${buildroot} ]; then
+	echo "Cant detect buildroot ${buildroot}"
+	exit -1
+fi
+
+mkdir -p "${buildroot}"
+if [ "$?" != "0" ]; then
+	echo "Cant mkdir ${buildroot}"
+	exit -1
+fi
+
+rm -fr "${buildroot}/*"
+if [ "$?" != "0" ]; then
+	echo "Cant clean ${buildroot}"
+	exit -1
+fi
+
 bindir="${buildroot}${MINGW_PREFIX}/bin"
 if [ -z "${WIN_ROOT}" ]; then
	@@ -27,6 +27,11 @@		@@ -27,6 +27,11 @@
27		27
28	# Setup default paths	28	# Setup default paths
29	srcdir="$(dirname $(dirname $(readlink -f "${0}")))"	29	srcdir="$(dirname $(dirname $(readlink -f "${0}")))"
		30	+cd ${srcdir}
		31	+if [ "$?" != "0" ]; then
		32	+ echo "Cant cd to ${srcdir}"
		33	+ exit -1
		34	+fi
30		35
31	if [ -z ${MINGW_PREFIX} ]; then	36	if [ -z ${MINGW_PREFIX} ]; then
32	if [ -d "/usr/x86_64-w64-mingw32/sys-root/mingw" ]; then	37	if [ -d "/usr/x86_64-w64-mingw32/sys-root/mingw" ]; then
	@@ -47,7 +52,30 @@ GTK_BINARY_VERSION=$(${PKG_CONFIG} --variable=gtk_binary_version gtk+-3.0)		@@ -47,7 +52,30 @@ GTK_BINARY_VERSION=$(${PKG_CONFIG} --variable=gtk_binary_version gtk+-3.0)
47	GTK_LIBDIR=$(echo $(${PKG_CONFIG} --variable=libdir gtk+-3.0) \| sed "s@^C:/@/c/@g")	52	GTK_LIBDIR=$(echo $(${PKG_CONFIG} --variable=libdir gtk+-3.0) \| sed "s@^C:/@/c/@g")
48	GDK_LOADERS=$(echo $(${PKG_CONFIG} --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0) \| sed -e "s@${GTK_PREFIX}@@g")	53	GDK_LOADERS=$(echo $(${PKG_CONFIG} --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0) \| sed -e "s@${GTK_PREFIX}@@g")
49		54
		55	+mkdir -p .bin/bundle
		56	+if [ "$?" != "0" ]; then
		57	+ echo "Cant mkdir base buildroot"
		58	+ exit -1
		59	+fi
		60	+
50	buildroot=$(readlink -f .bin/bundle)	61	buildroot=$(readlink -f .bin/bundle)
		62	+if [ -z ${buildroot} ]; then
		63	+ echo "Cant detect buildroot ${buildroot}"
		64	+ exit -1
		65	+fi
		66	+
		67	+mkdir -p "${buildroot}"
		68	+if [ "$?" != "0" ]; then
		69	+ echo "Cant mkdir ${buildroot}"
		70	+ exit -1
		71	+fi
		72	+
		73	+rm -fr "${buildroot}/*"
		74	+if [ "$?" != "0" ]; then
		75	+ echo "Cant clean ${buildroot}"
		76	+ exit -1
		77	+fi
		78	+
51	bindir="${buildroot}${MINGW_PREFIX}/bin"	79	bindir="${buildroot}${MINGW_PREFIX}/bin"
52		80
53	if [ -z "${WIN_ROOT}" ]; then	81	if [ -z "${WIN_ROOT}" ]; then