Alexandre Julliard : packaging: Add support for syncing vkd3d packages.

Alexandre Julliard julliard at winehq.org
Fri Oct 8 14:10:32 CDT 2021


Module: tools
Branch: master
Commit: 56de07bc1e75d3249375decc3072124596038c7c
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=56de07bc1e75d3249375decc3072124596038c7c

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Oct  8 21:05:23 2021 +0200

packaging: Add support for syncing vkd3d packages.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 packaging/obs/apt.cfg  |  2 +-
 packaging/obs/obs-sync | 28 +++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/packaging/obs/apt.cfg b/packaging/obs/apt.cfg
index 28e6a54..c4b3690 100644
--- a/packaging/obs/apt.cfg
+++ b/packaging/obs/apt.cfg
@@ -1,7 +1,7 @@
 APT::FTPArchive::Release {
   Origin dl.winehq.org;
   Label winehq;
-  Architectures "i386 amd64";
+  Architectures "i386 amd64 all";
   Description "WineHQ packages";
   Components main;
 }
diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync
index c74b7fe..2c624ef 100755
--- a/packaging/obs/obs-sync
+++ b/packaging/obs/obs-sync
@@ -70,7 +70,12 @@ add_deb ()
     test -d $dstdir || mkdir -p $dstdir
     for arch in $deb_archs
     do
-        rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-${build}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-${build}_$arch.deb $dstdir/binary-$arch/
+        if test "$arch" = all
+        then
+            rsync -aq $obsdir/$arch/${all_pkg}_$debver\~${2}-${build}_$arch.deb $dstdir/binary-$arch/
+        else
+            rsync -aq $obsdir/$arch/${wine_pkg}_$debver\~${2}-${build}_$arch.deb $obsdir/$arch/${winehq_pkg}_$debver\~${2}-${build}_$arch.deb $dstdir/binary-$arch/
+        fi
     done
     dscverify -u $obsdir/$source_pkg\~$2-$build.dsc
     if test -f $obsdir/$source_pkg\~$2-$build.diff.gz
@@ -208,11 +213,24 @@ do
             debver=${1/-rc/~rc}
             case "$2" in
                 "") echo "Branch not specified for version $1"; exit 1 ;;
-                staging) source_pkg="wine-staging_$debver" ;;
-                *) source_pkg="wine_$debver" ;;
+                vkd3d)
+                    wine_pkg="vkd3d-*"
+                    winehq_pkg="libvkd3d*"
+                    all_pkg="libvkd3d*"
+                    source_pkg="vkd3d_$debver"
+                    deb_archs="$deb_archs all"
+                    ;;
+                staging)
+                    wine_pkg="wine-staging*"
+                    winehq_pkg="winehq-staging"
+                    source_pkg="wine-staging_$debver"
+                    ;;
+                *)
+                    wine_pkg="wine-$2*"
+                    winehq_pkg="winehq-$2"
+                    source_pkg="wine_$debver"
+                    ;;
             esac
-            wine_pkg="wine-$2*"
-            winehq_pkg="winehq-$2"
             shift
 
             rsync -aq --delete --exclude-from=rsync-filter --link-dest=$winehq_dir $winehq_dir/ dest




More information about the wine-cvs mailing list