Skip to content

Commit ebaeabd

Browse files
committed
Update build script so that dir structure in zip file matches the promoted dir structure
Change-Id: I988de5f6804c9792aff3e120c21e5e5d271b53ab
1 parent 444d969 commit ebaeabd

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Build/Linux/build.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ for SUBDIR in $BUILD_DIRS; do
155155
if !($bIncrementalBuild) ; then
156156
make -C $SUBDIR spotless >> $LOGFILE 2>&1
157157
fi
158-
158+
159159
#make 64 bit
160160
echo "Build ${BASENAME}, 64-bit..." | tee -a $LOGFILE
161161

@@ -199,9 +199,10 @@ done
199199

200200
if $bZip ; then
201201
echo "Generate tarball..." | tee -a $LOGFILE
202+
ZIP_DIR_NAME=${VER_MAJOR}_${VER_MINOR}
202203
cd $BUILD_DIR
203-
mkdir GPUPerfAPI-$VER-lnx
204-
cd GPUPerfAPI-$VER-lnx
204+
mkdir $ZIP_DIR_NAME
205+
cd $ZIP_DIR_NAME
205206
mkdir Bin
206207
mkdir Bin/Linx64
207208
mkdir Bin/Linx86
@@ -220,7 +221,7 @@ if $bZip ; then
220221
cp ../../../LICENSE .
221222
cp ../../../Doc/thirdpartylicenses.txt .
222223
cd ..
223-
tar cvzf GPUPerfAPI.$VER-lnx.tgz GPUPerfAPI-$VER-lnx/
224+
tar cvzf GPUPerfAPI.$VER-lnx.tgz $ZIP_DIR_NAME/
224225

225226
#-----------------------------------------
226227
#copy to bin-Internal folder
@@ -258,7 +259,7 @@ if $bZip ; then
258259
cp ../../../Src/GPUPerfAPICounterGenerator/GPAICounterAccessor.h ./Include/
259260
cp ../../../Src/GPUPerfAPICounterGenerator/GPAICounterScheduler.h ./Include/
260261
cd ..
261-
tar cvzf GPUPerfAPI.$VER-lnx-Promotion.tgz GPUPerfAPI-$VER-lnx/
262+
tar cvzf GPUPerfAPI.$VER-lnx-Promotion.tgz $ZIP_DIR_NAME/
262263
fi
263264
fi
264265

0 commit comments

Comments
 (0)