From 43b60a621c815cbfdf9b404f19337a74ce095ae5 Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Fri, 23 Aug 2019 10:45:13 +0200 Subject: [PATCH] Use globbing instead of hardcoding SWIG version --- taskcluster/.shared.yml | 8 ++++---- taskcluster/win-opt-base.tyml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index 5881974e..d9d59707 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -80,10 +80,10 @@ swig: # patch of _0001 would require the reverse patch of _0002 to be already # applied, and we don't want to. So just test that reversing _0002 in # dry-run. - osx_v12: '(if ! patch -R -d $TASKCLUSTER_TASK_DIR/homebrew/Cellar/swig/4.0.0/share/swig/4.0.0/ -p2 -s -f --dry-run < $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_0003-Move-to-new-MaybeLocal-based-GetFunction.patch ; then -patch -d $TASKCLUSTER_TASK_DIR/homebrew/Cellar/swig/4.0.0/share/swig/4.0.0/ -p2 < $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_0001-Move-from-v8-Handle-to-v8-Local.patch && -patch -d $TASKCLUSTER_TASK_DIR/homebrew/Cellar/swig/4.0.0/share/swig/4.0.0/ -p2 < $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_0002-Move-to-new-MaybeLocal-based-NewInstance.patch && -patch -d $TASKCLUSTER_TASK_DIR/homebrew/Cellar/swig/4.0.0/share/swig/4.0.0/ -p2 < $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_0003-Move-to-new-MaybeLocal-based-GetFunction.patch; + osx_v12: '(if ! patch -R -d $TASKCLUSTER_TASK_DIR/homebrew/Cellar/swig/*/share/swig/*/ -p2 -s -f --dry-run < $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_0003-Move-to-new-MaybeLocal-based-GetFunction.patch ; then +patch -d $TASKCLUSTER_TASK_DIR/homebrew/Cellar/swig/*/share/swig/*/ -p2 < $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_0001-Move-from-v8-Handle-to-v8-Local.patch && +patch -d $TASKCLUSTER_TASK_DIR/homebrew/Cellar/swig/*/share/swig/*/ -p2 < $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_0002-Move-to-new-MaybeLocal-based-NewInstance.patch && +patch -d $TASKCLUSTER_TASK_DIR/homebrew/Cellar/swig/*/share/swig/*/ -p2 < $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_0003-Move-to-new-MaybeLocal-based-GetFunction.patch; else echo "NO NODEJS v12 PATCH NEEDED"; fi)' diff --git a/taskcluster/win-opt-base.tyml b/taskcluster/win-opt-base.tyml index 61980c71..c8076923 100644 --- a/taskcluster/win-opt-base.tyml +++ b/taskcluster/win-opt-base.tyml @@ -67,7 +67,7 @@ payload: pacman --noconfirm -S tar make && pacman --noconfirm -S zip && (pacman --noconfirm -S patch swig && - (for patch_file in $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_*.patch ; do patch -d /usr/share/swig/4.0.0/ -p2 < $patch_file; done) + (for patch_file in $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/native_client/swig_node_v12_*.patch ; do patch -d /usr/share/swig/*/ -p2 < $patch_file; done) ) && $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/${build.scripts.build} && $TASKCLUSTER_TASK_DIR/DeepSpeech/ds/${build.scripts.package} ;