Mercurial > mxe-octave

comparison mk-dist @ 3387:0779856e1186

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add desktop shortcut and octave-versionxxxxx-installer.exe naming. * makeinst-script.mk: change installer name to octave-VERSION.exe, add checkbox option to create deskyop shortcuts. * mk-dist: when in stable mode use folder name of octave-VERSION.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 03 Jan 2014 02:14:54 -0500
parents 7b62537d0f8a
children 58b5ed5a0247
comparison
equal deleted inserted replaced
3386:17ef0d555e71 3387:0779856e1186
4 4
5 ## Override with --jobs option or set JOBS variable in settings.mk 5 ## Override with --jobs option or set JOBS variable in settings.mk
6 jobs=0 6 jobs=0
7 7
8 OCTAVE_TARGET=octave 8 OCTAVE_TARGET=octave
9 TOPDIR=$(pwd)
10 PATH=$TOPDIR/usr/bin:$PATH
11 TARGET=i686-pc-mingw32
12 PREFIX=/usr/$TARGET
13 STRIP=$TARGET-strip
14 DATE=$(date +%Y-%m-%d-%H-%M)
15 OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$DATE
16 INSTALLER_PKG=
17
18 OCTAVE_VERSION=`head -1 $TOPDIR/octave/octave-version`
9 19
10 strip=yes 20 strip=yes
11 installer=no 21 installer=no
12 while [ $# -gt 0 ]; do 22 while [ $# -gt 0 ]; do
13 case "$1" in 23 case "$1" in
20 echo "mk-dist: expecting argument for --jobs option" 1>&2 30 echo "mk-dist: expecting argument for --jobs option" 1>&2
21 exit 1 31 exit 1
22 fi 32 fi
23 ;; 33 ;;
24 --stable) 34 --stable)
35 # for stable, use octave-version as the folder
25 OCTAVE_TARGET=stable-octave 36 OCTAVE_TARGET=stable-octave
37 OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$OCTAVE_VERSION
26 shift 38 shift
27 ;; 39 ;;
28 --no-strip) 40 --no-strip)
29 strip=no 41 strip=no
30 shift 42 shift
38 echo "mk-dist: unrecognized option: $1" 1>&2 50 echo "mk-dist: unrecognized option: $1" 1>&2
39 exit 1 51 exit 1
40 ;; 52 ;;
41 esac 53 esac
42 done 54 done
43
44 TOPDIR=$(pwd)
45 PATH=$TOPDIR/usr/bin:$PATH
46 TARGET=i686-pc-mingw32
47 PREFIX=/usr/$TARGET
48 STRIP=$TARGET-strip
49 DATE=$(date +%Y-%m-%d-%H-%M)
50 OCTAVE_DIST_DIR=$TOPDIR/dist/$OCTAVE_TARGET-$DATE
51 INSTALLER_PKG=
52 55
53 if [ $installer = "yes" ]; then 56 if [ $installer = "yes" ]; then
54 echo "Adding installer to build dependancies" 57 echo "Adding installer to build dependancies"
55 INSTALLER_PKG="nsis" 58 INSTALLER_PKG="nsis"
56 fi 59 fi
127 #tar -c -j -f $OCTAVE_TARGET-$DATE.tar.bz2 $OCTAVE_TARGET-$DATE 130 #tar -c -j -f $OCTAVE_TARGET-$DATE.tar.bz2 $OCTAVE_TARGET-$DATE
128 131
129 cd $TOPDIR/dist 132 cd $TOPDIR/dist
130 133
131 if [ $installer = "yes" ]; then 134 if [ $installer = "yes" ]; then
132 ../makeinst-script.sh $OCTAVE_TARGET-$DATE 135 ../makeinst-script.sh $OCTAVE_DIST_DIR
133 136
134 echo "Generating installer ..." 137 echo "Generating installer ..."
135 $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null 138 $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null
136 139
137 if [ -e octave-installer.exe ]; then 140 if [ -e octave-$OCTAVE_VERSION-installer.exe ]; then
138 echo "Installer created" 141 echo "Installer created"
139 rm octave.nsi 142 rm octave.nsi
140 fi 143 fi
141 144
142 else 145 else
143 echo "creating zip file..." 146 echo "creating zip file..."
144 zip -q -9 -r $OCTAVE_TARGET-$DATE.zip $OCTAVE_TARGET-$DATE 147 zip -q -9 -r $OCTAVE_DIST_DIR.zip $OCTAVE_DIST_DIR
145 fi 148 fi
146 149