Commit 00f197c4 authored by Jenkins's avatar Jenkins Committed by Grégory Starck
Browse files

automatic submodules update

parents cc32ae51 f6b38eeb
......@@ -8,3 +8,4 @@ packages
ring_*.tar.gz
Makefile.packaging.distro_targets
repositories
manual-download
......@@ -54,7 +54,7 @@ $(RELEASE_TARBALL_FILENAME):
mkdir -p daemon/contrib/native
cd daemon/contrib/native && \
../bootstrap && \
make fetch-all || make fetch-all || make fetch-all
make fetch-all -j || make fetch-all || make fetch-all
rm -rf daemon/contrib/native
cd $(TMPDIR) && \
......@@ -75,6 +75,8 @@ package-all: package-debian8 \
package-debian8_i386 \
package-debian9 \
package-debian9_i386 \
package-ubuntu14.04 \
package-ubuntu14.04_i386 \
package-ubuntu15.10 \
package-ubuntu15.10_i386 \
package-ubuntu16.04 \
......
client-android @ 38d8e7ff
Subproject commit a5d953c980c860ce14ba9b081954250591778605
Subproject commit 38d8e7ff935a562276de242982b8d1d780e0a161
......@@ -63,6 +63,8 @@ Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
ring-daemon (=${binary:Version})
Replaces: ring-gnome
Conflicts: ring-gnome
Description: Secure and distributed voice, video and chat platform - desktop client
Ring (ring.cx) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy
......@@ -80,3 +82,11 @@ Description: Secure and distributed voice, video and chat platform - daemon
in the hands of the user.
.
This package contains the Ring daemon: dring.
Package: ring-gnome
Depends: ring, ${misc:Depends}
Architecture: all
Priority: extra
Section: oldlibs
Description: transitional dummy package
This is a transitional dummy package. It can safely be removed.
......@@ -28,18 +28,13 @@ override_dh_auto_configure:
echo "Repacked $$projectname"; \
done
# Prevent bootstrap script from verifying checksums
mkdir -p daemon/contrib/native
touch daemon/contrib/native/.sum-msgpack
touch daemon/contrib/native/.sum-opendht
touch daemon/contrib/native/.sum-pjproject
###########################
## Ring Daemon configure ##
###########################
mkdir -p daemon/contrib/native
cd daemon/contrib/native && \
../bootstrap \
--no-checksums \
--disable-ogg \
--disable-flac \
--disable-vorbis \
......@@ -128,7 +123,8 @@ override_dh_auto_install:
#########################
cd daemon && make DESTDIR=$(CURDIR)/debian/ring-daemon install
rm -rfv $(CURDIR)/debian/ring-daemon/usr/include
rm -rfv $(CURDIR)/debian/ring-daemon/usr/lib
rm -rfv $(CURDIR)/debian/ring-daemon/usr/lib/*.a
rm -rfv $(CURDIR)/debian/ring-daemon/usr/lib/*.la
###########################
## libringclient install ##
......
......@@ -45,9 +45,15 @@ dch --create --package ring --newversion ${DEBIAN_VERSION} "Automatic nightly re
dch --release --distribution "unstable" debian/changelog
# create orig tarball
mk-origtargz ${RELEASE_TARBALL_FILENAME}
rm --verbose ${RELEASE_TARBALL_FILENAME}
GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL=$(realpath ../ring_*.orig.tar.gz) debian/rules get-orig-source
# mk-origtargz isn't in ubuntu14.04
if [ "${DISTRIBUTION}" = "ubuntu14.04" ] || [ "${DISTRIBUTION}" = "ubuntu14.04_i386" ]; then
mv ${RELEASE_TARBALL_FILENAME} ../ring_${DEBIAN_VERSION}.orig.tar.gz
else
mk-origtargz ${RELEASE_TARBALL_FILENAME}
rm --verbose ${RELEASE_TARBALL_FILENAME}
fi
GET_ORIG_SOURCE_OVERRIDE_USCAN_TARBALL=$(readlink -f ../ring_*.orig.tar.gz) debian/rules get-orig-source
# move the tarball to the work directory
mkdir -p /opt/ring-packaging
......
......@@ -37,8 +37,12 @@ case $i in
KEYID="${i#*=}"
shift
;;
--remote-location=*)
REMOTE_LOCATION="${i#*=}"
--remote-repository-location=*)
REMOTE_REPOSITORY_LOCATION="${i#*=}"
shift
;;
--remote-manual-download-location=*)
REMOTE_MANUAL_DOWNLOAD_LOCATION="${i#*=}"
shift
;;
*)
......@@ -55,12 +59,12 @@ echo "#########################"
echo "## Creating repository ##"
echo "#########################"
DISTRIBUTION_FOLDER=$(realpath repositories)/${DISTRIBUTION}
rm -rf ${DISTRIBUTION_FOLDER}
mkdir -p ${DISTRIBUTION_FOLDER}/conf
DISTRIBUTION_REPOSITOIRY_FOLDER=$(realpath repositories)/${DISTRIBUTION}
rm -rf ${DISTRIBUTION_REPOSITOIRY_FOLDER}
mkdir -p ${DISTRIBUTION_REPOSITOIRY_FOLDER}/conf
# Distributions file
cat << EOF > ${DISTRIBUTION_FOLDER}/conf/distributions
cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/conf/distributions
Origin: ring
Label: Ring ${DISTRIBUTION} Repository
Codename: ring
......@@ -71,8 +75,8 @@ SignWith: ${KEYID}
EOF
# Options file
cat << EOF > ${DISTRIBUTION_FOLDER}/conf/options
basedir ${DISTRIBUTION_FOLDER}
cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/conf/options
basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER}
EOF
####################################
......@@ -93,17 +97,40 @@ echo "####################"
echo "## including debs ##"
echo "####################"
for package in packages/${DISTRIBUTION}*/*.deb; do
reprepro --verbose --basedir ${DISTRIBUTION_FOLDER} includedeb ring ${package}
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} includedeb ring ${package}
done
# Rebuild the index
reprepro --verbose --basedir ${DISTRIBUTION_FOLDER} export ring
reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} export ring
#######################################
## create the manual download folder ##
#######################################
DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER=$(realpath manual-download)/${DISTRIBUTION}
mkdir -p ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
for package in packages/${DISTRIBUTION}*/*.deb; do
cp ${package} ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
package_name=$(dpkg -I ${package} | grep -m 1 Package: | awk '{print $2}')
package_arch=$(dpkg -I ${package} | grep -m 1 Architecture: | awk '{print $2}')
cp ${package} ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}/${package_name}_${package_arch}.deb
done
############
## deploy ##
############
# Deploy the repository
echo "##########################"
echo "## deploying repository ##"
echo "##########################"
rsync --archive --recursive --verbose --delete ${DISTRIBUTION_FOLDER} ${REMOTE_LOCATION}
rsync --archive --recursive --verbose --delete ${DISTRIBUTION_REPOSITOIRY_FOLDER} ${REMOTE_REPOSITORY_LOCATION}
# deploy the manual download files
echo "#####################################"
echo "## deploying manual download files ##"
echo "#####################################"
rsync --archive --recursive --verbose --delete ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER} ${REMOTE_MANUAL_DOWNLOAD_LOCATION}
# Remove the local copy of the repository
# remove deployed files
rm -rf manual-download
rm -rf repositories
......@@ -45,6 +45,7 @@ PACKAGE_%(distribution)s_DOCKER_RUN_COMMAND:= docker run \\
-e DEBIAN_VERSION=$(DEBIAN_VERSION) \\
-e DEBIAN_PACKAGING_OVERRIDE=%(debian_packaging_override)s \\
-e CURRENT_UID=$(CURRENT_UID) \\
-e DISTRIBUTION=%(distribution)s \\
-v $(CURDIR):/opt/ring-project-ro:ro \\
-v $(CURDIR)/packages/%(distribution)s:/opt/output \\
-t $(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME)
......
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