fixing packaging, #1106 broke it
This commit is contained in:
parent
afc74707f8
commit
74772d336d
@ -79,13 +79,13 @@ script: |
|
|||||||
./autogen.sh
|
./autogen.sh
|
||||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
SOURCEDIST=`echo dash-*.tar.gz`
|
SOURCEDIST=`echo dashcore-*.tar.gz`
|
||||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||||
# Correct tar file order
|
# Correct tar file order
|
||||||
mkdir -p temp
|
mkdir -p temp
|
||||||
pushd temp
|
pushd temp
|
||||||
tar xf ../$SOURCEDIST
|
tar xf ../$SOURCEDIST
|
||||||
find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
find dashcore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||||
popd
|
popd
|
||||||
|
|
||||||
ORIGPATH="$PATH"
|
ORIGPATH="$PATH"
|
||||||
|
@ -86,14 +86,14 @@ script: |
|
|||||||
./autogen.sh
|
./autogen.sh
|
||||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
SOURCEDIST=`echo dash-*.tar.gz`
|
SOURCEDIST=`echo dashcore-*.tar.gz`
|
||||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||||
|
|
||||||
# Correct tar file order
|
# Correct tar file order
|
||||||
mkdir -p temp
|
mkdir -p temp
|
||||||
pushd temp
|
pushd temp
|
||||||
tar xf ../$SOURCEDIST
|
tar xf ../$SOURCEDIST
|
||||||
find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
find dashcore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||||
popd
|
popd
|
||||||
|
|
||||||
ORIGPATH="$PATH"
|
ORIGPATH="$PATH"
|
||||||
|
@ -105,14 +105,14 @@ script: |
|
|||||||
./autogen.sh
|
./autogen.sh
|
||||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
SOURCEDIST=`echo dash-*.tar.gz`
|
SOURCEDIST=`echo dashcore-*.tar.gz`
|
||||||
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
DISTNAME=`echo ${SOURCEDIST} | sed 's/.tar.*//'`
|
||||||
|
|
||||||
# Correct tar file order
|
# Correct tar file order
|
||||||
mkdir -p temp
|
mkdir -p temp
|
||||||
pushd temp
|
pushd temp
|
||||||
tar xf ../$SOURCEDIST
|
tar xf ../$SOURCEDIST
|
||||||
find dash-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
find dashcore-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||||
mkdir -p $OUTDIR/src
|
mkdir -p $OUTDIR/src
|
||||||
cp ../$SOURCEDIST $OUTDIR/src
|
cp ../$SOURCEDIST $OUTDIR/src
|
||||||
popd
|
popd
|
||||||
@ -132,7 +132,7 @@ script: |
|
|||||||
make ${MAKEOPTS} -C src check-security
|
make ${MAKEOPTS} -C src check-security
|
||||||
make deploy
|
make deploy
|
||||||
make install DESTDIR=${INSTALLPATH}
|
make install DESTDIR=${INSTALLPATH}
|
||||||
cp -f dash-*setup*.exe $OUTDIR/
|
cp -f dashcore-*setup*.exe $OUTDIR/
|
||||||
cd installed
|
cd installed
|
||||||
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
|
mv ${DISTNAME}/bin/*.dll ${DISTNAME}/lib/
|
||||||
find . -name "lib*.la" -delete
|
find . -name "lib*.la" -delete
|
||||||
|
Loading…
Reference in New Issue
Block a user