X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Ftools%2Flyx-build;h=f4b1c7ca969fa3b3f0a9b86c1967c1f9d28e0924;hb=5691863043f8cc0bedba17fb8818dcc5c163d76a;hp=853f0b9c452e35943798b7650f13fd1aae23adb9;hpb=b3a90037b19b487892ae0a21f59459b67d236f43;p=features.git

diff --git a/development/tools/lyx-build b/development/tools/lyx-build
index 853f0b9c45..f4b1c7ca96 100755
--- a/development/tools/lyx-build
+++ b/development/tools/lyx-build
@@ -2,7 +2,7 @@
 # This script builds a maintainance LyX distribution according to 
 # the procedure outlined at:
 #   http://wiki.lyx.org/Devel/ReleaseProcedure
-# It also includes several other tests, to make sure the packages
+# It also includes several other tests, to make sure the package
 # works as it should.
 
 #DEBUG=echo;
@@ -14,7 +14,14 @@
 # Where we will do our work
 BASE="/cvs/lyx/lyx-release";
 # Where our git repository lives
-SRCDIR="/cvs/lyx/lyx-stable";
+SRCDIR="/cvs/lyx/lyx-stable";    # stable
+DEVDIR="/cvs/lyx/lyx-devel";     # devel
+
+BRANCH=$(git status | head -n1 | sed -e 's/On branch //');
+if [ $BRANCH == "master" ]; then
+	SRCDIR="$DEVDIR";
+fi
+
 # editor 
 if [ -z "$EDITOR" ]; then EDITOR=vi; fi
 
@@ -49,7 +56,8 @@ shift $(($OPTIND - 1));
 
 # Determine LyX version
 cd $SRCDIR/
-VERSION=$(head configure.ac | grep AC_INIT | perl -e 'while (<>) {m/AC_INIT\(LyX,([^,]+)/; print $1;}');
+VERSION=$(head configure.ac | grep AC_INIT | \
+	perl -e 'while (<>) {m/AC_INIT\(\[LyX\],\[([^,]+)\]/; print $1;}');
 
 # Development release?
 DEVEL_RELEASE="";
@@ -61,7 +69,7 @@ if [ "$VERSION" != "$PKG_VERSION" ]; then
 	CURHASH=$(git rev-parse HEAD);
 	# Eight chars should be enough
 	CURHASH=${CURHASH:0:8};
-	# New version is e.g. 2.3.4-12649348
+	# New version is e.g. 2.3.4dev-12649348
 	PKG_VERSION="$VERSION-$CURHASH";
 	PATCH="";
 fi
@@ -80,8 +88,8 @@ $DEBUG mkdir "$BASE/lyx-build/";
 $DEBUG cd "$BASE/lyx-build/";
 
 echo "Building distribution...";
-$DEBUG "$BASE/lyx-export/configure" --enable-build-type=rel --enable-qt5
-if ! $DEBUG make lyxdist; then
+$DEBUG "$BASE/lyx-export/configure" --enable-build-type=rel
+if ! $DEBUG make dist; then
   echo "Couldn't make distribution!";
   exit 1;
 fi
@@ -99,8 +107,8 @@ $DEBUG ln lyx-$PKG_VERSION.tar.{gz,xz} $BASE/ || exit 1;
 echo -n "Ready to build signatures...";
 read
 
-$DEBUG gpg -b lyx-$VERSION.tar.gz
-$DEBUG gpg -b lyx-$VERSION.tar.xz
+$DEBUG gpg -b lyx-$PKG_VERSION.tar.gz
+$DEBUG gpg -b lyx-$PKG_VERSION.tar.xz
 
 echo "Signatures created:"
 $DEBUG ln lyx-$VERSION.tar.*.sig $BASE;