Commit ca2f0061 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

fix tar_em_up.sh to store binaries in the main repo directory so that the...

fix tar_em_up.sh to store binaries in the main repo directory so that the gitlab ci can upload them as artifacts, and change the ci config to find them
parent 4412788f
...@@ -14,7 +14,7 @@ debian_stable_i386_deb: ...@@ -14,7 +14,7 @@ debian_stable_i386_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
artifacts: artifacts:
paths: paths:
- ../*.deb - ./*.deb
expire_in: 1 week expire_in: 1 week
debian_stable_amd64_deb: debian_stable_amd64_deb:
...@@ -28,7 +28,7 @@ debian_stable_amd64_deb: ...@@ -28,7 +28,7 @@ debian_stable_amd64_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
artifacts: artifacts:
paths: paths:
- ../*.deb - ./*.deb
expire_in: 1 week expire_in: 1 week
...@@ -43,7 +43,7 @@ ubuntu_14.04_i386_deb: ...@@ -43,7 +43,7 @@ ubuntu_14.04_i386_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
artifacts: artifacts:
paths: paths:
- ../*.deb - ./*.deb
expire_in: 1 week expire_in: 1 week
...@@ -58,7 +58,7 @@ ubuntu_14.04_amd64_deb: ...@@ -58,7 +58,7 @@ ubuntu_14.04_amd64_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
artifacts: artifacts:
paths: paths:
- ../*.deb - ./*.deb
expire_in: 1 week expire_in: 1 week
ubuntu_16.04_amd64_deb: ubuntu_16.04_amd64_deb:
...@@ -72,5 +72,5 @@ ubuntu_16.04_amd64_deb: ...@@ -72,5 +72,5 @@ ubuntu_16.04_amd64_deb:
- ./tar_em_up.sh -B - ./tar_em_up.sh -B
artifacts: artifacts:
paths: paths:
- ../*.deb - ./*.deb
expire_in: 1 week expire_in: 1 week
...@@ -11,7 +11,6 @@ then ...@@ -11,7 +11,6 @@ then
echo " -b build a deb (incremental, all platforms)" echo " -b build a deb (incremental, all platforms)"
echo " -B build a deb (complete recompile)" echo " -B build a deb (complete recompile)"
echo " -c core Pd source tarball" echo " -c core Pd source tarball"
echo " -d whole dev folder tarball"
echo " -e everything" echo " -e everything"
echo " -f full installer (incremental)" echo " -f full installer (incremental)"
echo " -F full installer (complete recompile)" echo " -F full installer (complete recompile)"
...@@ -33,7 +32,6 @@ fi ...@@ -33,7 +32,6 @@ fi
addon=0 addon=0
deb=0 deb=0
core=0 core=0
dev=0
full=0 full=0
sys_cwiid=0 sys_cwiid=0
rpi=0 rpi=0
...@@ -132,11 +130,8 @@ do case $Option in ...@@ -132,11 +130,8 @@ do case $Option in
c) core=1;; c) core=1;;
d) dev=1;;
e) addon=1 e) addon=1
core=1 core=1
dev=1
full=1;; full=1;;
f) full=1;; f) full=1;;
...@@ -177,39 +172,7 @@ then ...@@ -177,39 +172,7 @@ then
cd pd/src/ cd pd/src/
make clean make clean
cd ../../ cd ../../
tar -jcf ../Pd-l2ork-`date +%Y%m%d`.tar.bz2 pd tar -jcf ./Pd-l2ork-`date +%Y%m%d`.tar.bz2 pd
fi
if [ $dev -eq 1 ]
then
echo "Pd dev package..."
#cd doc/
#svn checkout https://pure-data.svn.sourceforge.net/svnroot/pure-data/trunk/doc .
#cp -f ../l2ork_addons/doc/Makefile .
#cd ..
cd externals/miXed
make clean
cd ../
make distclean
cd ../pd/src
make distclean
cd ../../Gem/src/
make distclean
rm -rf ./.libs
rm -rf ./*/.libs
cd ../
make distclean
rm gemglutwindow.pd_linux
rm Gem.pd_linux
cd ../packages/linux_make
make distclean
cd ../../
gitfolder=`basename $PWD`
cd ../
rm -f pd-l2ork-dev-`date +%Y%m%d`.tar.bz2 2> /dev/null
echo "tar dev installer..."
tar -jcf pd-l2ork-dev-`date +%Y%m%d`.tar.bz2 $gitfolder
cd $gitfolder
fi fi
if [ $full -gt 0 -o $deb -gt 0 -o $inno -gt 0 ] if [ $full -gt 0 -o $deb -gt 0 -o $inno -gt 0 ]
...@@ -337,11 +300,11 @@ then ...@@ -337,11 +300,11 @@ then
echo "move full installer..." echo "move full installer..."
if [ $deb -gt 0 ] if [ $deb -gt 0 ]
then then
mv *.deb ../../../ mv *.deb ../../
else else
#rm -f ../../../Pd-l2ork-full-`uname -m`-`date +%Y%m%d`.tar.bz2 2> /dev/null #rm -f ../../../Pd-l2ork-full-`uname -m`-`date +%Y%m%d`.tar.bz2 2> /dev/null
#mv build/Pd*bz2 ../../../Pd-l2ork-full-`uname -m`-`date +%Y%m%d`.tar.bz2 #mv build/Pd*bz2 ../../../Pd-l2ork-full-`uname -m`-`date +%Y%m%d`.tar.bz2
mv -f build/pd*bz2 ../../.. mv -f build/pd*bz2 ../..
fi fi
elif [ $deb -gt 0 ]; then elif [ $deb -gt 0 ]; then
make debstage prefix=$inst_dir make debstage prefix=$inst_dir
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment