comparison mk-dist @ 3397:bf96d7158829

mk-dist: use short folder name for zip file
author John Donoghue <john.donoghue@ieee.org>
date Fri, 03 Jan 2014 18:54:41 -0500
parents 58b5ed5a0247
children f79780bcc843
comparison
equal deleted inserted replaced
3396:91a98aeb816f 3397:bf96d7158829
10 PATH=$TOPDIR/usr/bin:$PATH 10 PATH=$TOPDIR/usr/bin:$PATH
11 TARGET=i686-pc-mingw32 11 TARGET=i686-pc-mingw32
12 PREFIX=/usr/$TARGET 12 PREFIX=/usr/$TARGET
13 STRIP=$TARGET-strip 13 STRIP=$TARGET-strip
14 DATE=$(date +%Y-%m-%d-%H-%M) 14 DATE=$(date +%Y-%m-%d-%H-%M)
15 OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$DATE 15 OCTAVE_DIST_NAME=octave-$DATE
16 INSTALLER_PKG= 16 INSTALLER_PKG=
17 17
18 18
19 strip=yes 19 strip=yes
20 installer=no 20 installer=no
69 OCTAVE_VERSION=`head -1 $TOPDIR/octave/octave-version` 69 OCTAVE_VERSION=`head -1 $TOPDIR/octave/octave-version`
70 70
71 if [ "$OCTAVE_TARGET" = "stable-octave" ]; then 71 if [ "$OCTAVE_TARGET" = "stable-octave" ]; then
72 # if building stable version, use the octave version number aspart of 72 # if building stable version, use the octave version number aspart of
73 # the dist name 73 # the dist name
74 OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$OCTAVE_VERSION 74 OCTAVE_DIST_NAME=octave-$OCTAVE_VERSION
75 fi 75 fi
76 # make dist folder 76 # make dist folder
77 OCTAVE_DIST_DIR=$TOPDIR/dist/$OCTAVE_DIST_NAME
77 mkdir -p $OCTAVE_DIST_DIR 78 mkdir -p $OCTAVE_DIST_DIR
78 79
79 echo "generating lists of files to exclude..." 80 echo "generating lists of files to exclude..."
80 81
81 echo " native files..." 82 echo " native files..."
137 #tar -c -j -f $OCTAVE_TARGET-$DATE.tar.bz2 $OCTAVE_TARGET-$DATE 138 #tar -c -j -f $OCTAVE_TARGET-$DATE.tar.bz2 $OCTAVE_TARGET-$DATE
138 139
139 cd $TOPDIR/dist 140 cd $TOPDIR/dist
140 141
141 if [ $installer = "yes" ]; then 142 if [ $installer = "yes" ]; then
142 ../makeinst-script.sh $OCTAVE_DIST_DIR 143 ../makeinst-script.sh $OCTAVE_DIST_NAME
143 144
144 echo "Generating installer ..." 145 echo "Generating installer ..."
145 $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null 146 $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null
146 147
147 if [ -e octave-$OCTAVE_VERSION-installer.exe ]; then 148 if [ -e octave-$OCTAVE_VERSION-installer.exe ]; then
149 rm octave.nsi 150 rm octave.nsi
150 fi 151 fi
151 152
152 else 153 else
153 echo "creating zip file..." 154 echo "creating zip file..."
154 zip -q -9 -r $OCTAVE_DIST_DIR.zip $OCTAVE_DIST_DIR 155 zip -q -9 -r $OCTAVE_DIST_DIR.zip $OCTAVE_DIST_NAME
155 fi 156 fi
156 157