X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=autobuild%2Fsynfigstudio-linux-build.sh;h=86f9b7b8d4b46cad830742a49559666b7a3d36fe;hb=HEAD;hp=51ddb762341bd6a68142228aa9e3b0c5cab83a31;hpb=e9a26c032f82f907c0b44adfb26ec61a8e508112;p=synfig.git

diff --git a/autobuild/synfigstudio-linux-build.sh b/autobuild/synfigstudio-linux-build.sh
index 51ddb76..86f9b7b 100644
--- a/autobuild/synfigstudio-linux-build.sh
+++ b/autobuild/synfigstudio-linux-build.sh
@@ -50,6 +50,7 @@ PREFIX=$HOME/synfig/
 
 PACKAGES_PATH=$HOME/synfig-packages     	# path where to write packages files
 PACKAGES_BUILDROOT=/tmp/synfig-buildroot	# path of for build infrastructure
+MAKE_THREADS=2					#count of threads for make
 
 # full = clean, configure, make
 # standart = configure, make
@@ -101,7 +102,7 @@ if [ ! -d ${PREFIX}/include/sigc++-2.0 ]; then
 	cd libsigc++-${LIBSIGCPP}
 	#make clean || true
 	./configure --prefix=${PREFIX}/ --includedir=${PREFIX}/include --disable-static --enable-shared 
-	make -j2 
+	make -j$MAKE_THREADS 
 	make install
 	cd ..
 	popd
@@ -116,7 +117,7 @@ if [ ! -d ${PREFIX}/include/glibmm-2.4 ]; then
 	cd glibmm-${GLIBMM}
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --disable-fulldocs 
-	make -j2 
+	make -j$MAKE_THREADS 
 	make install
 	cd ..
 	popd
@@ -131,7 +132,7 @@ if [ ! -d ${PREFIX}/include/libxml++-2.6 ]; then
 	cd libxml++-${LIBXMLPP}
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared 
-	make -j2 
+	make -j$MAKE_THREADS 
 	make install
 	cd ..
 	popd
@@ -170,7 +171,7 @@ if [ ! -d ${PREFIX}/include/ImageMagick ]; then
 		--without-openexr
 	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 	sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-	make -j2 
+	make -j$MAKE_THREADS 
 	make install
 	cd ..
 	popd
@@ -184,7 +185,7 @@ mkglew()
 	cd glew
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	sed -i -e 's/\r//g' config/config.guess
-	make -j2
+	make -j$MAKE_THREADS
 	make install GLEW_DEST=${PREFIX} libdir=/lib bindir=/bin  includedir=/include
 	cd ..
 	popd
@@ -198,7 +199,7 @@ if [ ! -d ${PREFIX}/include/cairomm-1.0 ]; then
 	cd cairomm-${CAIROMM}
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --enable-docs=no
-	make -j2 
+	make -j$MAKE_THREADS 
 	make install
 	cd ..
 fi
@@ -212,7 +213,7 @@ if [ ! -d ${PREFIX}/include/gtkmm-2.4 ]; then
 	cd gtkmm-${GTKMM}
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --disable-examples --disable-demos --disable-docs
-	make -j2
+	make -j$MAKE_THREADS
 	make install
 	cd ..
 	popd
@@ -226,7 +227,7 @@ mkfreeglut()
 	cd freeglut-${FREEGLUT}
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static  --disable-warnings --enable-shared 
-	make -j2
+	make -j$MAKE_THREADS
 	make install
 	cd ..
 	popd
@@ -250,7 +251,7 @@ mkftgl()
 	cd unix
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared --with-gl-inc=${PREFIX}/include  --with-gl-lib=${PREFIX}/lib  --with-glut-inc=${PREFIX}/include  --with-glut-lib=${PREFIX}/lib  --with-x 
-	make all -j2
+	make all -j$MAKE_THREADS
 	make install
 	cd ..
 	popd
@@ -263,7 +264,7 @@ mkgtkglext()
 	cd gtkglext-${GTKGLEXT}
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	./configure --prefix=${PREFIX} --includedir=${PREFIX}/include  --disable-gtk-doc --disable-static  --enable-shared 
-	make -j2 
+	make -j$MAKE_THREADS 
 	make install
 	cd ..
 	popd
@@ -276,7 +277,7 @@ mkgtkglextmm()
 	cd gtkglextmm-${GTKGLEXTMM}
 	#[[ $DOCLEAN == 1 ]] && make clean || true
 	./configure --prefix=${PREFIX} --includedir=${PREFIX}/include  --disable-dependency-tracking --disable-static  --enable-shared 
-	make -j2 
+	make -j$MAKE_THREADS 
 	make install
 	popd
 cd ..
@@ -288,7 +289,7 @@ mkgit()
 	[ ! -d git-${GITVERSION} ] && tar -xjf git-${GITVERSION}.tar.bz2
 	cd git-${GITVERSION}
 	./configure
-	make -j2
+	make -j$MAKE_THREADS
 	make install
 	cd ..
 	popd
@@ -316,7 +317,7 @@ if [[ $MODE != 'quick' ]]; then
 	/bin/sh ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include $DEBUG 
 fi
 
-make -j2
+make -j$MAKE_THREADS
 make install
 
 popd
@@ -353,7 +354,7 @@ fi
 #	export LDFLAGS=''
 #fi
 
-make -j2
+make -j$MAKE_THREADS
 make install
 
 popd
@@ -374,7 +375,7 @@ if [[ $MODE != 'quick' ]]; then
 	/bin/sh ./configure --prefix=${PREFIX} --includedir=${PREFIX}/include --disable-static --enable-shared $DEBUG
 fi
 
-make -j2
+make -j$MAKE_THREADS
 make install
 
 for n in AUTHORS COPYING NEWS README
@@ -664,6 +665,14 @@ initialize()
 			fi
 			BREED=${BREED%_master}
 		fi
+		if [[ ${VERSION##*-RC} != ${VERSION} ]]; then
+			if [[ $BREED == 'master' ]]; then
+				BREED=rc${VERSION##*-RC}
+			else
+				BREED=rc${VERSION##*-RC}.$BREED
+			fi
+			VERSION=${VERSION%%-*}
+		fi
 		[[ $DEBUG == 1 ]] && BREED=${BREED}_debug
 		REVISION=`git show --pretty=medium $SELECTEDREVISION | head -n 3 |tail -n 1 | sed 's/Date: *//' | sed 's/ +.*//'`
 		REVISION=`date --date="${REVISION}" +%Y%m%d`
@@ -718,9 +727,9 @@ mkpackage()
 	if [[ `cat /etc/chroot.id` == "Synfig Packages Buildroot" ]]; then
 		echo "We are in chroot now."
 		
-		echo "[user]"  > $HOME/.gitconfig
-		echo "email = packages@synfig.org"  >> $HOME/.gitconfig
-		echo "name = Synfig Packager" >> $HOME/.gitconfig
+		echo "[user]"  > /root/.gitconfig
+		echo "email = packages@synfig.org"  >> /root/.gitconfig
+		echo "name = Synfig Packager" >> /root/.gitconfig
 		
 		
 		
@@ -750,14 +759,14 @@ mkpackage()
 	else
 		[ -d $HOME/synfig-packages ] || mkdir -p $HOME/synfig-packages
 		#DEB_LIST="build-essential,autoconf,automake,libltdl3-dev,libtool,gettext,cvs,libpng12-dev,libjpeg62-dev,libfreetype6-dev,libfontconfig1-dev,libgtk2.0-dev,libxml2-dev,bzip2,rpm,alien,xsltproc"
-		for ARCH in i386 amd64; do
+		for ARCH in amd64 i386; do
 		if [[ $ARCH == 'i386' ]];then
 			SETARCH='linux32'
 		else
 			SETARCH='linux64'
 		fi
 		if ! [ -e $PACKAGES_BUILDROOT.$ARCH/etc/chroot.id ]; then
-			debootstrap --arch=$ARCH --variant=buildd  --include=sudo etch $PACKAGES_BUILDROOT.$ARCH http://ftp.us.debian.org/debian
+			debootstrap --arch=$ARCH --variant=buildd  --include=sudo etch $PACKAGES_BUILDROOT.$ARCH http://archive.debian.org/debian
 		fi
 		#set chroot ID
 		echo "Synfig Packages Buildroot" > $PACKAGES_BUILDROOT.$ARCH/etc/chroot.id