From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Tue, 25 Feb 2020 00:27:22 +0000 (-0500)
Subject: Minor updates to distribution creation script.
X-Git-Tag: 2.3.5~93
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=235a1034c665d9f482816fe6e0cf11093399d01c;p=features.git

Minor updates to distribution creation script.
---

diff --git a/development/tools/lyx-build b/development/tools/lyx-build
index 03623baa66..086187c117 100755
--- a/development/tools/lyx-build
+++ b/development/tools/lyx-build
@@ -19,13 +19,14 @@ if [ -z "$EDITOR" ]; then EDITOR=vi; fi
 MAKEOPTS="-j4";
 # Compile?
 COMPILE="YES";
+# Make patch file?
+PATCH="YES";
 
-PKGNUM="";
-while getopts ":Cm:p:" opt; do
+while getopts ":Cm:P" opt; do
   case $opt in
-    C )   COMPILE="";;
+    C )   COMPILE="";; # don't test compilation
     m )   MAKEOPTS="$OPTARG";;
-    p )   PKGNUM="$OPTARG";;
+    P )   PATCH="";; # don't build patch files
     \? )  echo "Unknown option $opt"; exit 1;;
   esac
 done
@@ -36,10 +37,6 @@ cd $SRCDIR/
 VERSION=$(head configure.ac | grep AC_INIT | perl -e 'while (<>) {m/AC_INIT\(LyX,([^,]+)/; print $1;}');
 VERSION_BASE="$VERSION";
 
-if [ -n "$PKGNUM" ]; then
-    VERSION="$VERSION-$PKGNUM";
-fi
-
 echo "This is version $VERSION.";
 echo -n "Ready to build source packages...";
 read
@@ -61,10 +58,6 @@ if ! $DEBUG make lyxdist; then
 fi
 
 echo "Packages created:";
-if [ -n "$PKGNUM" ]; then
-    $DEBUG mv lyx-$VERSION_BASE.tar.gz lyx-$VERSION.tar.gz;
-    $DEBUG mv lyx-$VERSION_BASE.tar.xz lyx-$VERSION.tar.xz;
-fi
 $DEBUG cp -v lyx-$VERSION.tar.{gz,xz} $BASE;
 
 echo -n "Ready to build signatures...";
@@ -108,6 +101,11 @@ FIRST=$(echo $VERSION_BASE | sed -e 's/[0-9]*$//');
 ORIGINAL=${FIRST}0;
 LAST=$FIRST$LAST;
 
+if [ -z "$PATCH" ]; then 
+	echo "Skipping patch files.";
+	exit 0; 
+fi
+
 if [ ! -d "$BASE/lyx-patch/" ]; then
 	$DEBUG mkdir "$BASE/lyx-patch/" || exit 1;
 fi